ref #6581 remove unused reference and microreference fields from SingleSourced classe...

diff --git a/cdmlib-cache/src/main/resources/eu/etaxonomy/cdm/mappings/cdm.map.ser b/cdmlib-cache/src/main/resources/eu/etaxonomy/cdm/mappings/cdm.map.ser
index 07d80619344b511d5f7bd26ba550f610b043c680..d461e4fa4c6bcd02e095c672e584602e630a50c3 100644 (file)
Binary files a/cdmlib-cache/src/main/resources/eu/etaxonomy/cdm/mappings/cdm.map.ser and b/cdmlib-cache/src/main/resources/eu/etaxonomy/cdm/mappings/cdm.map.ser differ

diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.testIgnoreAuthorship.xml b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.testIgnoreAuthorship.xml
index b35df89ae34433b5c3d98c558c77ac7c098a600b..9a028665ff95da53f480610c3d3a7edeb46059ac 100644 (file)
--- a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.testIgnoreAuthorship.xml
+++ b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.testIgnoreAuthorship.xml
@@ -3,10 +3,10 @@
   <TAXONBASE DTYPE="Taxon" ID="4000" CREATED="2015-07-07 08:21:44.0" UUID="26f98a58-09ab-49a0-ab9f-7490757c86d2" PROTECTEDTITLECACHE="false" TITLECACHE="Campanula versicolor sec. different author" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="4000" SEC_ID="4000"/>
   <TAXONNAME NAMETYPE="NonViral" ID="4000" CREATED="2015-07-07 08:21:44.0" UUID="7e86a30c-1bd1-45af-928c-d50ee81fedc8" UPDATED="2015-07-07 08:21:44.859" PROTECTEDTITLECACHE="false" TITLECACHE="Campanula versicolor" APPENDEDPHRASE="[null]" FULLTITLECACHE="Campanula versicolor" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="Campanula" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="Campanula versicolor" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="versicolor" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="4000" RANK_ID="[null]"/>
   <HOMOTYPICALGROUP ID="4000" CREATED="2015-07-07 08:21:44.0" UUID="3ccc3b7c-90f6-429d-872a-3cb91af58592" UPDATED="2015-07-07 08:21:44.859"/>
-  <AGENTBASE DTYPE="Team" ID="4000" CREATED="2015-07-07 08:21:44.0" UUID="d3235707-89b9-4264-a121-0479e7f55008" UPDATED="2015-07-07 08:21:44.859" PROTECTEDTITLECACHE="true" TITLECACHE="different author" PROTECTEDCOLLECTORTITLECACHE="false" COLLECTORTITLE="[null]" PROTECTEDNOMENCLATURALTITLECACHE="true" NOMENCLATURALTITLE="different author" CODE="[null]" NAME="[null]" GIVENNAME="[null]" FAMILYNAME="[null]" LIFESPAN_END="[null]" LIFESPAN_FREETEXT="[null]" LIFESPAN_START="[null]" PREFIX="[null]" SUFFIX="[null]" HASMOREMEMBERS="false" ISPARTOF_ID="[null]"/>
+  <AGENTBASE DTYPE="Team" ID="4000" CREATED="2015-07-07 08:21:44.0" UUID="d3235707-89b9-4264-a121-0479e7f55008" UPDATED="2015-07-07 08:21:44.859" PROTECTEDTITLECACHE="true" TITLECACHE="different author" PROTECTEDCOLLECTORTITLECACHE="false" COLLECTORTITLE="[null]" PROTECTEDNOMENCLATURALTITLECACHE="true" NOMENCLATURALTITLE="different author" HASMOREMEMBERS="false"/>
   <REFERENCE ID="4000" CREATED="2015-07-07 08:21:44.0" UUID="bdd80ce2-fbdc-4d9d-a523-5f5d583ee5cf" UPDATED="2015-07-07 08:21:44.859" PROTECTEDTITLECACHE="false" TITLECACHE="different author" DATEPUBLISHED_END="[null]" DATEPUBLISHED_FREETEXT="[null]" DATEPUBLISHED_START="[null]" NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" TITLE="[null]" ABBREVTITLECACHE="different author" PROTECTEDABBREVTITLECACHE="false" REFTYPE="GEN" AUTHORSHIP_ID="4000" INSTITUTION_ID="[null]"/>
-  <TAXONNODE ID="4000" CREATED="2015-07-07 08:21:44.0" UUID="57932be2-ec8f-4630-9a54-a9ec7853fdfd" UPDATED="2015-07-07 08:21:44.86" SORTINDEX="0"  TREEINDEX="#t4000#4001#4000#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="" CLASSIFICATION_ID="4000" PARENT_ID="4001" REFERENCEFORPARENTCHILDRELATION_ID="4000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="4000"/>
-  <TAXONNODE ID="4001" CREATED="2015-07-07 08:21:44.0" UUID="93e39a12-35c2-4424-b76f-8901e40def89" UPDATED="2015-07-07 08:21:44.86" SORTINDEX="-1" TREEINDEX="#t4000#4001#"      COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="4000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="4000" CREATED="2015-07-07 08:21:44.0" UUID="57932be2-ec8f-4630-9a54-a9ec7853fdfd" UPDATED="2015-07-07 08:21:44.86" SORTINDEX="0"  TREEINDEX="#t4000#4001#4000#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="" CLASSIFICATION_ID="4000" PARENT_ID="4001" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="4000"/>
+  <TAXONNODE ID="4001" CREATED="2015-07-07 08:21:44.0" UUID="93e39a12-35c2-4424-b76f-8901e40def89" UPDATED="2015-07-07 08:21:44.86" SORTINDEX="-1" TREEINDEX="#t4000#4001#"      COUNTCHILDREN="1" CLASSIFICATION_ID="4000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
   <CLASSIFICATION ID="4000" CREATED="2015-07-07 08:21:44.0" UUID="eee32748-5b89-4266-a99a-1edb3781d0eb" UPDATED="2015-07-07 08:21:44.86" PROTECTEDTITLECACHE="false" TITLECACHE="Checklist" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" NAME_ID="4000" REFERENCE_ID="[null]" ROOTNODE_ID="4001"/>
   <LANGUAGESTRING ID="4000" CREATED="2015-07-07 08:21:44.0" UUID="9cd5922f-9950-4b48-a912-5d99a0ae1ed4" UPDATED="2015-07-07 08:21:44.86" TEXT="Checklist" LANGUAGE_ID="406"/>
 </dataset>

diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.testImportTwoUnitsOfSameTaxonIntoExistingClassification.xml b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.testImportTwoUnitsOfSameTaxonIntoExistingClassification.xml
index 625d428061247833b71b7e192e249819180a47eb..0a01e22a663b56fa49599cdc629db8baa96884f9 100644 (file)
--- a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.testImportTwoUnitsOfSameTaxonIntoExistingClassification.xml
+++ b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.testImportTwoUnitsOfSameTaxonIntoExistingClassification.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../database/schema/dataset.xsd">
-  <TAXONNODE ID="4000" CREATED="2015-07-07 16:41:04.0" UUID="dbe46e83-bb55-4eb1-b22c-42c4afca3f98" UPDATED="2015-07-07 16:41:04.482" SORTINDEX="-1" TREEINDEX="#t4000#4000#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="4000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="4000" CREATED="2015-07-07 16:41:04.0" UUID="dbe46e83-bb55-4eb1-b22c-42c4afca3f98" UPDATED="2015-07-07 16:41:04.482" SORTINDEX="-1" TREEINDEX="#t4000#4000#" COUNTCHILDREN="0" CLASSIFICATION_ID="4000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
   <CLASSIFICATION ID="4000" CREATED="2015-07-07 16:41:04.0" UUID="18d22d00-5f70-4c8e-a1ed-dc45fae5b816" PROTECTEDTITLECACHE="false" TITLECACHE="Checklist" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" NAME_ID="4000" REFERENCE_ID="[null]" ROOTNODE_ID="4000"/>
   <LANGUAGESTRING ID="4000" CREATED="2015-07-07 16:41:04.0" UUID="abcf1c10-677a-4f55-8635-57c13acabdaf" UPDATED="2015-07-07 16:41:04.482" TEXT="Checklist" LANGUAGE_ID="406"/>
 </dataset>

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationBase.java
index 734e0064c90416a865d507df15ded7b6c7f92281..df980c03e1f300aa15c46eedea1ea3f98b94bad2 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationBase.java
@@ -65,8 +65,6 @@ import eu.etaxonomy.cdm.validation.annotation.ValidTypeDesignation;
     "typeStatus",
     "notDesignated",
     "typifiedNames",
-    "citation",
-    "citationMicroReference",
     "source",
     "registrations",
 })
@@ -98,18 +96,6 @@ public abstract class TypeDesignationBase<T extends TypeDesignationStatusBase<T>
     @ManyToOne(fetch = FetchType.LAZY, targetEntity = TypeDesignationStatusBase.class)
     private T typeStatus;
 
-    //the lectotype (or similar) reference
-    @XmlElement(name = "Citation")
-    @XmlIDREF
-    @XmlSchemaType(name = "IDREF")
-    @ManyToOne(fetch = FetchType.LAZY)
-    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
-    private Reference citation;
-
-    //Details of the lectotype reference.
-    @XmlElement(name = "CitationMicroReference")
-    private String citationMicroReference;
-
     //the source for the lectotypification (or similar)
     @XmlElement(name = "source")
     @XmlIDREF

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
index dd333821a0a8566fa7a09c3350e7077279ed703e..49e51044a2bb1e4f10d3cc62e8114f63ea968b68 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
@@ -34,7 +34,6 @@ import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlIDREF;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
@@ -85,7 +84,6 @@ import eu.etaxonomy.cdm.validation.annotation.ChildTaxaMustNotSkipRanks;
     "treeIndex",
     "sortIndex",
     "childNodes",
-//    "source",
     "countChildren",
     "agentRelations",
     "synonymToBeUsed",
@@ -160,18 +158,6 @@ public class TaxonNode
 //    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE, CascadeType.DELETE, CascadeType.PERSIST})
 //    private DescriptionElementSource source;
 
