From: Andreas Müller <a.mueller@bgbm.org>
Date: Fri, 11 Nov 2016 13:07:32 +0000 (+0100)
Subject: ref #5974 Some synonymRelationship updates
X-Git-Tag: 4.4.0^2~49
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/1b945f03e2698f99466c43648587826f0d6cfa37?hp=aa01111ebda16b0ab5f4a1153dc86e98ed36f855;ds=sidebyside

ref #5974 Some synonymRelationship updates
---

diff --git a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
index a584bfedd..979bc21d1 100644
--- a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
+++ b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
@@ -845,9 +845,9 @@
   <DEFINEDTERMBASE DTYPE="NomenclaturalStatusType" ID="843" CREATED="2009-01-28 17:07:04.0" UUID="24955174-aa5c-4e71-a2fd-3efc79e885db" URI="" ORDERINDEX="3" VOCABULARY_ID="6"/>
   <DEFINEDTERMBASE DTYPE="NomenclaturalStatusType" ID="844" CREATED="2009-01-28 17:07:04.0" UUID="0ffeb39e-872e-4c0f-85ba-a4150d9f9e7d" URI="" ORDERINDEX="2" VOCABULARY_ID="6"/>
   <DEFINEDTERMBASE DTYPE="NomenclaturalStatusType" ID="845" CREATED="2009-01-28 17:07:04.0" UUID="90f5012b-705b-4488-b4c6-002d2bc5198e" URI="" ORDERINDEX="1" VOCABULARY_ID="6"/>
-  <DEFINEDTERMBASE DTYPE="SynonymRelationshipType" ID="846" CREATED="2009-01-28 17:07:04.0" UUID="4c1e2c59-ca55-41ac-9a82-676894976084" URI="" ORDERINDEX="3" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="7"/>
-  <DEFINEDTERMBASE DTYPE="SynonymRelationshipType" ID="847" CREATED="2009-01-28 17:07:04.0" UUID="294313a9-5617-4ed5-ae2d-c57599907cb2" URI="" ORDERINDEX="2" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="7"/>
-  <DEFINEDTERMBASE DTYPE="SynonymRelationshipType" ID="848" CREATED="2009-01-28 17:07:04.0" UUID="1afa5429-095a-48da-8877-836fa4fe709e" URI="" ORDERINDEX="1" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="7"/>
+  <DEFINEDTERMBASE DTYPE="SynonymType" ID="846" CREATED="2009-01-28 17:07:04.0" UUID="4c1e2c59-ca55-41ac-9a82-676894976084" URI="" ORDERINDEX="3" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="7"/>
+  <DEFINEDTERMBASE DTYPE="SynonymType" ID="847" CREATED="2009-01-28 17:07:04.0" UUID="294313a9-5617-4ed5-ae2d-c57599907cb2" URI="" ORDERINDEX="2" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="7"/>
+  <DEFINEDTERMBASE DTYPE="SynonymType" ID="848" CREATED="2009-01-28 17:07:04.0" UUID="1afa5429-095a-48da-8877-836fa4fe709e" URI="" ORDERINDEX="1" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="7"/>
   <DEFINEDTERMBASE DTYPE="HybridRelationshipType" ID="849" CREATED="2009-01-28 17:07:04.0" UUID="8b7324c5-cc6c-4109-b708-d49b187815c4" URI="" ORDERINDEX="4" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="8"/>
   <DEFINEDTERMBASE DTYPE="HybridRelationshipType" ID="850" CREATED="2009-01-28 17:07:04.0" UUID="189a3ed9-6860-4943-8be8-a1f60133be2a" URI="" ORDERINDEX="3" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="8"/>
   <DEFINEDTERMBASE DTYPE="HybridRelationshipType" ID="851" CREATED="2009-01-28 17:07:04.0" UUID="0485fc3d-4755-4f53-8832-b82774484c43" URI="" ORDERINDEX="2" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="8"/>
@@ -5159,7 +5159,7 @@
   <REPRESENTATION ID="849" CREATED="2009-01-28 17:07:04.0" UUID="28120238-a734-40c7-95d3-d88dde96da85" TEXT="Confusum" ABBREVIATEDLABEL="nom. confus." LABEL="Confusum" LANGUAGE_ID="352"/>
   <REPRESENTATION ID="850" CREATED="2009-01-28 17:07:04.0" UUID="77935ab4-034d-4b8b-955c-d82d144ba68e" TEXT="Doubtful" ABBREVIATEDLABEL="nom. dub." LABEL="Doubtful" LANGUAGE_ID="352"/>
   <REPRESENTATION ID="851" CREATED="2009-01-28 17:07:04.0" UUID="b26d9137-e9f3-4744-b756-d13db5792fc6" TEXT="Ambiguous" ABBREVIATEDLABEL="nom. ambig." LABEL="Ambiguous" LANGUAGE_ID="352"/>
