Project

General

Profile

« Previous | Next » 

Revision 608f7100

Added by Cherian Mathew almost 9 years ago

corrected merge to latest snapshot version
updated hibernate config file and test db
setup testing framework with jetty and maven

View differences:

eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
35 35
          in your hibernate configuration, using hibernate-specific configuration keys.
36 36
          All other properties must be defined as usual in a c3p0.properties file.
37 37
          This is confusing, and will hopefully be simplified some time in the future, but for now...
38
          
39
          DOCUMENTATION UPDATE (2015-05-22):
40
          Hibernate's C3P0ConnectionProvider renames 7 c3p0 configuration properties, which, 
41
          if set in your hibernate configuration, will override any configuration you may have set 
42
          in a c3p0.properties file.
43
          TODO: are points (2) and (3) still valid? I don't think so! (AK)
38 44

  
39 45
            hibernate.c3p0.acquire_increment
40 46
			hibernate.c3p0.idle_test_period
......
186 192
      <mapping class="eu.etaxonomy.cdm.model.taxon.Taxon"/>
187 193
      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonBase"/>
188 194
      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonNode"/>
195
      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation"/>
189 196
      <mapping class="eu.etaxonomy.cdm.model.taxon.Classification"/>
190 197
      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonRelationship"/>
191 198
      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType"/>

Also available in: Unified diff