-//    @XmlElement(name = "reference")
-//    @XmlIDREF
-//    @XmlSchemaType(name = "IDREF")
-    @XmlTransient
-    @ManyToOne(fetch = FetchType.LAZY)
-    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
-    private Reference referenceForParentChildRelation;
-
-//    @XmlElement(name = "microReference")
-    @XmlTransient
-    private String microReferenceForParentChildRelation;
-
     @XmlElement(name = "countChildren")
     private int countChildren;
 

diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/PreferenceDaoTest.testFindTaxonNodeString.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/PreferenceDaoTest.testFindTaxonNodeString.xml
index a8535ec17260809a03c1abc3fcd296a577dd230d..bfb6e1994ce21c07aff0555012028fe44e553330 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/PreferenceDaoTest.testFindTaxonNodeString.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/PreferenceDaoTest.testFindTaxonNodeString.xml
@@ -7,10 +7,10 @@
   <TAXONBASE DTYPE="Taxon" ID="5000" CREATED="2016-06-03 16:48:00.0" UUID="db5b95d5-b08a-4e3c-aaee-cfe491ba2dd5" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="??? sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="[null]" SEC_ID="[null]"/>
   <TAXONBASE DTYPE="Taxon" ID="5001" CREATED="2016-06-03 16:48:00.0" UUID="dcf4f8bc-363a-4a6e-8444-10a1a16bec27" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="??? sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="[null]" SEC_ID="[null]"/>
   <TAXONBASE DTYPE="Taxon" ID="5002" CREATED="2016-06-03 16:48:00.0" UUID="03b4c26a-8a81-4e48-93ec-474123edf77e" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="??? sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="[null]" SEC_ID="[null]"/>
-  <TAXONNODE ID="5000" CREATED="2016-06-03 16:48:00.0" UUID="0ed24553-1ee8-423d-9233-37b59dbf9f79" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5001" CREATED="2016-06-03 16:48:00.0" UUID="4ca97177-744d-4a20-99cc-8ab9bd38bc11" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
-  <TAXONNODE ID="5002" CREATED="2016-06-03 16:48:00.0" UUID="55108b5c-48fa-4a65-a87f-a7dddc5cd7d1" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
-  <TAXONNODE ID="5003" CREATED="2016-06-03 16:48:00.0" UUID="41808a50-8d48-4896-b49d-865e5b278b19" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#5003#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>
+  <TAXONNODE ID="5000" CREATED="2016-06-03 16:48:00.0" UUID="0ed24553-1ee8-423d-9233-37b59dbf9f79" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5001" CREATED="2016-06-03 16:48:00.0" UUID="4ca97177-744d-4a20-99cc-8ab9bd38bc11" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
+  <TAXONNODE ID="5002" CREATED="2016-06-03 16:48:00.0" UUID="55108b5c-48fa-4a65-a87f-a7dddc5cd7d1" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="5001" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
+  <TAXONNODE ID="5003" CREATED="2016-06-03 16:48:00.0" UUID="41808a50-8d48-4896-b49d-865e5b278b19" UPDATED="2016-06-03 16:48:00.946" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#5003#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5002" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>
   <LANGUAGESTRING ID="5000" UUID="fcecb73e-ddc8-4997-9a57-cfa04cf43791" TEXT="My classification" LANGUAGE_ID="406"/>  
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="AuditEvent" NEXT_VAL="5002"/>
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="Classification" NEXT_VAL="5001"/>

diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testPropertyPath.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testPropertyPath.xml
index 126cf141a01d41a2a9c245affff3097db2076695..a5a27ddb6ad1afc291ae52c5f48bd774f3cc64cc 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testPropertyPath.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testPropertyPath.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../database/schema/dataset.xsd">
   <CLASSIFICATION ID="5000" CREATED="2015-10-22 12:33:25.0" UUID="4bceea53-893f-4685-8c63-6dcec6e85ab1" PROTECTEDTITLECACHE="false" TITLECACHE="Test" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5000"/>
-  <TAXONNODE ID="5000" CREATED="2015-10-22 12:33:25.0" UUID="eddefefd-0d00-4d2d-9497-6b64631c8f75" UPDATED="2015-10-22 12:33:25.548" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5001" CREATED="2015-10-22 12:33:25.0" UUID="23606836-b7e0-4b09-8a34-90699547fa6e" UPDATED="2015-10-22 12:33:25.548" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
+  <TAXONNODE ID="5000" CREATED="2015-10-22 12:33:25.0" UUID="eddefefd-0d00-4d2d-9497-6b64631c8f75" UPDATED="2015-10-22 12:33:25.548" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5001" CREATED="2015-10-22 12:33:25.0" UUID="23606836-b7e0-4b09-8a34-90699547fa6e" UPDATED="2015-10-22 12:33:25.548" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
   <TAXONBASE DTYPE="Taxon" ID="5000" CREATED="2015-10-22 12:33:25.0" UUID="4a5bc930-844f-45ec-aea8-dd155e1ab25f" PROTECTEDTITLECACHE="false" TITLECACHE="Taxon#0&lt;4a5bc930-844f-45ec-aea8-dd155e1ab25f&gt;" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="[null]" SEC_ID="[null]"/>
   <LANGUAGESTRING ID="5000" CREATED="2015-10-22 12:33:25.0" UUID="770090f5-7f8a-42bf-8977-253ad714ad84" TEXT="Test" LANGUAGE_ID="406"/>
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="Classification" NEXT_VAL="5001"/>

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceDeepTest.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceDeepTest.xml
index 9a4bb37c381ff7885b6cd5d54e7922506559643f..527885bd11d7843e0f58ce05e35c143f25b391eb 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceDeepTest.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceDeepTest.xml
@@ -2,15 +2,15 @@
 <dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../database/schema/dataset.xsd">
   <CLASSIFICATION ID="1" CREATED="2015-01-28 12:17:56.0" UUID="52b41b07-5500-43ae-82e6-ea2fd328c3d5" UPDATED="2015-01-28 12:17:56.485" PROTECTEDTITLECACHE="false" TITLECACHE="New Classification" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" NAME_ID="1" REFERENCE_ID="[null]" ROOTNODE_ID="2"/>
   <LANGUAGESTRING ID="1" CREATED="2015-01-28 12:17:56.0" UUID="b45b52e7-52a1-4cdf-82ef-c011ce324d3a" UPDATED="2015-01-28 12:17:56.462" TEXT="New Classification" LANGUAGE_ID="406"/>
