problem of termloading which was overriding hibernate_sequences in testdatasets solved

diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
index 453b80334c92a1aaa60d9a1d82921b93aaae264e..bc417f60a0e069fcac54441aa30a9046326bfb52 100644 (file)
--- a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
+++ b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
@@ -54,7 +54,7 @@
             <props>\r
                 <!-- globally overriding id generation settings see: eu.etaxonomy.cdm.persistence.hibernate.TableGenerator -->\r
                 <prop key="optimizer">none</prop>\r
-                <prop key="initial_value">3000</prop>\r
+                <prop key="initial_value">5000</prop><!-- must be higher than any term id in TermsDataSet.xml -->\r
             </props>\r
         </property>\r
     </bean>\r

diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.common.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.common.xml
index 1258d403d17a67479b81aac060a399902b721f86..12bfc4373675fe7b05f3e7f83d382ed5052d37a0 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.common.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.common.xml
@@ -53,7 +53,7 @@
                 <prop key="hibernate.format_sql">false</prop>\r
                 <prop key="hibernate.search.default.directory_provider">org.hibernate.search.store.impl.FSDirectoryProvider</prop>\r
                 <prop key="hibernate.search.default.indexBase">./target/index</prop>\r
-                \r
+\r
  <!--                temp for h4 migration testing\r
                 <prop key="hibernate.connection.driver_class">org.h2.Driver</prop>\r
                 <prop key="hibernate.connection.url">jdbc:h2:mem:cdm</prop>\r
@@ -61,7 +61,7 @@
                 <prop key="hibernate.connection.password"></prop>\r
                 <prop key="hibernate.search.lucene_version">LUCENE_36</prop>\r
                 end temp for h4 migration testing\r
- -->                \r
+ -->\r
             </props>\r
         </property>\r
     </bean>\r
@@ -72,7 +72,7 @@
             <props>\r
                 <!-- globally overriding id generation settings see: eu.etaxonomy.cdm.persistence.hibernate.TableGenerator -->\r
                 <prop key="optimizer">none</prop>\r
-                <prop key="initial_value">1000</prop>\r
+                <prop key="initial_value">5000</prop><!-- must be higher than any term id in TermsDataSet.xml -->\r
             </props>\r
         </property>\r
     </bean>\r
@@ -85,7 +85,7 @@
         </property>\r
     </bean>\r
 \r
-<!--     \r
+<!--\r
     We do not use spelling suggestions anymore. This one relates to springmodules which is\r
     somewhat outdated. Once we work again with spelling suggestions we better use a modern\r
     approache, e.g. annotation based.\r

diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml
index f7b5a1e7e92cfb3c7de3f28378c76166197e12e5..471cdaa90937a3dc139c013127b649d3ec9c17ab 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml
@@ -199,10 +199,18 @@
   <GENBANKACCESSION/>
   <GENBANKACCESSION_AUD/>
   <GRANTEDAUTHORITYIMPL/>
+  <HIBERNATE_SEQUENCES />
+  <!-- 
+      HIBERNATE_SEQUENCES must not be added to this dataset, rather increase the initial_value 
+      of eu.etaxonomy.cdm.persistence.hibernate.TableGeneratorGlobalOverride which is set
+      in applicationContext-test.xml
+  -->
+  <!--
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="DefinedTermBase" NEXT_VAL="2110"/>
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="Representation" NEXT_VAL="2200"/>
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="TermVocabulary" NEXT_VAL="60"/>
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="default" NEXT_VAL="1069"/>
+  --> 
   <HOMOTYPICALGROUP/>
   <HOMOTYPICALGROUP_ANNOTATION/>
   <HOMOTYPICALGROUP_ANNOTATION_AUD/>

diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
index badcc8f33b5cf2bad3c0ecd45bcfec9a4abdf463..07121cee7692949cd005c9d2b7ee329b5afe2b67 100644 (file)
Binary files a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml and b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml differ

diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml
index d3adfb4447220b51fd5b9ba8603b0adebaa7bea3..c01db2e810886288c21f5702342c2fc5133445c5 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml
@@ -6468,14 +6468,10 @@
   <TERMVOCABULARY_REPRESENTATION TERMVOCABULARY_ID="26" REPRESENTATIONS_ID="2086"/>\r
   <TERMVOCABULARY_REPRESENTATION TERMVOCABULARY_ID="27" REPRESENTATIONS_ID="2087"/>\r
 \r
-  <!--\r
-       need to set some hibernate_sequences here, thus the initial_value of\r
-       eu.etaxonomy.cdm.persistence.hibernate.TableGeneratorGlobalOverride is set to 1000\r
-       in applicationContext-test.xml\r
-       DefinedTermBase and Representation initally have already more that 1000 entities.\r
+  <!-- \r
+      HIBERNATE_SEQUENCES must not be added to this dataset, rather increase the initial_value \r
+      of eu.etaxonomy.cdm.persistence.hibernate.TableGeneratorGlobalOverride which is set\r
+      in applicationContext-test.xml\r
   -->\r
-  <HIBERNATE_SEQUENCES SEQUENCE_NAME="DefinedTermBase" NEXT_VAL="3000"/>\r
-  <HIBERNATE_SEQUENCES SEQUENCE_NAME="Representation" NEXT_VAL="3000"/>\r
-  <HIBERNATE_SEQUENCES SEQUENCE_NAME="TermVocabulary" NEXT_VAL="41"/><!-- not needed: TODO delete -->\r
 \r
 </dataset>\r

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
index 8811eb1dc35a7da0b33bc0bf6a18441062de1dea..daec55d26ecaa69b6367903ad4b2b34478b02092 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
@@ -71,16 +71,16 @@
                     globally overriding id generation settings see: eu.etaxonomy.cdm.persistence.hibernate.TableGenerator\r
                  -->\r
                 <prop key="optimizer">none</prop>\r
-                <prop key="initial_value">1000</prop>\r
+                <prop key="initial_value">5000</prop><!-- must be higher than any term id in TermsDataSet.xml -->\r
             </props>\r
         </property>\r
     </bean>\r
 \r
 \r
 <!--\r
-       We do not use spelling suggestions anymore. This one relates to springmodules which is\r
-    somewhat outdated. Once we work again with spelling suggestions we better use a modern\r
-    approache, e.g. annotation based.\r
+   We do not use spelling suggestions anymore. This one relates to spring modules which is\r
+    somewhat out-dated. Once we work again with spelling suggestions we better use a modern\r
+    approach, e.g. annotation based.\r
     <bean id="taxonSpellingDirectory" class="org.springmodules.lucene.index.support.FSDirectoryFactoryBean">\r
       <property name="location" value="file:./target/index/eu.etaxonomy.cdm.model.taxon.TaxonBase_spelling"/>\r
       <property name="create" value="true"/>\r