-  <REPRESENTATION ID="852" CREATED="2009-01-28 17:07:04.0" UUID="6327d819-8ca7-49d0-98cf-a4844ad3f13f" TEXT="eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType" LABEL="SynonymRelationshipType" LANGUAGE_ID="406"/>
+  <REPRESENTATION ID="852" CREATED="2009-01-28 17:07:04.0" UUID="6327d819-8ca7-49d0-98cf-a4844ad3f13f" TEXT="eu.etaxonomy.cdm.model.taxon.SynonymType" LABEL="SynonymType" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="853" CREATED="2009-01-28 17:07:04.0" UUID="b29a14fd-2b0b-412a-a1a8-aad99a801ade" TEXT="" ABBREVIATEDLABEL="has heterotypic synonym" LABEL="heterotypic synonym of" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="854" CREATED="2009-01-28 17:07:04.0" UUID="81767ba2-2a26-44b6-8093-81ae1add0ea9" TEXT="" LABEL="has heterotypic synonym" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="855" CREATED="2009-01-28 17:07:04.0" UUID="7fcfa524-bd36-4040-858b-1ae25beda078" TEXT="" ABBREVIATEDLABEL="has homotypic synonym" LABEL="homotypic synonym of" LANGUAGE_ID="406"/>
@@ -6400,7 +6400,7 @@
   <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"/>
   <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"/>
   <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"/>
-  <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"/>
+  <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.SynonymType"/>
   <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"/>
   <TERMVOCABULARY DTYPE="OrderedTermVocabulary" ID="9" CREATED="2009-01-28 17:07:04.0" UUID="6878cb82-c1a4-4613-b012-7e73b413c8cd" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.name.NameRelationshipType"/>
   <TERMVOCABULARY DTYPE="OrderedTermVocabulary" ID="10" CREATED="2009-01-28 17:07:04.0" UUID="15db0cf7-7afc-4a86-a7d4-221c73b0c9ac" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType"/>
diff --git a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml
index 34690bec9..282b26401 100644
--- a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml
+++ b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml
@@ -845,9 +845,9 @@
   <DEFINEDTERMBASE DTYPE="NomenclaturalStatusType" ID="843" CREATED="2009-01-28 17:07:04.0" UUID="24955174-aa5c-4e71-a2fd-3efc79e885db" URI="" ORDERINDEX="3" VOCABULARY_ID="6"/>
   <DEFINEDTERMBASE DTYPE="NomenclaturalStatusType" ID="844" CREATED="2009-01-28 17:07:04.0" UUID="0ffeb39e-872e-4c0f-85ba-a4150d9f9e7d" URI="" ORDERINDEX="2" VOCABULARY_ID="6"/>
   <DEFINEDTERMBASE DTYPE="NomenclaturalStatusType" ID="845" CREATED="2009-01-28 17:07:04.0" UUID="90f5012b-705b-4488-b4c6-002d2bc5198e" URI="" ORDERINDEX="1" VOCABULARY_ID="6"/>