-  <TAXONNODE ID="1" CREATED="2015-01-28 12:17:56.0" UUID="0bc9976a-ab5a-4eeb-9d22-20ddbfc8b6b3" UPDATED="2015-01-28 12:17:56.461" SORTINDEX="0" TREEINDEX="#t1#2#1#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="1" PARENT_ID="2" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="4"/>
-  <TAXONNODE ID="2" CREATED="2015-01-28 12:17:56.0" UUID="96bed6ff-09ea-4317-ace4-2e97be6ba09c" UPDATED="2015-01-28 12:17:56.462" SORTINDEX="-1" TREEINDEX="#t1#2#" COUNTCHILDREN="4" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="1" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="3" CREATED="2015-01-28 12:17:56.0" UUID="c3275c07-127d-4411-8878-f80d152542c5" UPDATED="2015-01-28 12:17:56.478" SORTINDEX="1" TREEINDEX="#t1#2#3#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="1" PARENT_ID="2" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="1"/>
-  <TAXONNODE ID="4" CREATED="2015-01-28 12:17:56.0" UUID="887ccf7d-76e6-4a1b-8a10-98e1a41065cd" UPDATED="2015-01-28 12:17:56.478" SORTINDEX="2" TREEINDEX="#t1#2#4#" COUNTCHILDREN="3" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="1" PARENT_ID="2" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="2"/>
-  <TAXONNODE ID="5" CREATED="2015-01-28 12:17:56.0" UUID="410524ee-c523-4583-b94d-b2ad974ab723" UPDATED="2015-01-28 12:17:56.478" SORTINDEX="3" TREEINDEX="#t1#2#5#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="1" PARENT_ID="2" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="3"/>
-  <TAXONNODE ID="6" CREATED="2015-01-28 12:17:56.0" UUID="7fa3ddd8-b49f-4063-9f05-7021f7fa40d0" UPDATED="2015-01-28 12:17:56.479" SORTINDEX="0" TREEINDEX="#t1#2#1#6#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="1" PARENT_ID="1" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5"/>
-  <TAXONNODE ID="7" CREATED="2015-01-28 12:17:56.0" UUID="9024c2a4-eb39-44bd-ad38-cae5c263a53f" UPDATED="2015-01-28 12:17:56.48" SORTINDEX="0" TREEINDEX="#t1#2#4#7#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="1" PARENT_ID="4" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="6"/>
-  <TAXONNODE ID="8" CREATED="2015-01-28 12:17:56.0" UUID="d1eebdf3-962d-4efd-8ef4-6d3b02801aad" UPDATED="2015-01-28 12:17:56.482" SORTINDEX="1" TREEINDEX="#t1#2#4#8#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="1" PARENT_ID="4" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="7"/>
-  <TAXONNODE ID="9" CREATED="2015-01-28 12:17:56.0" UUID="4fd62300-52f7-4c6d-b64e-e939484bb21c" UPDATED="2015-01-28 12:17:56.484" SORTINDEX="2" TREEINDEX="#t1#2#4#9#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="1" PARENT_ID="4" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="8"/>
+  <TAXONNODE ID="1" CREATED="2015-01-28 12:17:56.0" UUID="0bc9976a-ab5a-4eeb-9d22-20ddbfc8b6b3" UPDATED="2015-01-28 12:17:56.461" SORTINDEX="0" TREEINDEX="#t1#2#1#" COUNTCHILDREN="1" CLASSIFICATION_ID="1" PARENT_ID="2" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="4"/>
+  <TAXONNODE ID="2" CREATED="2015-01-28 12:17:56.0" UUID="96bed6ff-09ea-4317-ace4-2e97be6ba09c" UPDATED="2015-01-28 12:17:56.462" SORTINDEX="-1" TREEINDEX="#t1#2#" COUNTCHILDREN="4" CLASSIFICATION_ID="1" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="3" CREATED="2015-01-28 12:17:56.0" UUID="c3275c07-127d-4411-8878-f80d152542c5" UPDATED="2015-01-28 12:17:56.478" SORTINDEX="1" TREEINDEX="#t1#2#3#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="2" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="1"/>
+  <TAXONNODE ID="4" CREATED="2015-01-28 12:17:56.0" UUID="887ccf7d-76e6-4a1b-8a10-98e1a41065cd" UPDATED="2015-01-28 12:17:56.478" SORTINDEX="2" TREEINDEX="#t1#2#4#" COUNTCHILDREN="3" CLASSIFICATION_ID="1" PARENT_ID="2" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="2"/>
+  <TAXONNODE ID="5" CREATED="2015-01-28 12:17:56.0" UUID="410524ee-c523-4583-b94d-b2ad974ab723" UPDATED="2015-01-28 12:17:56.478" SORTINDEX="3" TREEINDEX="#t1#2#5#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="2" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="3"/>
+  <TAXONNODE ID="6" CREATED="2015-01-28 12:17:56.0" UUID="7fa3ddd8-b49f-4063-9f05-7021f7fa40d0" UPDATED="2015-01-28 12:17:56.479" SORTINDEX="0" TREEINDEX="#t1#2#1#6#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="1" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5"/>
+  <TAXONNODE ID="7" CREATED="2015-01-28 12:17:56.0" UUID="9024c2a4-eb39-44bd-ad38-cae5c263a53f" UPDATED="2015-01-28 12:17:56.48" SORTINDEX="0" TREEINDEX="#t1#2#4#7#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="4" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="6"/>
+  <TAXONNODE ID="8" CREATED="2015-01-28 12:17:56.0" UUID="d1eebdf3-962d-4efd-8ef4-6d3b02801aad" UPDATED="2015-01-28 12:17:56.482" SORTINDEX="1" TREEINDEX="#t1#2#4#8#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="4" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="7"/>
+  <TAXONNODE ID="9" CREATED="2015-01-28 12:17:56.0" UUID="4fd62300-52f7-4c6d-b64e-e939484bb21c" UPDATED="2015-01-28 12:17:56.484" SORTINDEX="2" TREEINDEX="#t1#2#4#9#" COUNTCHILDREN="0" CLASSIFICATION_ID="1" PARENT_ID="4" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="8"/>
   <TAXONBASE DTYPE="Taxon" ID="1" CREATED="2015-01-28 12:17:56.0" UUID="e8bc5566-eca6-4814-b18a-814c16c66144" UPDATED="2015-01-28 12:17:56.463" PROTECTEDTITLECACHE="false" TITLECACHE="Griftus sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="1" SEC_ID="[null]"/>
   <TAXONBASE DTYPE="Taxon" ID="2" CREATED="2015-01-28 12:17:56.0" UUID="c1cae3aa-960e-482f-b336-f3e657e96c43" UPDATED="2015-01-28 12:17:56.466" PROTECTEDTITLECACHE="false" TITLECACHE="Genus genus sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="2" SEC_ID="[null]"/>
   <TAXONBASE DTYPE="Taxon" ID="3" CREATED="2015-01-28 12:17:56.0" UUID="15d719a2-d27d-4366-92de-0898b2f3ebc8" UPDATED="2015-01-28 12:17:56.468" PROTECTEDTITLECACHE="false" TITLECACHE="Griftus grifatus subsp. fikus sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="3" SEC_ID="[null]"/>

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.xml
index 56eb357be0d204323c436e5dcd8ad6f3e42733b7..e7e65576bea4a8369d0f7ffe2cd3b9fa44385b4e 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.xml
@@ -18,15 +18,15 @@
   <TAXONNAME NAMETYPE="ICNAFP" ID="5007" UUID="3498c017-e8d1-43e0-9cb8-9edbdbe6f403" PROTECTEDTITLECACHE="false" TITLECACHE="Acacia acicularis Willd." APPENDEDPHRASE="[null]" FULLTITLECACHE="Acacia acicularis Willd., Sp. Pl." PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="Willd." BINOMHYBRID="false" GENUSORUNINOMIAL="Acacia" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="Acacia acicularis" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="acicularis" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5007" RANK_ID="765"/>\r
   <REFERENCE ID="5000" UUID="d8db2b51-cb22-40ad-90e2-f66fa1306639" PROTECTEDTITLECACHE="true" TITLECACHE="Sp. Pl." NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" TITLE="[null]" ABBREVTITLECACHE="" PROTECTEDABBREVTITLECACHE="false" REFTYPE="BK" INSTITUTION_ID="[null]"/>\r
   <CLASSIFICATION ID="5000" UUID="6c2bc8d9-ee62-4222-be89-4a8e31770878" PROTECTEDTITLECACHE="false" TITLECACHE="Acacia Classification" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5000"/>\r
-  <TAXONNODE ID="5000" UUID="6b4966ae-8815-49e5-849c-7001b29e5ed0" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="2" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>\r
-  <TAXONNODE ID="5001" UUID="26cc5c08-72df-45d4-84ea-ce81e7e53114" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="4" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>\r
-  <TAXONNODE ID="5002" UUID="65f23459-be2c-4cad-9408-9b3c4a80ecb8" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>\r
-  <TAXONNODE ID="5003" UUID="0ac5ae92-538f-4af5-bdf7-b44dd8b74d24" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#5003#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>\r
-  <TAXONNODE ID="5004" UUID="47ba200d-b6ab-49d2-8f29-fe467c21c4e6" SORTINDEX="1" TREEINDEX="#t5000#5000#5001#5004#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>\r
-  <TAXONNODE ID="5005" UUID="6d13b1f4-de14-48a0-a9c7-12623339475e" SORTINDEX="2" TREEINDEX="#t5000#5000#5001#5005#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5004"/>\r
-  <TAXONNODE ID="5006" UUID="48021a9c-a3b3-426c-8fbb-0054f9c6c162" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5005#5006#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5005" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>\r
-  <TAXONNODE ID="5007" UUID="59ae3ba6-a0a6-43af-9809-5a311d5cbd5f" SORTINDEX="3" TREEINDEX="#t5000#5000#5001#5007#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5006"/>\r
-  <TAXONNODE ID="5008" UUID="fdc56219-0005-4ca9-843b-90405688024d" SORTINDEX="1" TREEINDEX="#t5000#5000#5008#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>\r
+  <TAXONNODE ID="5000" UUID="6b4966ae-8815-49e5-849c-7001b29e5ed0" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="2" CLASSIFICATION_ID="5000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>\r
+  <TAXONNODE ID="5001" UUID="26cc5c08-72df-45d4-84ea-ce81e7e53114" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="4" CLASSIFICATION_ID="5000" PARENT_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>\r
+  <TAXONNODE ID="5002" UUID="65f23459-be2c-4cad-9408-9b3c4a80ecb8" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="5001" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>\r
+  <TAXONNODE ID="5003" UUID="0ac5ae92-538f-4af5-bdf7-b44dd8b74d24" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#5003#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5002" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>\r
+  <TAXONNODE ID="5004" UUID="47ba200d-b6ab-49d2-8f29-fe467c21c4e6" SORTINDEX="1" TREEINDEX="#t5000#5000#5001#5004#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5001" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>\r
+  <TAXONNODE ID="5005" UUID="6d13b1f4-de14-48a0-a9c7-12623339475e" SORTINDEX="2" TREEINDEX="#t5000#5000#5001#5005#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="5001" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5004"/>\r
+  <TAXONNODE ID="5006" UUID="48021a9c-a3b3-426c-8fbb-0054f9c6c162" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5005#5006#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5005" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>\r
+  <TAXONNODE ID="5007" UUID="59ae3ba6-a0a6-43af-9809-5a311d5cbd5f" SORTINDEX="3" TREEINDEX="#t5000#5000#5001#5007#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5001" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5006"/>\r
+  <TAXONNODE ID="5008" UUID="fdc56219-0005-4ca9-843b-90405688024d" SORTINDEX="1" TREEINDEX="#t5000#5000#5008#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>\r
   <LANGUAGESTRING ID="5000" UUID="70422fe3-a01d-4780-b9f4-4b807177f6bb" UPDATED="2015-09-03 10:40:10.798" TEXT="Acacia Classification" LANGUAGE_ID="406"/>\r
   <HOMOTYPICALGROUP ID="5000" UUID="93799212-6c6b-4b68-8367-d54194750539"/>\r
   <HOMOTYPICALGROUP ID="5001" UUID="3685196d-730c-4c7e-90b7-19c322543988"/>\r

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.testFindByIdentifierOrMarker.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.testFindByIdentifierOrMarker.xml
index d8a0ec0ec6da66f6c176344c749a61045a364b89..45279fb2bc9d665fdcb1dc39d61b35760969ace9 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.testFindByIdentifierOrMarker.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.testFindByIdentifierOrMarker.xml
@@ -32,8 +32,8 @@
   <TAXONNAME_MARKER TAXONNAME_ID="5000" MARKERS_ID="5000"/>
   
   <CLASSIFICATION ID="5000" CREATED="2015-01-07 21:54:20.0" UUID="277ac532-b670-4a1b-927a-61063ecfeb5b" UPDATED="2015-01-07 21:54:20.76" PROTECTEDTITLECACHE="true" TITLECACHE="My classification" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" NAME_ID="[null]" REFERENCE_ID="[null]" ROOTNODE_ID="5000"/>
