Preliminary adapt CDM model cacher script to work for cached model update

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / src / main / resources / eu / etaxonomy / cdm / mappings / hibernate.cfg.xml

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
index 53e2bbbd49cdbcde883731eb9746c379aacae157..491b203157da59d28338008e5588ebc2ccfbdf97 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
@@ -7,14 +7,17 @@
     <session-factory>\r
 \r
       <property name="connection.release_mode">after_transaction</property>\r
-         <property name="show_sql">true</property>\r
-               <property name="format_sql">true</property>\r
-               <property name="use_sql_comments">true</property>\r
+      \r
+      <property name="hibernate.implicit_naming_strategy">org.hibernate.boot.model.naming.ImplicitNamingStrategyComponentPathImpl</property>\r
+      \r
 \r
       <!-- Connection Pooling -->\r
 <!--       <property name="hibernate.connection.provider_class">org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider</property> -->\r
-      <property name="hibernate.connection.provider_class">org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl</property>\r
-           <!--\r
+      <!-- <property name="hibernate.connection.provider_class">org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl</property>\r
+          -->\r
+             <property name="hibernate.connection.provider_class">eu.etaxonomy.taxeditor.remoting.cache.CdmModelCacherConnectionProvider</property>\r
+          \r
+            <!--\r
           Configuring the C3P0ConnectionProvider\r
           ========================================\r
           see http://www.mchange.com/projects/c3p0/index.html#hibernate-specific\r
@@ -38,6 +41,12 @@
           in your hibernate configuration, using hibernate-specific configuration keys.\r
           All other properties must be defined as usual in a c3p0.properties file.\r
           This is confusing, and will hopefully be simplified some time in the future, but for now...\r
+          \r
+          DOCUMENTATION UPDATE (2015-05-22):\r
+          Hibernate's C3P0ConnectionProvider renames 7 c3p0 configuration properties, which, \r
+          if set in your hibernate configuration, will override any configuration you may have set \r
+          in a c3p0.properties file.\r
+          TODO: are points (2) and (3) still valid? I don't think so! (AK)\r
 \r
             hibernate.c3p0.acquire_increment\r
                        hibernate.c3p0.idle_test_period\r
@@ -67,6 +76,7 @@
       <mapping class="eu.etaxonomy.cdm.model.common.ExtensionType"/>\r
       <mapping class="eu.etaxonomy.cdm.model.common.IdentifiableSource"/>\r
       <mapping class="eu.etaxonomy.cdm.model.common.Identifier"/>\r
+      <mapping class="eu.etaxonomy.cdm.model.common.IntextReference"/>\r
       <mapping class="eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl"/>\r
       <mapping class="eu.etaxonomy.cdm.model.common.Group"/>\r
       <mapping class="eu.etaxonomy.cdm.model.common.Language"/>\r
@@ -84,7 +94,6 @@
       <mapping class="eu.etaxonomy.cdm.model.common.TermVocabulary"/>\r
       <mapping class="eu.etaxonomy.cdm.model.common.User"/>\r
       <!-- Description Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.description.AbsenceTerm"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.CategoricalData"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.CommonTaxonName"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.DescriptionBase"/>\r
@@ -101,8 +110,7 @@
       <mapping class="eu.etaxonomy.cdm.model.description.MultiAccessKey"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.PolytomousKey"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.PolytomousKeyNode"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.PresenceTerm"/>\r
+      <mapping class="eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.QuantitativeData"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.SpecimenDescription"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.State"/>\r
@@ -139,10 +147,12 @@
       <mapping class="eu.etaxonomy.cdm.model.molecular.DnaQuality"/>\r
       <mapping class="eu.etaxonomy.cdm.model.molecular.DnaSample"/>\r
       <mapping class="eu.etaxonomy.cdm.model.molecular.Amplification"/>\r
+      <mapping class="eu.etaxonomy.cdm.model.molecular.AmplificationResult"/>\r
       <mapping class="eu.etaxonomy.cdm.model.molecular.Primer"/>\r
       <mapping class="eu.etaxonomy.cdm.model.molecular.Sequence"/>\r
       <mapping class="eu.etaxonomy.cdm.model.molecular.SequenceString"/>\r
       <mapping class="eu.etaxonomy.cdm.model.molecular.SingleRead"/>\r
+      <mapping class="eu.etaxonomy.cdm.model.molecular.SingleReadAlignment"/>\r
       <mapping class="eu.etaxonomy.cdm.model.molecular.Cloning"/>\r
       <!-- Name Package -->\r
       <mapping class="eu.etaxonomy.cdm.model.name.BacterialName"/>\r
@@ -188,21 +198,19 @@
       <mapping class="eu.etaxonomy.cdm.model.taxon.Taxon"/>\r
       <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonBase"/>\r
       <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonNode"/>\r
+      <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation"/>\r
       <mapping class="eu.etaxonomy.cdm.model.taxon.Classification"/>\r
       <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonRelationship"/>\r
       <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType"/>\r
       \r
       <!-- Validation Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.validation.EntityValidationResult"/>\r
+      <mapping class="eu.etaxonomy.cdm.model.validation.EntityValidation"/>\r
       <mapping class="eu.etaxonomy.cdm.model.validation.EntityConstraintViolation"/>\r
       \r
       <!-- View Package -->\r
       <mapping class="eu.etaxonomy.cdm.model.view.AuditEvent"/>\r
       \r
-      <!-- for filling caches -->\r
-      <!-- since hibernate 4 listeners are not handled via hibernate.cfg.xml anymore -->\r
-      <!--  http://stackoverflow.com/questions/8616146/eventlisteners-using-hibernate-4-0-with-spring-3-1-0-release\r
-            https://community.jboss.org/wiki/HibernateCoreMigrationGuide40 -->\r
+\r
 \r
     </session-factory>\r
 </hibernate-configuration>
\ No newline at end of file