BGBM BDI Projects / cdmlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5ead075)
TypeDesignationStatus renamed to SpecimenTypeDesignationStatus
authora.babadshanjan <a.babadshanjan@localhost>
Mon, 20 Apr 2009 15:22:13 +0000 (15:22 +0000)
committera.babadshanjan <a.babadshanjan@localhost>
Mon, 20 Apr 2009 15:22:13 +0000 (15:22 +0000)
13 files changed:
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java patch | blob | history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java patch | blob | history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java patch | blob | history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java patch | blob | history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/MatchMode.java patch | blob | history
cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml patch | blob | history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java patch | blob | history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java patch | blob | history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml patch | blob | history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml patch | blob | history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml patch | blob | history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.xml patch | blob | history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImplTest.xml patch | blob | history

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java
index d2e663291f53044dbcc8c2c7505cc09c579e1b98..4a98bcfeb6168332c9e139506ccd57a970877972 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java
@@ -27,7 +27,6 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
 import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
-import eu.etaxonomy.cdm.model.common.init.IVocabularyStore;\r
 import eu.etaxonomy.cdm.model.common.init.TermLoader;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;\r
 import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao;\r
diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java
index c36ce92340a91dc5c8a49c4afe45cb8c7969f731..227746093ce11de71a89000f67878fb74c1aa4cc 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java
@@ -86,7 +86,8 @@ public class IdentifiableDaoBase<T extends IdentifiableEntity> extends Annotatab
                if (matchmode == MatchMode.EXACT) {
                        crit.add(Restrictions.eq("titleCache", matchmode.queryStringFrom(queryString)));
                } else {
-                       crit.add(Restrictions.ilike("titleCache", matchmode.queryStringFrom(queryString)));
+//                     crit.add(Restrictions.ilike("titleCache", matchmode.queryStringFrom(queryString)));
+                       crit.add(Restrictions.like("titleCache", matchmode.queryStringFrom(queryString)));
                }
                if (pagesize >= 0) {
                        crit.setMaxResults(pagesize);
diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java
index 0bcc81ea5f7c7eb318d0d45d73cefb5d1a222af8..b2635bbd6f3fe4c01d0d710d47ff90038a39b693 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java
@@ -32,7 +32,7 @@ import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.TypeDesignationBase;\r
-import eu.etaxonomy.cdm.model.name.TypeDesignationStatus;\r
+import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
 import eu.etaxonomy.cdm.model.view.AuditEvent;\r
 import eu.etaxonomy.cdm.persistence.dao.hibernate.common.IdentifiableDaoBase;\r
 import eu.etaxonomy.cdm.persistence.dao.name.ITaxonNameDao;\r
@@ -191,7 +191,7 @@ extends IdentifiableDaoBase<TaxonNameBase> implements ITaxonNameDao {
                }\r
        }\r
 \r