-  <TAXONNODE ID="5000" CREATED="2015-01-07 21:54:20.0" UUID="cf00cde1-efc8-4d3b-8c5c-71c3d6e692d9" UPDATED="2015-01-07 21:54:20.76" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5001" CREATED="2015-01-07 21:54:20.0" UUID="73d8ece1-c511-48b7-9a1f-f6fab3149bf1" UPDATED="2015-01-07 21:54:20.76" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
+  <TAXONNODE ID="5000" CREATED="2015-01-07 21:54:20.0" UUID="cf00cde1-efc8-4d3b-8c5c-71c3d6e692d9" UPDATED="2015-01-07 21:54:20.76" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5001" CREATED="2015-01-07 21:54:20.0" UUID="73d8ece1-c511-48b7-9a1f-f6fab3149bf1" UPDATED="2015-01-07 21:54:20.76" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
   <HOMOTYPICALGROUP ID="5000" CREATED="2015-01-07 21:54:20.0" UUID="599e8459-4302-47d5-aa0b-9b69a0f329e4" UPDATED="2015-01-07 21:54:20.76"/>  
   <REFERENCE ID="1" CREATED="2008-12-10 09:56:07.0" UUID="ad4322b7-4b05-48af-be70-f113e46c545e" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="cate-sphingidae.org" PROTECTEDTITLECACHE="true" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="Sp. Pl." ABBREVTITLE="Sp. Pl." NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1"/>
   <REFERENCE ID="2" CREATED="2008-12-10 09:56:07.0" UUID="596b1325-be50-4b0a-9aa2-3ecd610215f2" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="Lorem ipsum" PROTECTEDTITLECACHE="true" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="Sp. Pl." ABBREVTITLE="Sp. Pl." NOMENCLATURALLYRELEVANT="true" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1"/>

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest-testAllKindsOfSpecimenAssociations.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest-testAllKindsOfSpecimenAssociations.xml
index de75ff2e71270f0fa80d5a62d718f3cd242790df..d5283d8ee80b94c934f9c1339020a847d5299c9e 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest-testAllKindsOfSpecimenAssociations.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest-testAllKindsOfSpecimenAssociations.xml
@@ -12,8 +12,8 @@
   <DESCRIPTIONBASE DTYPE="TaxonDescription" ID="5000" CREATED="2018-04-25 11:57:40.0" UUID="e94ecb2d-b26f-4223-9349-131ec1ea220f" PROTECTEDTITLECACHE="false" TITLECACHE="Factual data for Campanula patual" IMAGEGALLERY="false" ISDEFAULT="false" SPECIMEN_ID="[null]" TAXON_ID="5000" TAXONNAME_ID="[null]"/>
   <TAXONBASE DTYPE="Taxon" ID="5000" CREATED="2018-04-25 11:57:40.0" UUID="07cc47a5-1a63-46a1-8366-0d59d2b90d5b" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Campanula patual sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="5000" SEC_ID="[null]" ACCEPTEDTAXON_ID="[null]" TYPE_ID="[null]"/>
   <TAXONBASE DTYPE="Synonym" ID="5001" CREATED="2018-04-25 11:57:40.0" UUID="c16bcd9b-7d18-4fb5-af60-f9ef14c1d3a9" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Syno nyma syn. sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="[null]" NAME_ID="5001" SEC_ID="[null]" ACCEPTEDTAXON_ID="5000" TYPE_ID="847"/>
-  <TAXONNODE ID="5000" CREATED="2018-04-25 11:57:40.0" UUID="d5a9525b-3398-463d-bbbd-de1976ba9bdc" UPDATED="2018-04-25 11:57:40.417" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5001" CREATED="2018-04-25 11:57:40.0" UUID="6b8b6ff9-66e4-4496-8e5a-7d03bdf9a076" UPDATED="2018-04-25 11:57:40.417" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
+  <TAXONNODE ID="5000" CREATED="2018-04-25 11:57:40.0" UUID="d5a9525b-3398-463d-bbbd-de1976ba9bdc" UPDATED="2018-04-25 11:57:40.417" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5001" CREATED="2018-04-25 11:57:40.0" UUID="6b8b6ff9-66e4-4496-8e5a-7d03bdf9a076" UPDATED="2018-04-25 11:57:40.417" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
   <CLASSIFICATION ID="5000" CREATED="2018-04-25 11:57:40.0" UUID="5854bb37-13f3-48e7-891e-dc8c82f355df" PROTECTEDTITLECACHE="false" TITLECACHE="Test Classification" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5000"/>
   <TYPEDESIGNATIONBASE DTYPE="SpecimenTypeDesignation" ID="5000" CREATED="2018-04-25 11:57:40.0" UUID="33315177-2a71-4369-b020-fece07a8cc04" NOTDESIGNATED="false" TYPESTATUS_ID="[null]" TYPESPECIMEN_ID="5007"/>
   <TAXONNAME ID="5000" CREATED="2018-04-25 11:57:40.0" UUID="e59b95c0-9ad6-48be-af62-a982ba72b917" NAMETYPE="ICNAFP" PROTECTEDTITLECACHE="false" TITLECACHE="Campanula patual" APPENDEDPHRASE="[null]" FULLTITLECACHE="Campanula patual" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="Campanula" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="Campanula patual" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="patual" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5000" RANK_ID="765"/>

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/StatisticsServiceImplTest2.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/StatisticsServiceImplTest2.xml
index 869d735be50ac05de4cf54308787ec46f38a4cbb..264cae15451fc24fceaa0fc88771b4485877c430 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/StatisticsServiceImplTest2.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/StatisticsServiceImplTest2.xml
@@ -167,20 +167,20 @@
   <CLASSIFICATION_TAXONNODE CLASSIFICATION_ID="5002" ROOTNODES_ID="5011" SORTINDEX="0"/>
   <CLASSIFICATION_TAXONNODE CLASSIFICATION_ID="5002" ROOTNODES_ID="5012" SORTINDEX="1"/>
   <CLASSIFICATION_TAXONNODE CLASSIFICATION_ID="5002" ROOTNODES_ID="5013" SORTINDEX="2"/>-->
-  <TAXONNODE ID="5000" UUID="be386230-ee0d-4c2a-9c3d-6e240fda0bc0" SORTINDEX="0" TREEINDEX="#t5000#5000#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
-  <TAXONNODE ID="5001" UUID="87910dc8-8c14-446a-99d4-51ff6cd42bb4" SORTINDEX="0" TREEINDEX="#t5001#5001#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
-  <TAXONNODE ID="5002" UUID="47cfaf6f-bd85-4bbd-a52e-c0ba45f4e226" SORTINDEX="1" TREEINDEX="#t5000#5002#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
-  <TAXONNODE ID="5003" UUID="ef8dfc02-6833-4da1-bd2e-42bffe437141" SORTINDEX="1" TREEINDEX="#t5001#5003#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
-  <TAXONNODE ID="5004" UUID="d6dc4747-2b01-4590-87c5-280ab3a64b36" SORTINDEX="2" TREEINDEX="#t5001#5004#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>
-  <TAXONNODE ID="5005" UUID="d5517660-0aaa-42de-b579-c1c2cb8b992f" SORTINDEX="2" TREEINDEX="#t5000#5005#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>
-  <TAXONNODE ID="5006" UUID="221bc288-466e-4317-a783-0a15c008b837" SORTINDEX="3" TREEINDEX="#t5001#5006#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>
-  <TAXONNODE ID="5007" UUID="a83ab208-334c-4ed7-8174-352daaf02820" SORTINDEX="3" TREEINDEX="#t5000#5007#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>
-  <TAXONNODE ID="5008" UUID="46936311-c170-4dea-ba07-d14656f94dad" SORTINDEX="4" TREEINDEX="#t5000#5008#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5009"/>
-  <TAXONNODE ID="5009" UUID="b2e8b073-6608-4a0b-9805-a8180137bc42" SORTINDEX="4" TREEINDEX="#t5001#5009#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5011"/>
-  <TAXONNODE ID="5010" UUID="2fb16069-49c8-4c9c-be2d-648b50218676" SORTINDEX="5" TREEINDEX="#t5001#5010#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5013"/>
-  <TAXONNODE ID="5011" UUID="e1b8cf42-e5c9-4c73-a5d5-5c12b7fd6639" SORTINDEX="0" TREEINDEX="#t5002#5011#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5002" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5014"/>
-  <TAXONNODE ID="5012" UUID="1bad66fa-748e-4dee-9bbe-fecc43749c04" SORTINDEX="1" TREEINDEX="#t5002#5012#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5002" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5015"/>
-  <TAXONNODE ID="5013" UUID="da948f9a-ddb8-4193-bba7-f51df3760cbc" SORTINDEX="2" TREEINDEX="#t5002#5013#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5002" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5016"/>
+  <TAXONNODE ID="5000" UUID="be386230-ee0d-4c2a-9c3d-6e240fda0bc0" SORTINDEX="0" TREEINDEX="#t5000#5000#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
+  <TAXONNODE ID="5001" UUID="87910dc8-8c14-446a-99d4-51ff6cd42bb4" SORTINDEX="0" TREEINDEX="#t5001#5001#" COUNTCHILDREN="0" CLASSIFICATION_ID="5001" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
+  <TAXONNODE ID="5002" UUID="47cfaf6f-bd85-4bbd-a52e-c0ba45f4e226" SORTINDEX="1" TREEINDEX="#t5000#5002#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
+  <TAXONNODE ID="5003" UUID="ef8dfc02-6833-4da1-bd2e-42bffe437141" SORTINDEX="1" TREEINDEX="#t5001#5003#" COUNTCHILDREN="0" CLASSIFICATION_ID="5001" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
+  <TAXONNODE ID="5004" UUID="d6dc4747-2b01-4590-87c5-280ab3a64b36" SORTINDEX="2" TREEINDEX="#t5001#5004#" COUNTCHILDREN="0" CLASSIFICATION_ID="5001" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>
+  <TAXONNODE ID="5005" UUID="d5517660-0aaa-42de-b579-c1c2cb8b992f" SORTINDEX="2" TREEINDEX="#t5000#5005#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>
+  <TAXONNODE ID="5006" UUID="221bc288-466e-4317-a783-0a15c008b837" SORTINDEX="3" TREEINDEX="#t5001#5006#" COUNTCHILDREN="0" CLASSIFICATION_ID="5001" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>
+  <TAXONNODE ID="5007" UUID="a83ab208-334c-4ed7-8174-352daaf02820" SORTINDEX="3" TREEINDEX="#t5000#5007#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>
+  <TAXONNODE ID="5008" UUID="46936311-c170-4dea-ba07-d14656f94dad" SORTINDEX="4" TREEINDEX="#t5000#5008#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5009"/>
+  <TAXONNODE ID="5009" UUID="b2e8b073-6608-4a0b-9805-a8180137bc42" SORTINDEX="4" TREEINDEX="#t5001#5009#" COUNTCHILDREN="0" CLASSIFICATION_ID="5001" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5011"/>
+  <TAXONNODE ID="5010" UUID="2fb16069-49c8-4c9c-be2d-648b50218676" SORTINDEX="5" TREEINDEX="#t5001#5010#" COUNTCHILDREN="0" CLASSIFICATION_ID="5001" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5013"/>
+  <TAXONNODE ID="5011" UUID="e1b8cf42-e5c9-4c73-a5d5-5c12b7fd6639" SORTINDEX="0" TREEINDEX="#t5002#5011#" COUNTCHILDREN="0" CLASSIFICATION_ID="5002" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5014"/>
+  <TAXONNODE ID="5012" UUID="1bad66fa-748e-4dee-9bbe-fecc43749c04" SORTINDEX="1" TREEINDEX="#t5002#5012#" COUNTCHILDREN="0" CLASSIFICATION_ID="5002" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5015"/>
+  <TAXONNODE ID="5013" UUID="da948f9a-ddb8-4193-bba7-f51df3760cbc" SORTINDEX="2" TREEINDEX="#t5002#5013#" COUNTCHILDREN="0" CLASSIFICATION_ID="5002" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5016"/>
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="CdmMetaData" NEXT_VAL="5003"/>
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="Classification" NEXT_VAL="5003"/>
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="DescriptionBase" NEXT_VAL="5008"/>

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest-testFindCommonParentNode.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest-testFindCommonParentNode.xml
index 6fba19d08bb2d646c6adb170bd84343b63e78497..3fd6f18d4156c30988da4e33ae7dded2ddf9fda5 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest-testFindCommonParentNode.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest-testFindCommonParentNode.xml
@@ -23,15 +23,15 @@
   <HOMOTYPICALGROUP ID="5006" CREATED="2018-06-26 09:03:54.0" UUID="c1e131a7-7f6f-4d83-99a0-97bf709bf13b"/>
   <CLASSIFICATION ID="5000" CREATED="2018-06-26 09:03:54.0" UUID="c6e3a598-3b6c-4ef5-8b01-5bdb3de5a9fd" UPDATED="2018-06-26 09:03:54.906" PROTECTEDTITLECACHE="false" TITLECACHE="Checklist2" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5001"/>
   <CLASSIFICATION ID="5001" CREATED="2018-06-26 09:03:54.0" UUID="029b4c07-5903-4dcf-87e8-406ed0e0285f" UPDATED="2018-06-26 09:03:54.908" PROTECTEDTITLECACHE="false" TITLECACHE="Checklist" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" NAME_ID="5001" REFERENCE_ID="[null]" ROOTNODE_ID="5004"/>
