From 3c06156cafb54aaf10947a269f1c2acc6e2fc096 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Thu, 7 Mar 2019 00:36:53 +0100 Subject: [PATCH] ref #6794 rename TermVocabulary table to TermCollection and remaining rename FeatureNode -> TermTreeNode --- .../main/resources/schema/cdm/description.xsd | 4 +- .../etaxonomy/cdm/database/ClearDBDataSet.xml | 24 +-- .../database/ClearDB_with_Terms_DataSet.xml | 32 ++-- .../TermsDataSet-with_auditing_info.xml | Bin 2631692 -> 2631670 bytes .../eu/etaxonomy/cdm/io/jaxb/FeatureTest.xml | 22 +-- .../cdm/model/term/TermRelationBase.java | 3 + .../cdm/model/term/TermVocabulary.java | 2 + .../etaxonomy/cdm/database/ClearDBDataSet.xml | 24 +-- .../database/ClearDB_with_Terms_DataSet.xml | 32 ++-- .../TermsDataSet-with_auditing_info.xml | Bin 2645044 -> 2645022 bytes ...aryDaoImplTest.testListVocabularyEmpty.xml | 4 +- .../database/ClearDB_with_Terms_DataSet.xml | 32 ++-- .../TermsDataSet-with_auditing_info.xml | Bin 2631692 -> 2631670 bytes .../main/resources/dbscripts/001-cdm.h2.sql | 174 +++++++++--------- .../etaxonomy/cdm/database/ClearDBDataSet.xml | 24 +-- .../database/ClearDB_with_Terms_DataSet.xml | 34 ++-- .../TermsDataSet-with_auditing_info.xml | Bin 2631692 -> 2631670 bytes .../etaxonomy/cdm/database/schema/dataset.dtd | 24 +-- 18 files changed, 220 insertions(+), 215 deletions(-) diff --git a/cdmlib-io/src/main/resources/schema/cdm/description.xsd b/cdmlib-io/src/main/resources/schema/cdm/description.xsd index 5f5374231e..44a4e90973 100644 --- a/cdmlib-io/src/main/resources/schema/cdm/description.xsd +++ b/cdmlib-io/src/main/resources/schema/cdm/description.xsd @@ -35,7 +35,7 @@ xmlns:name="http://etaxonomy.eu/cdm/model/name/1.0"> - + @@ -109,7 +109,7 @@ xmlns:name="http://etaxonomy.eu/cdm/model/name/1.0"> - + diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml index 18d947e174..6341826dca 100644 --- a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml +++ b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml @@ -432,18 +432,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml index a5f3367178..76f7977b5a 100644 --- a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml +++ b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml @@ -439,22 +439,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml index ff5aac478968f5a4b349889404baa6830a0a3a73..cea5c5170a353685ba93f0e804f2e46153e3218b 100644 GIT binary patch delta 4074 zcmaKuYfzL`7{>=#!Ci!fU0|1GR~8q2PFewDIumLz5gK^G3-v*pnx>ertjTP&X-bEg zj$xxtPQyN$DR|6MQ1g<$X5K9{O}VIfLq$c@QPVUnFG+{fht7G=iyzrR=SG6!X`l=Yx2jvYwQsQx>EwgR)+fg(%CUtT$zS zHZUj+I|@ohj3_K9Eh-s>8B4&6UWBVMoVNu+NDe|G<}H9eSUw*XnB+{%S^x)3FochN z341gcSO{k|IJX&GIK3WX@s%x+X?Us`mTI2D!?xB$*-0Vj@M56}vfla7l(@?uYlmLk<4DAO4Wxj>`~4_W@{=pb>Ep;+3`J05HD+E=VpEkUuAh z_(r4p&Pyz~W0GI%jy7Viz!SPYoIlORdsm^q zSqd5r*C0=$$ln#0QGDH0(0P)K)i3qdDItJ+E&YWVZ&X9$Nz=%w>5*ziQ+ z@4BZS9;t$h_;F>Vxt9=DbqXC8!oVof$J}XaN1P4kM3G)*A%C;YhOHJtmW}i?n?JRY zzGfDD%WcDf$s`r;+w>+!PwG^=5pC-dQb?fdC7JO^_4EC98_u$Ol5toxi8nX&r`?l^ z3oV33%6n<_kkqcn9poiGPj+^%F3->O7y{-2Q&UL*ugB<JeX&|nxNoElKbh%E!OB<)WL~Br-yS{$x@lK|a5<@Km1- z=O&Y(CXRQLmDElzmZ#|Ks0GXZn1>d7^w13+Js{Jovo9=IWUB6)Y{6PBScy-s-KMk1 z{!if;A4$P!cK%E+YxcS@A)eUGOY>Elp2nF6`K9Hz-cM32Dm*Bz?+QOjvr;z(NRQZm E0c!VHFaQ7m delta 4086 zcmaKud2G~06vwl;-L^~5?Xm41wzW&&q(Y0*s0BoB0U?!&Bt#5BY0}n+76`#B5#!*I z@djT}kt!f(u_Ex3AcV?&w;Wck(iTuauoeiS9QEz+&&p&g@cPOT-?KjlZz-W zTwFwR5yM3+7j7=PauLTxJQoREByy3&MKTv2E>gHiF^?kn!0dZwjU%9MJ;H zAcTQx*ssE>p9tQ+ACj-10Ft19!2e4@^IXIsEG)N5Nh3x^EY`zX2h zUI3fb2=z{%W1)?4_eF46RZ8RcPSBSr{th;&5$OSojZ=0SqLvnFq5o3Yu11oV!6ohY z3OZK)ayStI|J8nnXZuJkoK#`XO3+1Nr#XL6%k)wG_~h2uIDF-M&~H!J=+Qc(S`c@i zqh?2}qD$gC4|CNz_2;1=9ND5mx`sg0Nr54dr6`+)LtkY%Kcm=Yp;p>5!+W9|66bhHes~ezE>B%CPpyjq+ zBb93tv?wYhn2kyGa4G@@(f12nFkp|(`lO}j&@FJzP>$WIKV_*LyA8A}CE@Ga;ii#Z zvqNu5zR;H^En=ja0f=&z>BmAemqRpnKG0}HR1 z(<+p5S}fXQm5_GIHAQI=%+x-;RM8gkVC_NuP09$Z5)W=Yq(222p?%V>IHQDlHIRZa zO`6=I6UJyY<&kNPc<`Yk`Y2?Cc8NA#>72iioGXv%N0f5fC5iafaX7AaBO|m>w4vN? zaWU0h-K>9A8Cic4E~_3Ao@~*_C1KGrY9_S}4k~i1qYcvZW46&`3sz9ML8qZrk>37R z57&}O`5AqZWRipZR?^_#{TN>bh`p%8WA%=@>y9o|W+jt9xs&nXYu@LTy zXFi;;d7l3Qgg^XcTR8C&0xZYHJc23 zI&9#MB<9C?4yLvDgM$r^C=)`~#Yhj~Yj*HW5A)j}jLs0kzbK4-@6k)j$oLeBd}J5d zMUlH$`kXA^Xn1)l3*d)N7OzI+OoC}FVDEN29L4gCoa>Z>A4KV0OL=AbUEMNWHf}H4 zLCZ@ePPmK`BaCJ$qIFMspElURshQ;2BS!a>^0F8kk9Br%lkZLkltzVqD)C0FQ9^55 zUg`M2os4AoS-0Mignv>F?se<#G7{C*Mn29C*4jZwoRMyJyfi`-euQ`8q0T^Z{>^asgGuI+xpt#mTHdEm@V!CaJ$Cewq=$>&a}G0V_N< zu*rnfR|*@VrdQ3Q7S=|<(N(@I45cz{II{ZeR5nsgm(Z1_?=Jc(er%ZTbK;CNrmbfg zIhCdxOIVt21MBTzPp^$~z8y@+FqMu6F(;L!V|g?S;*dQV9!&Bvr+OsW&IOxPd?wTM y!(Dc;*k_|$Vh6o`8|AD!KrhAxSTCbll6!Hyn+{YRFfOehWw?&QR&Feature Tree true - urn-uuid-e40912a5-3e36-4d1e-aee9-dc57a83fa81c + urn-uuid-e40912a5-3e36-4d1e-aee9-dc57a83fa81c - urn-uuid-98cd50c9-3938-471b-b4d7-fe61b2f19efd + urn-uuid-98cd50c9-3938-471b-b4d7-fe61b2f19efd urn-uuid-a137ed36-383f-49a9-8d84-976361188bcc - urn-uuid-0a9af077-0927-4655-9892-3a4bb3233513 + urn-uuid-0a9af077-0927-4655-9892-3a4bb3233513 urn-uuid-a137ed36-383f-49a9-8d84-976361188bcc - urn-uuid-c015b086-f5a9-4132-afa8-e6de6ec8406d + urn-uuid-c015b086-f5a9-4132-afa8-e6de6ec8406d urn-uuid-a5700c2f-8630-46e7-a900-59c9a612fbaf - urn-uuid-92534c0b-bb6c-415d-9ebf-96402ea2413a + urn-uuid-92534c0b-bb6c-415d-9ebf-96402ea2413a urn-uuid-a5700c2f-8630-46e7-a900-59c9a612fbaf - urn-uuid-c64b38a9-e8a9-4e32-8aba-69f2c83496c7 + urn-uuid-c64b38a9-e8a9-4e32-8aba-69f2c83496c7 urn-uuid-a137ed36-383f-49a9-8d84-976361188bcc - urn-uuid-3baf0225-619d-48d8-9017-bd673ca23dd3 + urn-uuid-3baf0225-619d-48d8-9017-bd673ca23dd3 urn-uuid-20070dea-4455-444e-b7be-fd771370b85a - urn-uuid-4d2c9e16-20b7-4a87-958f-57c9ffaa6c0a + urn-uuid-4d2c9e16-20b7-4a87-958f-57c9ffaa6c0a urn-uuid-20070dea-4455-444e-b7be-fd771370b85a - urn-uuid-2d69a75b-7557-4c8d-b212-0bd8e59a2775 + urn-uuid-2d69a75b-7557-4c8d-b212-0bd8e59a2775 urn-uuid-a137ed36-383f-49a9-8d84-976361188bcc - urn-uuid-4dab37e3-80a2-4c86-9b60-eba4d4578967 + urn-uuid-4dab37e3-80a2-4c86-9b60-eba4d4578967 urn-uuid-0ae5afe1-a0c4-4585-be09-d0cf295b671c - urn-uuid-1aeb4db9-0496-4632-9d6c-471f65d717e6 + urn-uuid-1aeb4db9-0496-4632-9d6c-471f65d717e6 urn-uuid-0ae5afe1-a0c4-4585-be09-d0cf295b671c diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermRelationBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermRelationBase.java index d30e2d4a36..cd3e8147cb 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermRelationBase.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermRelationBase.java @@ -12,6 +12,8 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.validation.constraints.NotNull; @@ -46,6 +48,7 @@ import eu.etaxonomy.cdm.model.common.VersionableEntity; @Entity @Audited @Table(name="TermRelation", indexes = { @Index(name = "termTreeNodeTreeIndex", columnList = "treeIndex") }) //was feature NodeTreeIndex before +@Inheritance(strategy=InheritanceType.SINGLE_TABLE) public abstract class TermRelationBase extends VersionableEntity implements IHasTermType { diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermVocabulary.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermVocabulary.java index f0c5014b02..4215ed2290 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermVocabulary.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermVocabulary.java @@ -24,6 +24,7 @@ import javax.persistence.FetchType; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.OneToMany; +import javax.persistence.Table; import javax.persistence.Transient; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -63,6 +64,7 @@ import eu.etaxonomy.cdm.model.common.Language; //@Indexed disabled to reduce clutter in indexes, since this type is not used by any search //@Indexed(index = "eu.etaxonomy.cdm.model.term.TermVocabulary") @Audited +@Table(name="TermCollection") @Inheritance(strategy=InheritanceType.SINGLE_TABLE) public class TermVocabulary extends TermBase implements Iterable { private static final long serialVersionUID = 1925052321596648672L; diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml index 5debe0e5e7..d4835c3104 100644 --- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml +++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml @@ -432,18 +432,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml index a5bb53d1de..2c192cce34 100644 --- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml +++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml @@ -439,22 +439,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml index bb32ef2d4a5334ef13945e2ee02c3008b2fa8f3d..2f95bdf49f9b9fdb9ec0a91fc9e1469f2d595fe0 100644 GIT binary patch delta 4161 zcmaKuTTqo%6vqb;5stvQaXB|Uz`?yr@Je1OK{x^ef@x1Rnv9Ewmt0c+uQTN!}t5I_1|ml%i?U` zu`y~r|68@vweYpsGv`eoG-LXr=?iBr8n}4jjI7#Y(V=CGvM9=;DT|@37iF=O^`Q?3ER<}aA^hv@cZ-RyaLWi;>pk9sVObF#hcBD^ z%^-_#v3=tP!kpPyc`0T(b`S| zs??OjrICN?q%h%9-A#+sQ-N{%FOsKv9oLZ%Xa|3 zzC*4laNAvSQ-QzTQ|toR)uDd4pjxS&8jY@8S$ z3#R=O;e6saaaeC?Q*y#_a9x3X_S{w=A3IL0jR(^+kVz}#q$Vtk$fVPz#FF$l#nY23?#d|APs`(*F|Q=(EnTQro96%!Q;ZUZP%4fsGAFH;d(Hvr$%7$Pfwe=Rmke>^P$-p74u_0_5FRc9FAg3CHd*13**Iz(_)-SF zkeCn*7EB4hSS9_~5c=+6&|gVP%GbbsQ{8E}I3JRg@a?+rX(f>tJ`zz6VL=#tc%xYAb$@AD+|jL_JrThrI_3UYO$i-csUDnF zsClHZ^SIHjLd_Cgg^(++`{RyuAC?uF$Bcm6i=bSI%o?YGt8}ni2j>=R(pz+}tV9#} zlMaT$Fu_u%A3q5z>3)nEuYqsrV4Duslq%`{aB?ZQvAGn6$|X2fd;eGXnDFDKm(pC$ z%)Gpyo7 zLxms6vqeIK%Tqo0=v2k?z#*2l**#`KtNbj5Pav9PBWTAxs^GRsZD=W8h_mU zBd;*dILBAGE8QA@Rq~Og^KR34gM%F8uH;<5C6!=OTxuC$51hC`H9_}{(UaALM zkCM+6O)!ybnvRhll*qg7 z!aQW>;s0jcXon4ors)hhtH70+{1DqaG`Fz%EIDSD^L}&iqfXKp10R|{i)MOU+;h)) z(q@i`^qpOD3j&t9`8zpqf$THOh0)H7BAJ0d=oxkUjtK_btIXW0JjPNz$mC{8|RRM4q2d z0KCS*8{}yyhpAmu=#KK%Pf>% z-IpgK;NgGBbtS#y0XZEDx1Q}Gu`PKqv6u9km370xi$fpDeTw;(JSNx7N`B`atbIcI z6jALK2wzbVMcy6{(yJ3nzLV^D*8=hkqwah$ zNe@WK`6jw*GB!9IAWtQlx+n>5nN%oJ`4*D=qQ{CZAP4SE0qK#82;V}|J{FKKAO}X$ zK-zi2{Z2aEF_#o_zJ*i|zH#Imk9N%WjC4D~lP?wrE_Q(Y=%RAIU8HJ4zBx;tqG(}# zC-*p*4HuQ>n$Jbg;sog@K^XBp^FWdB=;9YOY@o)d#4Xnq9(=_(FznIDcU|HUnj^m& z(QE5vVmH?3!bs^xMQB@u*f7@y2}Y_H3Y569zy~3fwhe}AiAGy9_@z;KtNZkfM|`qLKN!2#x}x$ZuUpv*689;8!9Qqc!qKuG59v zMuSz6U(v~DhAbAW7^88wb@0fSUS}q59iwr3|5b+t2l{xpcMN1I#mb6dhyw5XoC9!s zvBqu5d)%$NSaZSUV*wPSYCkt>8LKh6s*{f^(RlpWm1MyU0cRF&E72HT(dCqtYK&&* z^ND{^3O1$9h)!NwrtxUf!EE5hkIOX1pYGt}D(4ScDcLwqai0<+3SddO@^Av!sDqOh zWje99TxlVIV=FWsbA~ycxTQiP|2Z0YsEZVbG)7E?e#{Q?dGv(j*LJ%SJXll-)#g(Q z_(>(y#J~kHpFQ}_ctzyFYdSb*f<}2j2a6_Zl$&(WS_QS{mKwfud2mGxY_Ec_BAQ#R z$vmusC6g58AZ(c=4@?wx)xdP6(CQkProg@$m>dJ$SYHd$Q{$d)?9{>OlQqhHI#@78 xqui*2=~Fez6*_oB2Vb0~NpI7^^6467s}APQ&?wjF;1eCJpQ)xBoiibn@-MW$Ry6 - - + + \ No newline at end of file diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml index a5f3367178..76f7977b5a 100644 --- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml +++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml @@ -439,22 +439,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml index ff5aac478968f5a4b349889404baa6830a0a3a73..cea5c5170a353685ba93f0e804f2e46153e3218b 100644 GIT binary patch delta 4074 zcmaKuYfzL`7{>=#!Ci!fU0|1GR~8q2PFewDIumLz5gK^G3-v*pnx>ertjTP&X-bEg zj$xxtPQyN$DR|6MQ1g<$X5K9{O}VIfLq$c@QPVUnFG+{fht7G=iyzrR=SG6!X`l=Yx2jvYwQsQx>EwgR)+fg(%CUtT$zS zHZUj+I|@ohj3_K9Eh-s>8B4&6UWBVMoVNu+NDe|G<}H9eSUw*XnB+{%S^x)3FochN z341gcSO{k|IJX&GIK3WX@s%x+X?Us`mTI2D!?xB$*-0Vj@M56}vfla7l(@?uYlmLk<4DAO4Wxj>`~4_W@{=pb>Ep;+3`J05HD+E=VpEkUuAh z_(r4p&Pyz~W0GI%jy7Viz!SPYoIlORdsm^q zSqd5r*C0=$$ln#0QGDH0(0P)K)i3qdDItJ+E&YWVZ&X9$Nz=%w>5*ziQ+ z@4BZS9;t$h_;F>Vxt9=DbqXC8!oVof$J}XaN1P4kM3G)*A%C;YhOHJtmW}i?n?JRY zzGfDD%WcDf$s`r;+w>+!PwG^=5pC-dQb?fdC7JO^_4EC98_u$Ol5toxi8nX&r`?l^ z3oV33%6n<_kkqcn9poiGPj+^%F3->O7y{-2Q&UL*ugB<JeX&|nxNoElKbh%E!OB<)WL~Br-yS{$x@lK|a5<@Km1- z=O&Y(CXRQLmDElzmZ#|Ks0GXZn1>d7^w13+Js{Jovo9=IWUB6)Y{6PBScy-s-KMk1 z{!if;A4$P!cK%E+YxcS@A)eUGOY>Elp2nF6`K9Hz-cM32Dm*Bz?+QOjvr;z(NRQZm E0c!VHFaQ7m delta 4086 zcmaKud2G~06vwl;-L^~5?Xm41wzW&&q(Y0*s0BoB0U?!&Bt#5BY0}n+76`#B5#!*I z@djT}kt!f(u_Ex3AcV?&w;Wck(iTuauoeiS9QEz+&&p&g@cPOT-?KjlZz-W zTwFwR5yM3+7j7=PauLTxJQoREByy3&MKTv2E>gHiF^?kn!0dZwjU%9MJ;H zAcTQx*ssE>p9tQ+ACj-10Ft19!2e4@^IXIsEG)N5Nh3x^EY`zX2h zUI3fb2=z{%W1)?4_eF46RZ8RcPSBSr{th;&5$OSojZ=0SqLvnFq5o3Yu11oV!6ohY z3OZK)ayStI|J8nnXZuJkoK#`XO3+1Nr#XL6%k)wG_~h2uIDF-M&~H!J=+Qc(S`c@i zqh?2}qD$gC4|CNz_2;1=9ND5mx`sg0Nr54dr6`+)LtkY%Kcm=Yp;p>5!+W9|66bhHes~ezE>B%CPpyjq+ zBb93tv?wYhn2kyGa4G@@(f12nFkp|(`lO}j&@FJzP>$WIKV_*LyA8A}CE@Ga;ii#Z zvqNu5zR;H^En=ja0f=&z>BmAemqRpnKG0}HR1 z(<+p5S}fXQm5_GIHAQI=%+x-;RM8gkVC_NuP09$Z5)W=Yq(222p?%V>IHQDlHIRZa zO`6=I6UJyY<&kNPc<`Yk`Y2?Cc8NA#>72iioGXv%N0f5fC5iafaX7AaBO|m>w4vN? zaWU0h-K>9A8Cic4E~_3Ao@~*_C1KGrY9_S}4k~i1qYcvZW46&`3sz9ML8qZrk>37R z57&}O`5AqZWRipZR?^_#{TN>bh`p%8WA%=@>y9o|W+jt9xs&nXYu@LTy zXFi;;d7l3Qgg^XcTR8C&0xZYHJc23 zI&9#MB<9C?4yLvDgM$r^C=)`~#Yhj~Yj*HW5A)j}jLs0kzbK4-@6k)j$oLeBd}J5d zMUlH$`kXA^Xn1)l3*d)N7OzI+OoC}FVDEN29L4gCoa>Z>A4KV0OL=AbUEMNWHf}H4 zLCZ@ePPmK`BaCJ$qIFMspElURshQ;2BS!a>^0F8kk9Br%lkZLkltzVqD)C0FQ9^55 zUg`M2os4AoS-0Mignv>F?se<#G7{C*Mn29C*4jZwoRMyJyfi`-euQ`8q0T^Z{>^asgGuI+xpt#mTHdEm@V!CaJ$Cewq=$>&a}G0V_N< zu*rnfR|*@VrdQ3Q7S=|<(N(@I45cz{II{ZeR5nsgm(Z1_?=Jc(er%ZTbK;CNrmbfg zIhCdxOIVt21MBTzPp^$~z8y@+FqMu6F(;L!V|g?S;*dQV9!&Bvr+OsW&IOxPd?wTM y!(Dc;*k_|$Vh6o`8|AD!KrhAxSTCbll6!Hyn+{YRFfOehWw?&QR& - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml b/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml index 1ab679251e..76f7977b5a 100644 --- a/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml +++ b/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml @@ -1,5 +1,5 @@ - +
@@ -439,22 +439,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml index ff5aac478968f5a4b349889404baa6830a0a3a73..cea5c5170a353685ba93f0e804f2e46153e3218b 100644 GIT binary patch delta 4074 zcmaKuYfzL`7{>=#!Ci!fU0|1GR~8q2PFewDIumLz5gK^G3-v*pnx>ertjTP&X-bEg zj$xxtPQyN$DR|6MQ1g<$X5K9{O}VIfLq$c@QPVUnFG+{fht7G=iyzrR=SG6!X`l=Yx2jvYwQsQx>EwgR)+fg(%CUtT$zS zHZUj+I|@ohj3_K9Eh-s>8B4&6UWBVMoVNu+NDe|G<}H9eSUw*XnB+{%S^x)3FochN z341gcSO{k|IJX&GIK3WX@s%x+X?Us`mTI2D!?xB$*-0Vj@M56}vfla7l(@?uYlmLk<4DAO4Wxj>`~4_W@{=pb>Ep;+3`J05HD+E=VpEkUuAh z_(r4p&Pyz~W0GI%jy7Viz!SPYoIlORdsm^q zSqd5r*C0=$$ln#0QGDH0(0P)K)i3qdDItJ+E&YWVZ&X9$Nz=%w>5*ziQ+ z@4BZS9;t$h_;F>Vxt9=DbqXC8!oVof$J}XaN1P4kM3G)*A%C;YhOHJtmW}i?n?JRY zzGfDD%WcDf$s`r;+w>+!PwG^=5pC-dQb?fdC7JO^_4EC98_u$Ol5toxi8nX&r`?l^ z3oV33%6n<_kkqcn9poiGPj+^%F3->O7y{-2Q&UL*ugB<JeX&|nxNoElKbh%E!OB<)WL~Br-yS{$x@lK|a5<@Km1- z=O&Y(CXRQLmDElzmZ#|Ks0GXZn1>d7^w13+Js{Jovo9=IWUB6)Y{6PBScy-s-KMk1 z{!if;A4$P!cK%E+YxcS@A)eUGOY>Elp2nF6`K9Hz-cM32Dm*Bz?+QOjvr;z(NRQZm E0c!VHFaQ7m delta 4086 zcmaKud2G~06vwl;-L^~5?Xm41wzW&&q(Y0*s0BoB0U?!&Bt#5BY0}n+76`#B5#!*I z@djT}kt!f(u_Ex3AcV?&w;Wck(iTuauoeiS9QEz+&&p&g@cPOT-?KjlZz-W zTwFwR5yM3+7j7=PauLTxJQoREByy3&MKTv2E>gHiF^?kn!0dZwjU%9MJ;H zAcTQx*ssE>p9tQ+ACj-10Ft19!2e4@^IXIsEG)N5Nh3x^EY`zX2h zUI3fb2=z{%W1)?4_eF46RZ8RcPSBSr{th;&5$OSojZ=0SqLvnFq5o3Yu11oV!6ohY z3OZK)ayStI|J8nnXZuJkoK#`XO3+1Nr#XL6%k)wG_~h2uIDF-M&~H!J=+Qc(S`c@i zqh?2}qD$gC4|CNz_2;1=9ND5mx`sg0Nr54dr6`+)LtkY%Kcm=Yp;p>5!+W9|66bhHes~ezE>B%CPpyjq+ zBb93tv?wYhn2kyGa4G@@(f12nFkp|(`lO}j&@FJzP>$WIKV_*LyA8A}CE@Ga;ii#Z zvqNu5zR;H^En=ja0f=&z>BmAemqRpnKG0}HR1 z(<+p5S}fXQm5_GIHAQI=%+x-;RM8gkVC_NuP09$Z5)W=Yq(222p?%V>IHQDlHIRZa zO`6=I6UJyY<&kNPc<`Yk`Y2?Cc8NA#>72iioGXv%N0f5fC5iafaX7AaBO|m>w4vN? zaWU0h-K>9A8Cic4E~_3Ao@~*_C1KGrY9_S}4k~i1qYcvZW46&`3sz9ML8qZrk>37R z57&}O`5AqZWRipZR?^_#{TN>bh`p%8WA%=@>y9o|W+jt9xs&nXYu@LTy zXFi;;d7l3Qgg^XcTR8C&0xZYHJc23 zI&9#MB<9C?4yLvDgM$r^C=)`~#Yhj~Yj*HW5A)j}jLs0kzbK4-@6k)j$oLeBd}J5d zMUlH$`kXA^Xn1)l3*d)N7OzI+OoC}FVDEN29L4gCoa>Z>A4KV0OL=AbUEMNWHf}H4 zLCZ@ePPmK`BaCJ$qIFMspElURshQ;2BS!a>^0F8kk9Br%lkZLkltzVqD)C0FQ9^55 zUg`M2os4AoS-0Mignv>F?se<#G7{C*Mn29C*4jZwoRMyJyfi`-euQ`8q0T^Z{>^asgGuI+xpt#mTHdEm@V!CaJ$Cewq=$>&a}G0V_N< zu*rnfR|*@VrdQ3Q7S=|<(N(@I45cz{II{ZeR5nsgm(Z1_?=Jc(er%ZTbK;CNrmbfg zIhCdxOIVt21MBTzPp^$~z8y@+FqMu6F(;L!V|g?S;*dQV9!&Bvr+OsW&IOxPd?wTM y!(Dc;*k_|$Vh6o`8|AD!KrhAxSTCbll6!Hyn+{YRFfOehWw?&QR& - - + - - + - - + - - +