-       public int countTypeDesignations(TaxonNameBase name, TypeDesignationStatus status) {\r
+       public int countTypeDesignations(TaxonNameBase name, SpecimenTypeDesignationStatus status) {\r
                AuditEvent auditEvent = getAuditEventFromContext();\r
                if(auditEvent.equals(AuditEvent.CURRENT_VIEW)) {\r
                        Query query = null;\r
@@ -300,7 +300,7 @@ extends IdentifiableDaoBase<TaxonNameBase> implements ITaxonNameDao {
                }\r
        }\r
 \r
-       public List<TypeDesignationBase> getTypeDesignations(TaxonNameBase name, TypeDesignationStatus status, Integer pageSize, Integer pageNumber) {\r
+       public List<TypeDesignationBase> getTypeDesignations(TaxonNameBase name, SpecimenTypeDesignationStatus status, Integer pageSize, Integer pageNumber) {\r
                AuditEvent auditEvent = getAuditEventFromContext();\r
                if(auditEvent.equals(AuditEvent.CURRENT_VIEW)) {\r
                        Query query = null;\r
diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java
index 9a7a6b9a3b65c65415a67cb1cde55edda844b162..154ae8b93f1a088938671ebb199ca5a5705d8bdf 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java
@@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.TypeDesignationBase;\r
-import eu.etaxonomy.cdm.model.name.TypeDesignationStatus;\r
+import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IIdentifiableDao;\r
 import eu.etaxonomy.cdm.persistence.query.MatchMode;\r
 \r
@@ -82,7 +82,7 @@ public interface ITaxonNameDao extends IIdentifiableDao<TaxonNameBase> {
         * @param status the type designation status (or null to return all types) \r
         * @return a count of TypeDesignationBase instances\r
         */\r
-       public int countTypeDesignations(TaxonNameBase name, TypeDesignationStatus status);\r
+       public int countTypeDesignations(TaxonNameBase name, SpecimenTypeDesignationStatus status);\r
        \r
        /**\r
         * Return a List of types related to this name, optionally filtered \r
@@ -94,7 +94,7 @@ public interface ITaxonNameDao extends IIdentifiableDao<TaxonNameBase> {
         * @param pageNumber The offset (in pageSize chunks) from the start of the result set (0 - based)\r
         * @return a List of TypeDesignationBase instances\r
         */\r
-       public List<TypeDesignationBase> getTypeDesignations(TaxonNameBase name, TypeDesignationStatus status, Integer pageSize, Integer pageNumber);\r
+       public List<TypeDesignationBase> getTypeDesignations(TaxonNameBase name, SpecimenTypeDesignationStatus status, Integer pageSize, Integer pageNumber);\r
 \r
        /**\r
         * Returns a List of TaxonNameBase instances that match the properties passed\r
diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/MatchMode.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/MatchMode.java
index 6a955ba52479ec0f485b5448e0ce9cde45fe0e70..d4241cc752a0ec9e09262d3712fda5a1f3fff208 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/MatchMode.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/MatchMode.java
@@ -22,11 +22,11 @@ public enum MatchMode {
                queryString = queryString.replace('*', '%');\r
                switch(this){   \r
                        case BEGINNING:\r
-                               return queryString+"%";                 \r
+                               return "'" + queryString + "%'";                        \r
                        case ANYWHERE:\r
-                               return "%"+queryString+"%";\r
+                               return "'%" + queryString + "%'";\r
                        default:\r
-                               return queryString;\r
+                               return "'" + queryString + "'";\r
                }\r
        }\r
 }\r
diff --git a/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml b/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
index 2a35a4b27ead2afc85cbf5bdbbca567f5a551f77..09ce6856f1bd692a690d0db7db2298ae224c37c5 100644 (file)
--- a/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
+++ b/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
@@ -115,9 +115,9 @@
       <mapping class="eu.etaxonomy.cdm.model.name.NonViralName"/>\r
       <mapping class="eu.etaxonomy.cdm.model.name.Rank"/>\r
       <mapping class="eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation"/>\r
+      <mapping class="eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus"/>\r
       <mapping class="eu.etaxonomy.cdm.model.name.TaxonNameBase"/>\r
       <mapping class="eu.etaxonomy.cdm.model.name.TypeDesignationBase"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.name.TypeDesignationStatus"/>\r
       <mapping class="eu.etaxonomy.cdm.model.name.ViralName"/>\r
       <mapping class="eu.etaxonomy.cdm.model.name.ZoologicalName"/>\r
       <!-- Occurence Package -->\r
diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java
index 083c3ffa8c189980e36d8763b8b9261b430fed30..3dd388da3b6f0a8e04233d32c9c2dfb5f5c2b8e1 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java
@@ -36,8 +36,7 @@ public class TestingTermInitializer extends PersistentTermInitializer {
                        UUID.fromString("e72cbcb6-58f8-4201-9774-15d0c6abc128"), // Continent.class\r
                        UUID.fromString("006b1870-7347-4624-990f-e5ed78484a1a"), // WaterbodyOrCountry.class\r
             UUID.fromString("ef0d1ce1-26e3-4e83-b47b-ca74eed40b1b"), // Rank.class\r
-            UUID.fromString("ab177bd7-d3c8-4e58-a388-226fff6ba3c2"), // TypeDesignationStatus.class\r
-//            UUID.fromString("ab60e738-4d09-4c24-a1b3-9466b01f9f55"), // NameTypeDesignationStatus.class\r
+            UUID.fromString("ab177bd7-d3c8-4e58-a388-226fff6ba3c2"), // SpecimenTypeDesignationStatus.class\r
             UUID.fromString("bb28cdca-2f8a-4f11-9c21-517e9ae87f1f"), // NomenclaturalStatusType.class\r
             UUID.fromString("48917fde-d083-4659-b07d-413db843bd50"), // SynonymRelationshipType.class\r
             UUID.fromString("fc4abe52-9c25-4cfa-a682-8615bf4bbf07"), // HybridRelationshipType.class\r
@@ -58,6 +57,7 @@ public class TestingTermInitializer extends PersistentTermInitializer {
             UUID.fromString("fe87ea8d-6e0a-4e5d-b0da-0ab8ea67ca77"), // DeterminationModifier.class\r
             UUID.fromString("066cc62e-7213-495e-a020-97a1233bc037"), // StatisticalMeasure.class\r
             UUID.fromString("8627c526-73af-44d9-902c-11c1f11b60b4") //RightsTerm.class\r
+//          UUID.fromString("ab60e738-4d09-4c24-a1b3-9466b01f9f55") // NameTypeDesignationStatus.class\r
             };\r
        \r
        public void setTermsDataSet(Resource termsDataSet) {\r
diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java
index 0aa7e32d557884371aebc2ba2c5a77c65356b150..8973f371d9a3b187eb2d4efe6a73aae6045b9501 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java
@@ -76,6 +76,12 @@ public class TaxonDaoHibernateImplTest extends CdmTransactionalIntegrationTest {
                AuditEventContextHolder.clearContext();\r
        }\r
        \r
+//     @Test\r
+//     @DataSet\r
+//     public final void testPrintDataSet() {\r
+//             printDataSet(System.out);\r
+//     }\r
+\r
        /**\r
         * Test method for {@link eu.etaxonomy.cdm.persistence.dao.hibernate.taxon.TaxonDaoHibernateImpl#TaxonDaoHibernateImpl()}.\r
         */\r
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
index 7e090e2da6a65eb4c5bd49445a8eca9cf675a55b..dd96dfba099df4e22dcd54c6a3348fa8e116d7f8 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
@@ -49,10 +49,11 @@
         </property>\r
     </bean> \r
     \r
-    <bean id="taxonSpellingDirectory" class="org.springmodules.lucene.index.support.FSDirectoryFactoryBean">\r
+ <bean id="taxonSpellingDirectory" class="org.springmodules.lucene.index.support.FSDirectoryFactoryBean">\r
       <property name="location" value="file:./target/test-classes/eu.etaxonomy.cdm.model.taxon.TaxonBase_spelling"/>\r
       <property name="create" value="false"/>\r
     </bean>\r
+\r
     \r
     <import resource="classpath:/eu/etaxonomy/cdm/persistence.xml" />\r
  \r
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 a808e4c57e02cdcba750fdc9e13e6b39cabc34de..2120286a1838bd2d75968528ce4aa1742c78509f 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 1156c5d6bac3316c676dce35833c032e1e64ce2e..34b4e098f1d8f71371dd75c444f627635d92f419 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
@@ -805,22 +805,22 @@
   <DEFINEDTERMBASE DTYPE="Rank" ID="803" CREATED="2009-01-28 17:07:04.0" UUID="64223610-7625-4cfd-83ad-b797bf7f0edd" URI="" ORDERINDEX="3" VOCABULARY_ID="4"/>\r
   <DEFINEDTERMBASE DTYPE="Rank" ID="804" CREATED="2009-01-28 17:07:04.0" UUID="ffca6ec8-8b88-417b-a6a0-f7c992aac19b" URI="" ORDERINDEX="2" VOCABULARY_ID="4"/>\r
   <DEFINEDTERMBASE DTYPE="Rank" ID="805" CREATED="2009-01-28 17:07:04.0" UUID="ac470211-1586-4b24-95ca-1038050b618d" URI="" ORDERINDEX="1" VOCABULARY_ID="4"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="806" CREATED="2009-01-28 17:07:04.0" UUID="b7807acc-f559-474e-ad4a-e7a41e085e34" URI="" ORDERINDEX="16" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="807" CREATED="2009-01-28 17:07:04.0" UUID="643513d0-32f5-46ba-840b-d9b9caf8160f" URI="" ORDERINDEX="15" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="808" CREATED="2009-01-28 17:07:04.0" UUID="95b90696-e103-4bc0-b60b-c594983fb566" URI="" ORDERINDEX="14" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="809" CREATED="2009-01-28 17:07:04.0" UUID="7244bc51-14d8-41a6-9524-7dc5303bba29" URI="" ORDERINDEX="13" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="810" CREATED="2009-01-28 17:07:04.0" UUID="f3b60bdb-4638-4ca9-a0c7-36e77d8459bb" URI="" ORDERINDEX="12" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="811" CREATED="2009-01-28 17:07:04.0" UUID="8d2fed1f-242e-4bcf-bbd7-e85133e479dc" URI="" ORDERINDEX="11" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="812" CREATED="2009-01-28 17:07:04.0" UUID="01d91053-7004-4984-aa0d-9f4de59d6205" URI="" ORDERINDEX="10" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="813" CREATED="2009-01-28 17:07:04.0" UUID="eb7df2e5-d9a7-479d-970c-c6f2b0a761d7" URI="" ORDERINDEX="9" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="814" CREATED="2009-01-28 17:07:04.0" UUID="0c39e2a5-2fe0-4d4f-819a-f609b5340339" URI="" ORDERINDEX="8" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="815" CREATED="2009-01-28 17:07:04.0" UUID="93ef8257-0a08-47bb-9b36-542417ae7560" URI="" ORDERINDEX="7" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="816" CREATED="2009-01-28 17:07:04.0" UUID="7afc2f4f-f70a-4aa5-80a5-87764f746bde" URI="" ORDERINDEX="6" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="817" CREATED="2009-01-28 17:07:04.0" UUID="7a1a8a53-78f4-4fc0-89f7-782e94992d08" URI="" ORDERINDEX="5" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="818" CREATED="2009-01-28 17:07:04.0" UUID="989a2715-71d5-4fbe-aa9a-db9168353744" URI="" ORDERINDEX="4" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="819" CREATED="2009-01-28 17:07:04.0" UUID="26e13359-8f77-4e40-a85a-56c01782fce0" URI="" ORDERINDEX="3" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="820" CREATED="2009-01-28 17:07:04.0" UUID="05002d46-083e-4b27-8731-2e7c28a8825c" URI="" ORDERINDEX="2" VOCABULARY_ID="5"/>\r
-  <DEFINEDTERMBASE DTYPE="TypeDesignationStatus" ID="821" CREATED="2009-01-28 17:07:04.0" UUID="a407dbc7-e60c-46ff-be11-eddf4c5a970d" URI="" ORDERINDEX="1" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="806" CREATED="2009-01-28 17:07:04.0" UUID="b7807acc-f559-474e-ad4a-e7a41e085e34" URI="" ORDERINDEX="16" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="807" CREATED="2009-01-28 17:07:04.0" UUID="643513d0-32f5-46ba-840b-d9b9caf8160f" URI="" ORDERINDEX="15" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="808" CREATED="2009-01-28 17:07:04.0" UUID="95b90696-e103-4bc0-b60b-c594983fb566" URI="" ORDERINDEX="14" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="809" CREATED="2009-01-28 17:07:04.0" UUID="7244bc51-14d8-41a6-9524-7dc5303bba29" URI="" ORDERINDEX="13" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="810" CREATED="2009-01-28 17:07:04.0" UUID="f3b60bdb-4638-4ca9-a0c7-36e77d8459bb" URI="" ORDERINDEX="12" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="811" CREATED="2009-01-28 17:07:04.0" UUID="8d2fed1f-242e-4bcf-bbd7-e85133e479dc" URI="" ORDERINDEX="11" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="812" CREATED="2009-01-28 17:07:04.0" UUID="01d91053-7004-4984-aa0d-9f4de59d6205" URI="" ORDERINDEX="10" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="813" CREATED="2009-01-28 17:07:04.0" UUID="eb7df2e5-d9a7-479d-970c-c6f2b0a761d7" URI="" ORDERINDEX="9" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="814" CREATED="2009-01-28 17:07:04.0" UUID="0c39e2a5-2fe0-4d4f-819a-f609b5340339" URI="" ORDERINDEX="8" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="815" CREATED="2009-01-28 17:07:04.0" UUID="93ef8257-0a08-47bb-9b36-542417ae7560" URI="" ORDERINDEX="7" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="816" CREATED="2009-01-28 17:07:04.0" UUID="7afc2f4f-f70a-4aa5-80a5-87764f746bde" URI="" ORDERINDEX="6" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="817" CREATED="2009-01-28 17:07:04.0" UUID="7a1a8a53-78f4-4fc0-89f7-782e94992d08" URI="" ORDERINDEX="5" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="818" CREATED="2009-01-28 17:07:04.0" UUID="989a2715-71d5-4fbe-aa9a-db9168353744" URI="" ORDERINDEX="4" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="819" CREATED="2009-01-28 17:07:04.0" UUID="26e13359-8f77-4e40-a85a-56c01782fce0" URI="" ORDERINDEX="3" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="820" CREATED="2009-01-28 17:07:04.0" UUID="05002d46-083e-4b27-8731-2e7c28a8825c" URI="" ORDERINDEX="2" VOCABULARY_ID="5"/>\r
+  <DEFINEDTERMBASE DTYPE="SpecimenTypeDesignationStatus" ID="821" CREATED="2009-01-28 17:07:04.0" UUID="a407dbc7-e60c-46ff-be11-eddf4c5a970d" URI="" ORDERINDEX="1" VOCABULARY_ID="5"/>\r
   <DEFINEDTERMBASE DTYPE="NomenclaturalStatusType" ID="822" CREATED="2009-01-28 17:07:04.0" UUID="92a76bd0-6ea8-493f-98e0-4be0b98c092f" URI="" ORDERINDEX="24" VOCABULARY_ID="6"/>\r
   <DEFINEDTERMBASE DTYPE="NomenclaturalStatusType" ID="823" CREATED="2009-01-28 17:07:04.0" UUID="a5055d80-dbba-4660-b091-a1835d59fe7c" URI="" ORDERINDEX="23" VOCABULARY_ID="6"/>\r
   <DEFINEDTERMBASE DTYPE="NomenclaturalStatusType" ID="824" CREATED="2009-01-28 17:07:04.0" UUID="bd036217-5499-4ccd-8f4c-72e06158db93" URI="" ORDERINDEX="22" VOCABULARY_ID="6"/>\r
@@ -5127,7 +5127,7 @@
   <REPRESENTATION ID="807" CREATED="2009-01-28 17:07:04.0" UUID="8a36f6ae-fd53-4c50-8bc1-88858e1d1c65" TEXT="" ABBREVIATEDLABEL="" LABEL="Super Kingdom" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="808" CREATED="2009-01-28 17:07:04.0" UUID="91dbd5fc-1753-4ca3-9fcb-99bf9aba544f" TEXT="" ABBREVIATEDLABEL="" LABEL="Domain" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="809" CREATED="2009-01-28 17:07:04.0" UUID="3b56cda8-d4ed-4486-b824-d3b51dab34f1" TEXT="" ABBREVIATEDLABEL="" LABEL="Empire" LANGUAGE_ID="406"/>\r
-  <REPRESENTATION ID="810" CREATED="2009-01-28 17:07:04.0" UUID="14433f58-3cbe-4172-835c-eb05520e9dff" TEXT="eu.etaxonomy.cdm.model.name.TypeDesignationStatus" LABEL="TypeDesignationStatus" LANGUAGE_ID="406"/>\r
+  <REPRESENTATION ID="810" CREATED="2009-01-28 17:07:04.0" UUID="14433f58-3cbe-4172-835c-eb05520e9dff" TEXT="eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus" LABEL="SpecimenTypeDesignationStatus" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="811" CREATED="2009-01-28 17:07:04.0" UUID="f87c785e-35e7-4e3b-a7c4-8a7172985f01" TEXT="" ABBREVIATEDLABEL="" LABEL="Phototype" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="812" CREATED="2009-01-28 17:07:04.0" UUID="6bfb1f27-1937-4922-81aa-9c5b6016ac93" TEXT="" ABBREVIATEDLABEL="" LABEL="Iconotype" LANGUAGE_ID="406"/>\r
   <REPRESENTATION ID="813" CREATED="2009-01-28 17:07:04.0" UUID="004e97dd-b1dd-4abb-9047-fbba6fd0c084" TEXT="" ABBREVIATEDLABEL="" LABEL="Isoepitype" LANGUAGE_ID="406"/>\r
@@ -6407,7 +6407,7 @@
   <TERMVOCABULARY DTYPE="OrderedTermVocabulary" ID="2" CREATED="2009-01-28 17:07:04.0" UUID="e72cbcb6-58f8-4201-9774-15d0c6abc128" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.location.Continent"/>\r
   <TERMVOCABULARY DTYPE="OrderedTermVocabulary" ID="3" CREATED="2009-01-28 17:07:04.0" UUID="006b1870-7347-4624-990f-e5ed78484a1a" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.location.WaterbodyOrCountry"/>\r
   <TERMVOCABULARY DTYPE="OrderedTermVocabulary" ID="4" CREATED="2009-01-28 17:07:04.0" UUID="ef0d1ce1-26e3-4e83-b47b-ca74eed40b1b" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.name.Rank"/>\r
-  <TERMVOCABULARY DTYPE="OrderedTermVocabulary" ID="5" CREATED="2009-01-28 17:07:04.0" UUID="ab177bd7-d3c8-4e58-a388-226fff6ba3c2" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.name.TypeDesignationStatus"/>\r
+  <TERMVOCABULARY DTYPE="OrderedTermVocabulary" ID="5" CREATED="2009-01-28 17:07:04.0" UUID="ab177bd7-d3c8-4e58-a388-226fff6ba3c2" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus"/>\r
   <TERMVOCABULARY DTYPE="OrderedTermVocabulary" ID="6" CREATED="2009-01-28 17:07:04.0" UUID="bb28cdca-2f8a-4f11-9c21-517e9ae87f1f" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.name.NomenclaturalStatusType"/>\r
   <TERMVOCABULARY DTYPE="OrderedTermVocabulary" ID="7" CREATED="2009-01-28 17:07:04.0" UUID="48917fde-d083-4659-b07d-413db843bd50" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType"/>\r
   <TERMVOCABULARY DTYPE="OrderedTermVocabulary" ID="8" CREATED="2009-01-28 17:07:04.0" UUID="fc4abe52-9c25-4cfa-a682-8615bf4bbf07" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.name.HybridRelationshipType"/>\r
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.xml
index f5078f3a688aacbc101d7b2b6cc1eab18366bc4e..c771599ba12521f28f99b23e3148be9f7ec4663e 100644 (file)
Binary files a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.xml and b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.xml differ
diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImplTest.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImplTest.xml
index f5078f3a688aacbc101d7b2b6cc1eab18366bc4e..c771599ba12521f28f99b23e3148be9f7ec4663e 100644 (file)
Binary files a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImplTest.xml and b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImplTest.xml differ