-  <TAXONNODE ID="5000" CREATED="2018-06-26 09:03:54.0" UUID="62fa918d-a1d8-4284-ae4b-93478bde8656" SORTINDEX="0" TREEINDEX="#t5000#5001#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
-  <TAXONNODE ID="5001" CREATED="2018-06-26 09:03:54.0" UUID="98f0f11b-36b7-4d07-bc8a-27f749bd5c23" UPDATED="2018-06-26 09:03:54.907" SORTINDEX="-1" TREEINDEX="#t5000#5001#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5002" CREATED="2018-06-26 09:03:54.0" UUID="dce3defa-5123-44a7-8008-0cc9b27461f6" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="0" TREEINDEX="#t5000#5001#5000#5002#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
-  <TAXONNODE ID="5003" CREATED="2018-06-26 09:03:54.0" UUID="f8306fd3-9825-41bf-94aa-a7b5790b553e" SORTINDEX="0" TREEINDEX="#t5001#5004#5003#" COUNTCHILDREN="2" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5004" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>
-  <TAXONNODE ID="5004" CREATED="2018-06-26 09:03:54.0" UUID="d7cf3b5d-a758-44c5-be66-5a5cedfa8868" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="-1" TREEINDEX="#t5001#5004#" COUNTCHILDREN="2" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5005" CREATED="2018-06-26 09:03:54.0" UUID="c70f76e5-2dcb-41c5-ae6f-d756e0a0fae0" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="0" TREEINDEX="#t5001#5004#5003#5005#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5003" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
-  <TAXONNODE ID="5006" CREATED="2018-06-26 09:03:54.0" UUID="06d58161-7707-44b5-b720-6c0eb916b37c" SORTINDEX="0" TREEINDEX="#t5001#5004#5003#5005#5006#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5005" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5004"/>
-  <TAXONNODE ID="5007" CREATED="2018-06-26 09:03:54.0" UUID="6dfd30dd-e589-493a-b66a-19c4cb374f92" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="1" TREEINDEX="#t5001#5004#5003#5007#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5003" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>
-  <TAXONNODE ID="5008" CREATED="2018-06-26 09:03:54.0" UUID="5d8e8341-f5e9-4616-96cf-f0351dda42f4" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="1" TREEINDEX="#t5001#5004#5008#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5004" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5006"/>
+  <TAXONNODE ID="5000" CREATED="2018-06-26 09:03:54.0" UUID="62fa918d-a1d8-4284-ae4b-93478bde8656" SORTINDEX="0" TREEINDEX="#t5000#5001#5000#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="5001" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
+  <TAXONNODE ID="5001" CREATED="2018-06-26 09:03:54.0" UUID="98f0f11b-36b7-4d07-bc8a-27f749bd5c23" UPDATED="2018-06-26 09:03:54.907" SORTINDEX="-1" TREEINDEX="#t5000#5001#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5002" CREATED="2018-06-26 09:03:54.0" UUID="dce3defa-5123-44a7-8008-0cc9b27461f6" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="0" TREEINDEX="#t5000#5001#5000#5002#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
+  <TAXONNODE ID="5003" CREATED="2018-06-26 09:03:54.0" UUID="f8306fd3-9825-41bf-94aa-a7b5790b553e" SORTINDEX="0" TREEINDEX="#t5001#5004#5003#" COUNTCHILDREN="2" CLASSIFICATION_ID="5001" PARENT_ID="5004" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>
+  <TAXONNODE ID="5004" CREATED="2018-06-26 09:03:54.0" UUID="d7cf3b5d-a758-44c5-be66-5a5cedfa8868" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="-1" TREEINDEX="#t5001#5004#" COUNTCHILDREN="2" CLASSIFICATION_ID="5001" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5005" CREATED="2018-06-26 09:03:54.0" UUID="c70f76e5-2dcb-41c5-ae6f-d756e0a0fae0" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="0" TREEINDEX="#t5001#5004#5003#5005#" COUNTCHILDREN="1" CLASSIFICATION_ID="5001" PARENT_ID="5003" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
+  <TAXONNODE ID="5006" CREATED="2018-06-26 09:03:54.0" UUID="06d58161-7707-44b5-b720-6c0eb916b37c" SORTINDEX="0" TREEINDEX="#t5001#5004#5003#5005#5006#" COUNTCHILDREN="0" CLASSIFICATION_ID="5001" PARENT_ID="5005" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5004"/>
+  <TAXONNODE ID="5007" CREATED="2018-06-26 09:03:54.0" UUID="6dfd30dd-e589-493a-b66a-19c4cb374f92" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="1" TREEINDEX="#t5001#5004#5003#5007#" COUNTCHILDREN="0" CLASSIFICATION_ID="5001" PARENT_ID="5003" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5005"/>
+  <TAXONNODE ID="5008" CREATED="2018-06-26 09:03:54.0" UUID="5d8e8341-f5e9-4616-96cf-f0351dda42f4" UPDATED="2018-06-26 09:03:54.908" SORTINDEX="1" TREEINDEX="#t5001#5004#5008#" COUNTCHILDREN="0" CLASSIFICATION_ID="5001" PARENT_ID="5004" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5006"/>
   <LANGUAGESTRING ID="5000" CREATED="2018-06-26 09:03:54.0" UUID="4278ecae-c434-4067-939c-356fe61f7b17" TEXT="Checklist2" LANGUAGE_ID="406"/>
   <LANGUAGESTRING ID="5001" CREATED="2018-06-26 09:03:54.0" UUID="2f155ffd-b11d-4bb3-ba3b-a0e2315d549a" TEXT="Checklist" LANGUAGE_ID="406"/>
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="AuditEvent" NEXT_VAL="5003"/>

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.xml
index a2944b989e84a48ff41bcc0893fe1382cc82960c..82a4496cad09544589555a085f885a41db613d65 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.xml
@@ -46,10 +46,10 @@
   <HOMOTYPICALGROUP ID="5009" CREATED="2017-01-20 21:58:08.0" UUID="dc106482-4f11-4c25-ad9a-e7e027b6a977"/>
   <CLASSIFICATION ID="5000" CREATED="2017-01-20 21:58:08.0" UUID="2a5ceebb-4830-4524-b330-78461bf8cb6b" UPDATED="2017-01-20 21:58:08.345" PROTECTEDTITLECACHE="false" TITLECACHE="European Abies" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5000"/>
   <CLASSIFICATION ID="5001" CREATED="2017-01-20 21:58:08.0" UUID="d7c741e3-ae9e-4a7d-a566-9e3a7a0b51ce" UPDATED="2017-01-20 21:58:08.347" PROTECTEDTITLECACHE="false" TITLECACHE="Abies alternative" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" NAME_ID="5001" REFERENCE_ID="[null]" ROOTNODE_ID="5001"/>