-  <DEFINEDTERMBASE DTYPE="SynonymRelationshipType" ID="846" CREATED="2009-01-28 17:07:04.0" UUID="4c1e2c59-ca55-41ac-9a82-676894976084" URI="" ORDERINDEX="3" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="7"/>
-  <DEFINEDTERMBASE DTYPE="SynonymRelationshipType" ID="847" CREATED="2009-01-28 17:07:04.0" UUID="294313a9-5617-4ed5-ae2d-c57599907cb2" URI="" ORDERINDEX="2" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="7"/>
-  <DEFINEDTERMBASE DTYPE="SynonymRelationshipType" ID="848" CREATED="2009-01-28 17:07:04.0" UUID="1afa5429-095a-48da-8877-836fa4fe709e" URI="" ORDERINDEX="1" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="7"/>
+  <DEFINEDTERMBASE DTYPE="SynonymType" ID="846" CREATED="2009-01-28 17:07:04.0" UUID="4c1e2c59-ca55-41ac-9a82-676894976084" URI="" ORDERINDEX="3" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="7"/>
+  <DEFINEDTERMBASE DTYPE="SynonymType" ID="847" CREATED="2009-01-28 17:07:04.0" UUID="294313a9-5617-4ed5-ae2d-c57599907cb2" URI="" ORDERINDEX="2" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="7"/>
+  <DEFINEDTERMBASE DTYPE="SynonymType" ID="848" CREATED="2009-01-28 17:07:04.0" UUID="1afa5429-095a-48da-8877-836fa4fe709e" URI="" ORDERINDEX="1" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="7"/>
   <DEFINEDTERMBASE DTYPE="HybridRelationshipType" ID="849" CREATED="2009-01-28 17:07:04.0" UUID="8b7324c5-cc6c-4109-b708-d49b187815c4" URI="" ORDERINDEX="4" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="8"/>
   <DEFINEDTERMBASE DTYPE="HybridRelationshipType" ID="850" CREATED="2009-01-28 17:07:04.0" UUID="189a3ed9-6860-4943-8be8-a1f60133be2a" URI="" ORDERINDEX="3" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="8"/>
   <DEFINEDTERMBASE DTYPE="HybridRelationshipType" ID="851" CREATED="2009-01-28 17:07:04.0" UUID="0485fc3d-4755-4f53-8832-b82774484c43" URI="" ORDERINDEX="2" SYMMETRIC="false" TRANSITIVE="false" VOCABULARY_ID="8"/>
@@ -5159,7 +5159,7 @@
   <REPRESENTATION ID="849" CREATED="2009-01-28 17:07:04.0" UUID="28120238-a734-40c7-95d3-d88dde96da85" TEXT="Confusum" ABBREVIATEDLABEL="nom. confus." LABEL="Confusum" LANGUAGE_ID="352"/>
   <REPRESENTATION ID="850" CREATED="2009-01-28 17:07:04.0" UUID="77935ab4-034d-4b8b-955c-d82d144ba68e" TEXT="Doubtful" ABBREVIATEDLABEL="nom. dub." LABEL="Doubtful" LANGUAGE_ID="352"/>
   <REPRESENTATION ID="851" CREATED="2009-01-28 17:07:04.0" UUID="b26d9137-e9f3-4744-b756-d13db5792fc6" TEXT="Ambiguous" ABBREVIATEDLABEL="nom. ambig." LABEL="Ambiguous" LANGUAGE_ID="352"/>
-  <REPRESENTATION ID="852" CREATED="2009-01-28 17:07:04.0" UUID="6327d819-8ca7-49d0-98cf-a4844ad3f13f" TEXT="eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType" LABEL="SynonymRelationshipType" LANGUAGE_ID="406"/>
+  <REPRESENTATION ID="852" CREATED="2009-01-28 17:07:04.0" UUID="6327d819-8ca7-49d0-98cf-a4844ad3f13f" TEXT="eu.etaxonomy.cdm.model.taxon.SynonymType" LABEL="SynonymType" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="853" CREATED="2009-01-28 17:07:04.0" UUID="b29a14fd-2b0b-412a-a1a8-aad99a801ade" TEXT="" ABBREVIATEDLABEL="has heterotypic synonym" LABEL="heterotypic synonym of" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="854" CREATED="2009-01-28 17:07:04.0" UUID="81767ba2-2a26-44b6-8093-81ae1add0ea9" TEXT="" LABEL="has heterotypic synonym" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="855" CREATED="2009-01-28 17:07:04.0" UUID="7fcfa524-bd36-4040-858b-1ae25beda078" TEXT="" ABBREVIATEDLABEL="has homotypic synonym" LABEL="homotypic synonym of" LANGUAGE_ID="406"/>
@@ -6400,7 +6400,7 @@
   <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"/>
   <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"/>
   <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"/>
-  <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"/>
+  <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.SynonymType"/>
   <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"/>
   <TERMVOCABULARY DTYPE="OrderedTermVocabulary" ID="9" CREATED="2009-01-28 17:07:04.0" UUID="6878cb82-c1a4-4613-b012-7e73b413c8cd" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.name.NameRelationshipType"/>
   <TERMVOCABULARY DTYPE="OrderedTermVocabulary" ID="10" CREATED="2009-01-28 17:07:04.0" UUID="15db0cf7-7afc-4a86-a7d4-221c73b0c9ac" URI="" TERMSOURCEURI="eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType"/>