-  <TAXONNODE ID="5000" CREATED="2017-01-20 21:58:08.0" UUID="95ec6af8-012e-4da1-b1f4-d36286c1341b" UPDATED="2017-01-20 21:58:08.346" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5001" CREATED="2017-01-20 21:58:08.0" UUID="d41c22e6-a64b-4363-b530-835be88ef06f" UPDATED="2017-01-20 21:58:08.348" SORTINDEX="-1" TREEINDEX="#t5001#5001#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5001" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5002" CREATED="2017-01-20 21:58:08.0" UUID="8fcd2eba-8e13-4bdd-bad3-363529edcab7" SORTINDEX="0" TREEINDEX="#t5000#5000#5002#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
-  <TAXONNODE ID="5003" CREATED="2017-01-20 21:58:08.0" UUID="1b28f33b-bce5-449d-a23e-3ac02746c54c" SORTINDEX="0" TREEINDEX="#t5001#5001#5003#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5001" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>
+  <TAXONNODE ID="5000" CREATED="2017-01-20 21:58:08.0" UUID="95ec6af8-012e-4da1-b1f4-d36286c1341b" UPDATED="2017-01-20 21:58:08.346" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5001" CREATED="2017-01-20 21:58:08.0" UUID="d41c22e6-a64b-4363-b530-835be88ef06f" UPDATED="2017-01-20 21:58:08.348" SORTINDEX="-1" TREEINDEX="#t5001#5001#" COUNTCHILDREN="1" CLASSIFICATION_ID="5001" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5002" CREATED="2017-01-20 21:58:08.0" UUID="8fcd2eba-8e13-4bdd-bad3-363529edcab7" SORTINDEX="0" TREEINDEX="#t5000#5000#5002#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
+  <TAXONNODE ID="5003" CREATED="2017-01-20 21:58:08.0" UUID="1b28f33b-bce5-449d-a23e-3ac02746c54c" SORTINDEX="0" TREEINDEX="#t5001#5001#5003#" COUNTCHILDREN="0" CLASSIFICATION_ID="5001" PARENT_ID="5001" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5007"/>
   <LANGUAGESTRING ID="5000" CREATED="2017-01-20 21:58:08.0" UUID="cd8d8677-d2aa-41bd-8efc-bd9a9ae38d45" TEXT="European Abies" LANGUAGE_ID="406"/>
   <LANGUAGESTRING ID="5001" CREATED="2017-01-20 21:58:08.0" UUID="57ab0c25-375f-422d-bdd7-065293c343bd" TEXT="Abies alternative" LANGUAGE_ID="406"/>
   <LANGUAGESTRING ID="5002" CREATED="2017-01-20 21:58:08.0" UUID="eb1e5e88-b650-479f-9197-34829ca3f30f" TEXT="Die Balsam-Tanne (Abies balsamea) ist eine Pflanzenart aus der Gattung der Tannen (Abies). Sie w&#195;&#164;chst im nord&#195;&#182;stlichen Nordamerika, wo sie sowohl Tief- als auch Bergland besiedelt. Sie gilt als relativ anspruchslos gegen&#195;&#188;ber dem Standort und ist frosthart. In vielen Teilen des nat&#195;&#188;rlichen Verbreitungsgebietes stellt sie die Klimaxbaumart dar." LANGUAGE_ID="349"/>

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/description/DistributionAggregationTest.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/description/DistributionAggregationTest.xml
index 90e4f0d99feaa9571d4f342c9533e08ceed9a4f0..0dc82a9a906431932aeda71037fc5d6e9b31e8c3 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/description/DistributionAggregationTest.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/description/DistributionAggregationTest.xml
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../database/schema/dataset.xsd">
-  <TAXONBASE DTYPE="Taxon" ID="5000" CREATED="2016-06-27 14:26:11.0" UUID="f65d47bd-4f49-4ab1-bc4a-bc4551eaa1a8" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Lapsana sec. Sp.Pl." APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="5000" SEC_ID="5000"/>
-  <TAXONBASE DTYPE="Taxon" ID="5001" CREATED="2016-06-27 14:26:11.0" UUID="2a5ceebb-4830-4524-b330-78461bf8cb6b" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="L. communis sec. Sp.Pl." APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="5001" SEC_ID="5000"/>
-  <TAXONBASE DTYPE="Taxon" ID="5002" CREATED="2016-06-27 14:26:11.0" UUID="441a3c40-0c84-11de-8c30-0800200c9a66" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="L. communis subsp. communis sec. Sp.Pl." APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="5002" SEC_ID="5000"/>
-  <TAXONBASE DTYPE="Taxon" ID="5003" CREATED="2016-06-27 14:26:11.0" UUID="e4acf200-63b6-11dd-ad8b-0800200c9a66" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="L. communis subsp. adenophora sec. Sp.Pl." APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="5003" SEC_ID="5000"/>
-  <TAXONBASE DTYPE="Taxon" ID="5004" CREATED="2016-06-27 14:26:11.0" UUID="596b1325-be50-4b0a-9aa2-3ecd610215f2" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="L. communis subsp. alpina sec. Sp.Pl." APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="5004" SEC_ID="5000"/>
-  <TAXONNAME NAMETYPE="ICNAFP" ID="5000" CREATED="2016-06-27 14:26:11.0" UUID="463d06e3-2665-43cc-8c70-cb658c81a738" PROTECTEDTITLECACHE="true" TITLECACHE="Lapsana" APPENDEDPHRASE="[null]" FULLTITLECACHE="Lapsana" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5000" RANK_ID="774"/>
-  <TAXONNAME NAMETYPE="ICNAFP" ID="5001" CREATED="2016-06-27 14:26:11.0" UUID="2b718c66-1853-45c9-9f8e-e03057194349" PROTECTEDTITLECACHE="true" TITLECACHE="L. communis" APPENDEDPHRASE="[null]" FULLTITLECACHE="L. communis" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5001" RANK_ID="765"/>
-  <TAXONNAME NAMETYPE="ICNAFP" ID="5002" CREATED="2016-06-27 14:26:11.0" UUID="06a6a0fd-048e-45e5-aa32-1c7f2dc75421" PROTECTEDTITLECACHE="true" TITLECACHE="L. communis subsp. communis" APPENDEDPHRASE="[null]" FULLTITLECACHE="L. communis subsp. communis" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="subsp." PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5002" RANK_ID="763"/>
-  <TAXONNAME NAMETYPE="ICNAFP" ID="5003" CREATED="2016-06-27 14:26:11.0" UUID="6ce4f911-4932-4cfb-9793-2e45aaef59aa" PROTECTEDTITLECACHE="true" TITLECACHE="L. communis subsp. adenophora" APPENDEDPHRASE="[null]" FULLTITLECACHE="L. communis subsp. adenophora" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="subsp." PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5003" RANK_ID="763"/>
-  <TAXONNAME NAMETYPE="ICNAFP" ID="5004" CREATED="2016-06-27 14:26:11.0" UUID="1621acc6-142b-4987-a1d1-475aa01489dc" PROTECTEDTITLECACHE="true" TITLECACHE="L. communis subsp. alpina" APPENDEDPHRASE="[null]" FULLTITLECACHE="L. communis subsp. alpina" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="subsp." PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5004" RANK_ID="763"/>
-  <REFERENCE ID="5000" CREATED="2016-06-27 14:26:11.0" UUID="b59c0842-fba3-4255-8e32-5a064303b8a2" PROTECTEDTITLECACHE="true" TITLECACHE="Sp.Pl." DATEPUBLISHED_END="[null]" DATEPUBLISHED_FREETEXT="[null]" DATEPUBLISHED_START="[null]" NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" TITLE="[null]" ABBREVTITLECACHE="" PROTECTEDABBREVTITLECACHE="false" REFTYPE="DB" INSTITUTION_ID="[null]"/>
-  <REFERENCE ID="5001" CREATED="2016-06-27 14:26:11.0" UUID="3268a382-f51a-495e-8de6-763854944c7d" PROTECTEDTITLECACHE="false" TITLECACHE="Reference [type=Book, id= 0, uuid=3268a382-f51a-495e-8de6-763854944c7d]" DATEPUBLISHED_END="[null]" DATEPUBLISHED_FREETEXT="[null]" DATEPUBLISHED_START="[null]" NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" TITLE="[null]" ABBREVTITLECACHE="" PROTECTEDABBREVTITLECACHE="false" REFTYPE="BK" INSTITUTION_ID="[null]"/>
-  <CLASSIFICATION ID="5000" CREATED="2016-06-27 14:26:11.0" UUID="4b266053-a841-4980-b548-3f21d8d7d712" UPDATED="2016-06-27 14:26:11.88" PROTECTEDTITLECACHE="false" TITLECACHE="TestClassification" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5000"/>
-  <TAXONNODE ID="5000" CREATED="2016-06-27 14:26:11.0" UUID="06512abd-edf9-435b-a3d9-6cd6ede5aec8" UPDATED="2016-06-27 14:26:11.881" SORTINDEX="-1"  TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5001" CREATED="2016-06-27 14:26:11.0" UUID="dcf4f891-c486-4d36-b1d1-39fae7a5df2a" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
-  <TAXONNODE ID="5002" CREATED="2016-06-27 14:26:11.0" UUID="7dbe5319-ae7d-4140-bb3b-c34dc320d134" UPDATED="2016-06-27 14:26:11.882" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#" COUNTCHILDREN="3" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
-  <TAXONNODE ID="5003" CREATED="2016-06-27 14:26:11.0" UUID="4fd6c300-54b7-4f48-bad2-3126ab72a6d0" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#5003#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>
-  <TAXONNODE ID="5004" CREATED="2016-06-27 14:26:11.0" UUID="5523c20c-bbc2-4c89-8b36-e00e8314d252" UPDATED="2016-06-27 14:26:11.883" SORTINDEX="1" TREEINDEX="#t5000#5000#5001#5002#5004#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
-  <TAXONNODE ID="5005" CREATED="2016-06-27 14:26:11.0" UUID="65671bba-0373-4998-8a7b-410a67a2ddcf" UPDATED="2016-06-27 14:26:11.884" SORTINDEX="2" TREEINDEX="#t5000#5000#5001#5002#5005#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5004"/>
-  <HOMOTYPICALGROUP ID="5000" CREATED="2016-06-27 14:26:11.0" UUID="207c1e0c-ce60-4516-adf7-0ba5a61ee62f"/>
-  <HOMOTYPICALGROUP ID="5001" CREATED="2016-06-27 14:26:11.0" UUID="e18238ce-8d2c-4ac6-bf33-8f019012dfac"/>
-  <HOMOTYPICALGROUP ID="5002" CREATED="2016-06-27 14:26:11.0" UUID="85c073ca-bde7-4bdd-be40-e1783132f45e"/>
-  <HOMOTYPICALGROUP ID="5003" CREATED="2016-06-27 14:26:11.0" UUID="b2f33aa8-fb6e-4ca3-9ae4-6c6d49b08a71"/>
-  <HOMOTYPICALGROUP ID="5004" CREATED="2016-06-27 14:26:11.0" UUID="8ccf2a95-d355-4de1-8eda-ebd4b90e691d"/>
-  <LANGUAGESTRING ID="5000" CREATED="2016-06-27 14:26:11.0" UUID="57a6a64a-59e5-41ed-92ab-f53c03b29b14" TEXT="TestClassification" LANGUAGE_ID="406"/>
+  <TAXONBASE DTYPE="Taxon" ID="5000" UUID="f65d47bd-4f49-4ab1-bc4a-bc4551eaa1a8" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Lapsana sec. Sp.Pl." APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="5000" SEC_ID="5000"/>
+  <TAXONBASE DTYPE="Taxon" ID="5001" UUID="2a5ceebb-4830-4524-b330-78461bf8cb6b" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="L. communis sec. Sp.Pl." APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="5001" SEC_ID="5000"/>
+  <TAXONBASE DTYPE="Taxon" ID="5002" UUID="441a3c40-0c84-11de-8c30-0800200c9a66" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="L. communis subsp. communis sec. Sp.Pl." APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="5002" SEC_ID="5000"/>
+  <TAXONBASE DTYPE="Taxon" ID="5003" UUID="e4acf200-63b6-11dd-ad8b-0800200c9a66" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="L. communis subsp. adenophora sec. Sp.Pl." APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="5003" SEC_ID="5000"/>
+  <TAXONBASE DTYPE="Taxon" ID="5004" UUID="596b1325-be50-4b0a-9aa2-3ecd610215f2" SECMICROREFERENCE="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="L. communis subsp. alpina sec. Sp.Pl." APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" NAME_ID="5004" SEC_ID="5000"/>
+  <TAXONNAME NAMETYPE="ICNAFP" ID="5000" UUID="463d06e3-2665-43cc-8c70-cb658c81a738" PROTECTEDTITLECACHE="true" TITLECACHE="Lapsana" APPENDEDPHRASE="[null]" FULLTITLECACHE="Lapsana" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5000" RANK_ID="774"/>
+  <TAXONNAME NAMETYPE="ICNAFP" ID="5001" UUID="2b718c66-1853-45c9-9f8e-e03057194349" PROTECTEDTITLECACHE="true" TITLECACHE="L. communis" APPENDEDPHRASE="[null]" FULLTITLECACHE="L. communis" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5001" RANK_ID="765"/>
+  <TAXONNAME NAMETYPE="ICNAFP" ID="5002" UUID="06a6a0fd-048e-45e5-aa32-1c7f2dc75421" PROTECTEDTITLECACHE="true" TITLECACHE="L. communis subsp. communis" APPENDEDPHRASE="[null]" FULLTITLECACHE="L. communis subsp. communis" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="subsp." PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5002" RANK_ID="763"/>
+  <TAXONNAME NAMETYPE="ICNAFP" ID="5003" UUID="6ce4f911-4932-4cfb-9793-2e45aaef59aa" PROTECTEDTITLECACHE="true" TITLECACHE="L. communis subsp. adenophora" APPENDEDPHRASE="[null]" FULLTITLECACHE="L. communis subsp. adenophora" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="subsp." PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5003" RANK_ID="763"/>
+  <TAXONNAME NAMETYPE="ICNAFP" ID="5004" UUID="1621acc6-142b-4987-a1d1-475aa01489dc" PROTECTEDTITLECACHE="true" TITLECACHE="L. communis subsp. alpina" APPENDEDPHRASE="[null]" FULLTITLECACHE="L. communis subsp. alpina" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="subsp." PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5004" RANK_ID="763"/>
+  <REFERENCE ID="5000" UUID="b59c0842-fba3-4255-8e32-5a064303b8a2" PROTECTEDTITLECACHE="true" TITLECACHE="Sp.Pl." DATEPUBLISHED_END="[null]" DATEPUBLISHED_FREETEXT="[null]" DATEPUBLISHED_START="[null]" NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" TITLE="[null]" ABBREVTITLECACHE="" PROTECTEDABBREVTITLECACHE="false" REFTYPE="DB" INSTITUTION_ID="[null]"/>
+  <REFERENCE ID="5001" UUID="3268a382-f51a-495e-8de6-763854944c7d" PROTECTEDTITLECACHE="false" TITLECACHE="Reference [type=Book, id= 0, uuid=3268a382-f51a-495e-8de6-763854944c7d]" DATEPUBLISHED_END="[null]" DATEPUBLISHED_FREETEXT="[null]" DATEPUBLISHED_START="[null]" NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" TITLE="[null]" ABBREVTITLECACHE="" PROTECTEDABBREVTITLECACHE="false" REFTYPE="BK" INSTITUTION_ID="[null]"/>
+  <CLASSIFICATION ID="5000" UUID="4b266053-a841-4980-b548-3f21d8d7d712" UPDATED="2016-06-27 14:26:11.88" PROTECTEDTITLECACHE="false" TITLECACHE="TestClassification" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5000"/>
+  <TAXONNODE ID="5000" UUID="06512abd-edf9-435b-a3d9-6cd6ede5aec8" UPDATED="2016-06-27 14:26:11.881" SORTINDEX="-1"  TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5001" UUID="dcf4f891-c486-4d36-b1d1-39fae7a5df2a" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
+  <TAXONNODE ID="5002" UUID="7dbe5319-ae7d-4140-bb3b-c34dc320d134" UPDATED="2016-06-27 14:26:11.882" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#" COUNTCHILDREN="3" CLASSIFICATION_ID="5000" PARENT_ID="5001" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
+  <TAXONNODE ID="5003" UUID="4fd6c300-54b7-4f48-bad2-3126ab72a6d0" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#5003#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5002" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>
+  <TAXONNODE ID="5004" UUID="5523c20c-bbc2-4c89-8b36-e00e8314d252" UPDATED="2016-06-27 14:26:11.883" SORTINDEX="1" TREEINDEX="#t5000#5000#5001#5002#5004#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5002" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
+  <TAXONNODE ID="5005" UUID="65671bba-0373-4998-8a7b-410a67a2ddcf" UPDATED="2016-06-27 14:26:11.884" SORTINDEX="2" TREEINDEX="#t5000#5000#5001#5002#5005#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5002" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5004"/>
+  <HOMOTYPICALGROUP ID="5000" UUID="207c1e0c-ce60-4516-adf7-0ba5a61ee62f"/>
+  <HOMOTYPICALGROUP ID="5001" UUID="e18238ce-8d2c-4ac6-bf33-8f019012dfac"/>
+  <HOMOTYPICALGROUP ID="5002" UUID="85c073ca-bde7-4bdd-be40-e1783132f45e"/>
+  <HOMOTYPICALGROUP ID="5003" UUID="b2f33aa8-fb6e-4ca3-9ae4-6c6d49b08a71"/>
+  <HOMOTYPICALGROUP ID="5004" UUID="8ccf2a95-d355-4de1-8eda-ebd4b90e691d"/>
+  <LANGUAGESTRING ID="5000" UUID="57a6a64a-59e5-41ed-92ab-f53c03b29b14" TEXT="TestClassification" LANGUAGE_ID="406"/>
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="AuditEvent" NEXT_VAL="5003"/>
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="CdmMetaData" NEXT_VAL="5003"/>
   <HIBERNATE_SEQUENCES SEQUENCE_NAME="Classification" NEXT_VAL="5001"/>

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/description/StructuredDescriptionAggregationTest.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/description/StructuredDescriptionAggregationTest.xml
index 5832d52b9d0f518916bd60ba843269facd8ce1d6..e2b1aa2dc8191fc4410138a7c3f9b8aa7f06058e 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/description/StructuredDescriptionAggregationTest.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/description/StructuredDescriptionAggregationTest.xml
@@ -11,12 +11,12 @@
   <TAXONNAME ID="5003" CREATED="2019-11-26 13:23:34.0" UUID="494224de-a70c-4d06-a579-5b8ca2c3559b" NAMETYPE="ICNAFP" PROTECTEDTITLECACHE="true" TITLECACHE="L. communis subsp. adenophora" APPENDEDPHRASE="[null]" FULLTITLECACHE="L. communis subsp. adenophora" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="subsp." PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5003" RANK_ID="763" NOMENCLATURALSOURCE_ID="[null]"/>
   <TAXONNAME ID="5004" CREATED="2019-11-26 13:23:34.0" UUID="ba953d05-53e5-46ff-8d80-8cccb2cc5f9d" NAMETYPE="ICNAFP" PROTECTEDTITLECACHE="true" TITLECACHE="L. communis subsp. alpina" APPENDEDPHRASE="[null]" FULLTITLECACHE="L. communis subsp. alpina" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="[null]" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="subsp." PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5004" RANK_ID="763" NOMENCLATURALSOURCE_ID="[null]"/>
   <CLASSIFICATION ID="5000" CREATED="2019-11-26 13:23:34.0" UUID="4b266053-a841-4980-b548-3f21d8d7d712" UPDATED="2019-11-26 13:23:34.183" PROTECTEDTITLECACHE="false" TITLECACHE="TestClassification" MICROREFERENCE="[null]" TIMEPERIOD_START="[null]" TIMEPERIOD_FREETEXT="[null]" TIMEPERIOD_END="[null]" NAME_ID="5000" REFERENCE_ID="[null]" ROOTNODE_ID="5000"/>
-  <TAXONNODE ID="5000" CREATED="2019-11-26 13:23:34.0" UUID="d7ecc004-5291-4b9d-9573-f5537576f39c" UPDATED="2019-11-26 13:23:34.184" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="[null]" REFERENCEFORPARENTCHILDRELATION_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
-  <TAXONNODE ID="5001" CREATED="2019-11-26 13:23:34.0" UUID="f4d29e9f-6484-4184-af2e-9704e96a17e3" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="1" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5000" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
-  <TAXONNODE ID="5002" CREATED="2019-11-26 13:23:34.0" UUID="de98cbfe-f4c9-4e15-8b31-88a8bf128e5a" UPDATED="2019-11-26 13:23:34.184" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#" COUNTCHILDREN="3" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5001" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
-  <TAXONNODE ID="5003" CREATED="2019-11-26 13:23:34.0" UUID="c6b28358-ecc6-4ca7-8384-57c5a5c7d8eb" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#5003#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>
-  <TAXONNODE ID="5004" CREATED="2019-11-26 13:23:34.0" UUID="13988b44-e363-44e5-9495-479eb4415245" SORTINDEX="1" TREEINDEX="#t5000#5000#5001#5002#5004#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
-  <TAXONNODE ID="5005" CREATED="2019-11-26 13:23:34.0" UUID="d7ef7e1d-04b4-4169-bded-cce72984a824" SORTINDEX="2" TREEINDEX="#t5000#5000#5001#5002#5005#" COUNTCHILDREN="0" MICROREFERENCEFORPARENTCHILDRELATION="[null]" CLASSIFICATION_ID="5000" PARENT_ID="5002" REFERENCEFORPARENTCHILDRELATION_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5004"/>
+  <TAXONNODE ID="5000" CREATED="2019-11-26 13:23:34.0" UUID="d7ecc004-5291-4b9d-9573-f5537576f39c" UPDATED="2019-11-26 13:23:34.184" SORTINDEX="-1" TREEINDEX="#t5000#5000#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="[null]" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="[null]"/>
+  <TAXONNODE ID="5001" CREATED="2019-11-26 13:23:34.0" UUID="f4d29e9f-6484-4184-af2e-9704e96a17e3" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#" COUNTCHILDREN="1" CLASSIFICATION_ID="5000" PARENT_ID="5000" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5000"/>
+  <TAXONNODE ID="5002" CREATED="2019-11-26 13:23:34.0" UUID="de98cbfe-f4c9-4e15-8b31-88a8bf128e5a" UPDATED="2019-11-26 13:23:34.184" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#" COUNTCHILDREN="3" CLASSIFICATION_ID="5000" PARENT_ID="5001" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5001"/>
+  <TAXONNODE ID="5003" CREATED="2019-11-26 13:23:34.0" UUID="c6b28358-ecc6-4ca7-8384-57c5a5c7d8eb" SORTINDEX="0" TREEINDEX="#t5000#5000#5001#5002#5003#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5002" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5002"/>
+  <TAXONNODE ID="5004" CREATED="2019-11-26 13:23:34.0" UUID="13988b44-e363-44e5-9495-479eb4415245" SORTINDEX="1" TREEINDEX="#t5000#5000#5001#5002#5004#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5002" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5003"/>
+  <TAXONNODE ID="5005" CREATED="2019-11-26 13:23:34.0" UUID="d7ef7e1d-04b4-4169-bded-cce72984a824" SORTINDEX="2" TREEINDEX="#t5000#5000#5001#5002#5005#" COUNTCHILDREN="0" CLASSIFICATION_ID="5000" PARENT_ID="5002" SYNONYMTOBEUSED_ID="[null]" TAXON_ID="5004"/>
   <HOMOTYPICALGROUP ID="5000" CREATED="2019-11-26 13:23:34.0" UUID="5f09a51c-222b-45ba-b47f-d9f83c1163d3"/>
   <HOMOTYPICALGROUP ID="5001" CREATED="2019-11-26 13:23:34.0" UUID="395c8892-bfb5-4502-8862-3ba3b5650f10"/>
   <HOMOTYPICALGROUP ID="5002" CREATED="2019-11-26 13:23:34.0" UUID="af6e9cd6-26a7-431e-a06f-f0d9ae5c039b"/>

diff --git a/cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql b/cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql
index 7f50881abbf749f1650f71d48bb41dbbedb252a6..5654c89c6593938ccfe7425053c17db02390f666 100644 (file)
--- a/cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql
+++ b/cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql
@@ -5787,14 +5787,12 @@ CREATE SEQUENCE PUBLIC.SYSTEM_SEQUENCE_10A55F0A_EE57_42DB_8046_6240A60AD0EC STAR
         CREATED timestamp,
         UUID varchar(36),
         UPDATED timestamp,
-        CITATIONMICROREFERENCE varchar(255),
         NOTDESIGNATED boolean not null,
         CONSERVEDTYPE boolean,
         REJECTEDTYPE boolean,
         ISVERBATIM boolean,
         CREATEDBY_ID integer,
         UPDATEDBY_ID integer,
-        CITATION_ID integer,
         SOURCE_ID integer,
         TYPESTATUS_ID integer,
         TYPENAME_ID integer,
@@ -5824,11 +5822,9 @@ CREATE SEQUENCE PUBLIC.SYSTEM_SEQUENCE_10A55F0A_EE57_42DB_8046_6240A60AD0EC STAR
         CREATED timestamp,
         UUID varchar(36),
         UPDATED timestamp,
-        CITATIONMICROREFERENCE varchar(255),
         NOTDESIGNATED boolean,
         CREATEDBY_ID integer,
         UPDATEDBY_ID integer,
-        CITATION_ID integer,
         SOURCE_ID integer,
         TYPESTATUS_ID integer,
         ISVERBATIM boolean,
@@ -11474,11 +11470,6 @@ create index PUBLIC.termNodeTreeIndex on PUBLIC.TERMRELATION (TREEINDEX);
         foreign key (PARENT_ID) 
         references PUBLIC.TAXONNODE;
 
-    alter table PUBLIC.TAXONNODE 
-        add constraint FK1guh0aaewj0yf51vbdfvd21r3 
-        foreign key (REFERENCEFORPARENTCHILDRELATION_ID) 
-        references PUBLIC.REFERENCE;
-
     alter table PUBLIC.TAXONNODE 
         add constraint FKlavpp8ifuvhyl94hhy8l2n2cj 
         foreign key (SYNONYMTOBEUSED_ID) 
@@ -11899,11 +11890,6 @@ create index PUBLIC.termNodeTreeIndex on PUBLIC.TERMRELATION (TREEINDEX);
         foreign key (UPDATEDBY_ID) 
         references PUBLIC.USERACCOUNT;
 
-    alter table PUBLIC.TYPEDESIGNATIONBASE 
-        add constraint FK5cyjrla19d3shyk955shg27gm 
-        foreign key (CITATION_ID) 
-        references PUBLIC.REFERENCE;
-
     alter table PUBLIC.TYPEDESIGNATIONBASE 
         add constraint FKi3ordjfuma9u820pch23lcvu7 
         foreign key (SOURCE_ID) 

diff --git a/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd b/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd
index 2bb9352e92608228dbf90d869d6de4d344c8c6ed..d89e45f2b17a5968a90be5765fc69a1649a56645 100644 (file)
--- a/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd
+++ b/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd
@@ -3575,13 +3575,12 @@
     SORTINDEX CDATA #IMPLIED
     TREEINDEX CDATA #IMPLIED
     COUNTCHILDREN CDATA #IMPLIED
-    MICROREFERENCEFORPARENTCHILDRELATION CDATA #IMPLIED
     STATUS CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CLASSIFICATION_ID CDATA #IMPLIED
     PARENT_ID CDATA #IMPLIED
-    REFERENCEFORPARENTCHILDRELATION_ID CDATA #IMPLIED
+    SOURCE_ID CDATA #IMPLIED
     SYNONYMTOBEUSED_ID CDATA #IMPLIED
     TAXON_ID CDATA #IMPLIED
 >
@@ -3595,13 +3594,12 @@
     SORTINDEX CDATA #IMPLIED
     TREEINDEX CDATA #IMPLIED
     COUNTCHILDREN CDATA #IMPLIED
-    MICROREFERENCEFORPARENTCHILDRELATION CDATA #IMPLIED
     STATUS CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CLASSIFICATION_ID CDATA #IMPLIED
     PARENT_ID CDATA #IMPLIED
-    REFERENCEFORPARENTCHILDRELATION_ID CDATA #IMPLIED
+    SOURCE_ID CDATA #IMPLIED
     SYNONYMTOBEUSED_ID CDATA #IMPLIED
     TAXON_ID CDATA #IMPLIED
     REVTYPE CDATA #IMPLIED
@@ -3815,7 +3813,6 @@
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
-    CITATIONMICROREFERENCE CDATA #IMPLIED
     ORIGINALNAMESTRING CDATA #IMPLIED
     NOTDESIGNATED CDATA #IMPLIED
     CONSERVEDTYPE CDATA #IMPLIED
@@ -3824,7 +3821,7 @@
     ISVERBATIM CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
-    CITATION_ID CDATA #IMPLIED
+    SOURCE_ID CDATA #IMPLIED
     TYPENAME_ID CDATA #IMPLIED
     TYPESPECIMEN_ID CDATA #IMPLIED
     TYPESTATUS_ID CDATA #IMPLIED
@@ -3853,12 +3850,11 @@
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
-    CITATIONMICROREFERENCE CDATA #IMPLIED
     ORIGINALNAMESTRING CDATA #IMPLIED
     NOTDESIGNATED CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
-    CITATION_ID CDATA #IMPLIED
+    SOURCE_ID CDATA #IMPLIED
     CONSERVEDTYPE CDATA #IMPLIED
     LECTOTYPE CDATA #IMPLIED
     REJECTEDTYPE CDATA #IMPLIED