From 80f6667385fc3f16411cc3fa2524c7fe3fa82299 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Wed, 12 Feb 2014 12:27:53 +0000 Subject: [PATCH] move ChangeConceptToSynonym business logic from editor operation to service layer --- .../TransientTaxonService.java | 12 + ...eclipse.equinox.common-3.6.0.v20110523.jar | Bin 105624 -> 105624 bytes .../org.eclipse.osgi-3.7.2.v20120110-1415.jar | Bin 1364409 -> 1364409 bytes .../taxeditor/editor/TaxonEditorInput.java | 2 +- .../ChangeConceptToSynonymOperation.java | 27 +- .../META-INF/MANIFEST.MF | 264 ++++++++++-------- 6 files changed, 170 insertions(+), 135 deletions(-) diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTaxonService.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTaxonService.java index 587b20bbb..b78da64c1 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTaxonService.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTaxonService.java @@ -1394,6 +1394,18 @@ public class TransientTaxonService implements ITaxonService { return defaultTaxonService.getSynonymsByHomotypicGroup(taxon, propertyPaths); } + @Override + public Synonym changeRelatedTaxonToSynonym(Taxon fromTaxon, Taxon toTaxon, + TaxonRelationshipType oldRelationshipType, + SynonymRelationshipType synonymRelationshipType) + throws DataChangeNoRollbackException { + + return defaultTaxonService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType); + } + + + + } diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar index 9fb167cc8644ced846238dee40784f7341832719..4cf488ee33f1a17bac6e7badc2adfac6cf54f75d 100644 GIT binary patch delta 1395 zcmYk6e@v8h9LIgjujdXqj)*J*A!H$~PAC@yn3ngil= z@}C=tnv_~9b$Z)NJRfb#=9!VYi|6~Pg*kl?7_G$fBCQXbwD^BCqtM)1F9NPhC3OAP#{n)sGTukL zx*6NGumAP2fUpPQccLr=8KNl|b5L}Cp5X@cXTtD?v576t6m@D<5v5_+BrI-N#FT<> zn8biI@r4O@7~E~fENkob2%I&N7c59w-+$hNXpv`?v2jtj&KM(qyKaiciyTDfP<4DY z*RpJ;{}hKZ*5kVbbVUN3M%~3kjKq^2JMn|8AFHlSC(HS+coDA;??M8<5c=dkEON{G zPzjC&1$I{x#63*=VAXTVQET)ZsYE)TOkX&R_Vq#LYM6EZ5mcIFrkYipEE4@l)U)bg z4hd9Ch+;LT9}&8v0a^TAh_B8e7fOE<_ENBal2|;);*CwXCU5IN9vvqf*iDQ$kVC9E z@G`NrSsITw<29;}n~^~*G-D?b+k$kWs0FVO?Jd%HvjuyoB3e;I9BjoY;@ei7AZ%?o zMyPElA(q;3n8<0zQQ}GfW+&`aC!I23)`=Rb^bVXyFS-7+El0?yF*NdT!A(MUBMKuiygQ=RFNZI^mbO_ke= zlf-B*@`=BC@j8*;CvSAE4+p41T&N`ME>sYoyKsoGsuJ}o-lV#z${RiFma54O{)>n? zH>wDmM|Kb%S?qxaFxn(Tpo}Qu-7je4f*9u-}R$_>8XQw_djVMr1Jm( delta 1395 zcmYk6YfPI}9LD>MTU$mcB2EzoG9s(d4s;O&T{Z{|HV}{qZleQtVIxBwCM3qWVY!t7 z8<)4`w3I*=%@(qXkyrCd;sTjY)MWu8?h6sO5ECO9w`nkBiSc<){lJ&=>+`>#|7q); z4EIik8_V{Ggg$C88a^|6B4JQRBI`^77?j48tWf%HDwiS?lrqxj?GuvO_`EYv<&rI8Hp6}U;cwV=?%AlBMhC_*QyLSt1^XqBKohFmAWVebB z+7YF?3(CT2|FyWBL7641u`mn_XQ|b17FvU!er{Y0p=+|Kf)gs^_H-qE*eJ$bcwBWj zr^D#l>atiixPIw`Q8ahLs+{%A(p@qbtLVlVT!0do$`kjx@R)l4N@)ah_k8+5zwge8CpoKH_T?en7?>(D21m4icYq@*#k1w2 z?*d}g)tfc?$i=e(-JG*fBtE=|IHl^xWmHXNOCjO)9h341$5OiHCrR%qT4)F0q{e8sC zTd+g@`d=Rl2uBEhC(6T+DVjqu4}-?fv)q98R0LkvH?h@~rcAFHMOg$k3yT{TF>S;* zOkzN~_`-zS4DK;wj@*n}8dV~n1^Lo>zVc@Cm+sCvHI zz=~|9{gi-m*5kVbb!8Gq{{g&dy%M(?nV;75Zcs!EOE=) zNGXnm1b0^(!adCRVAXOfP^b4Ct3n2!Oj|sRj*UU)8kjZz5mcFErjlKfDw6$3*0LL5 z4hvRGieWXEA5ogK5!w7*h_B8e4~D^J?4w}+6tQ#;My;tCSLJP;$fx6k6MKj;Cvu5Z zCtf7BwMgUf7Q90BQ42DO#TM)$;#-kH6u06fqN7zBZ?s}BRa6^_iGyu8MSRB>ZD61%(+lYmC-4cuM-Va;pb6DycNX4d6}NoC5@w9 zI8C3m8}-Ed-FTPyqZ@A%)jiU8t4AheT)-I`KMBHi5lvL1LB#dqIMtb6*><@XHB@O)?vWjYM;5#9K?RNZgEDetP?laBl(SR{dE09OWel-+ageC@%8T9d;s{l`Pgd#j m$yx6DGB6wMr{3s;ChoS9OT0y%Osh zHDXgCTB?eocGap@tJd#x&hx$r{eJ&(bI(2Z>~rq9_jzqw(s|pG&X(l1dV~6Z7E7Kb zGeu|FI5j1?8-|}Y40h@)b6f1GgMZ_01katnrwabc-!sQxvHYKX?k6eXb4TUB1M1`NZgIcjlC{^N07K1W)p@wcS;bQI(Nz~dHWubdFMfO8dg6H#PZzjkLzRd=<#Nk z&LY=XbvCR?Y1hpGHQC0gn}AUq4b;`Z@H|ilWD&SVA1!jdI-}SduP;Fg4HivIo=Ac@ z#VVJs1duu=X-Glhi3Z47W#L_AWr|xz63CfeT^Wp`m(i@Ph^e_sN$CyJ?I7@p6i2kY zAEImD3X{TF0oCNtG@VJ&_(iq$hKStPJrTB|Omth!Ez{1dydi>mHK= zm%h*?ic1?5MGhUKyX*jD#1e=@sB-p1-EqRnwd(7L!VTE9XtM689gxKZ*i~hd5+d`n zbgN)fF*DrHAnHqq{zhJnr;SNxGyv>;=THcsVg;n-U}kJk)i475s$2VWxo3t-$`dYCuc*!WHm7$jkSG z16Gi_e$nFO*b)JK6s!QPAK3?jw3MGz4>&;@_zmikOKJxMlF`>Uvqfje1XPqylLFdA z0N}S!IXUyqfZi|DE++zaDIVFpZ$RrvAj1EN^2DTo?}%{eNd})?&k@eUsR3r%>gQ*X z^*;%ihg6Z+Rkq0e?%4sR<@K`yuuzOD2r56E7m!BcbC}%TgD^>07|@U)P%Kd#KO0~Y zJ@WxBSQOB<8o+GU+_M2yW&aZa<;evz&jt)5me0=z><hTJ97*Aa>P6_dDgKq(CQ4xf;P zM-+!F*F;~JgiLL!e}DlsCK&?^#WaG%`J+mxe2}E?LtL}6^|j@UR{9nc$8Zbd1dExi z^i~KQ6l0PyfnJE{s+n`aR@hXqx2E4ECT6>M+;^Nyid>6h)k0^B|GCLa)fT zm+5sRKH|bh1>jzUh_arDp~D*eYZ&0?#`4@6eJm-#lh*6>!%146Jl>$EoRgS5_W23{ zRaWGDr-X=VrxcTHyiGqjOcQEml7&~?^64pkC~-$*M2omJdLwOci;Jfeo9uc<-ziwz za4E@CRutaRf3Ho`$|@n*Axq8j5tbKvI(j%Bm^eXY+6#Ro z>4!Y>@nqzvGvIkRz>tdUr8-nWqXBTZ{LpC_Pg~dn#grO)375L>0L8iW@(wK7&GzttanSb$V(Ro- zLr+3+H?;+<8H`pj^s#|k)(kOwm_Aa( zWf@$e&|r*`XCE8>A{U)}X4pz@Je~lGn)MCFN+R{PV%&VoxS3EE8H^tj%J^8MhaaV? zoNP8ur)7`b7);4o(Pex}I)P#jIYBYj><-4Eg#MzV zF`vf#E=Fq%7PE$EaTF?gK0|oi$#fL*Jhf8aG+>rtt`Ah)((?A!PkujcZ9{IvXS?QG=%)6qrk_BKS4<-cxdcPnrnv@;yGJ21&g?QFhS-M<3nx?5OiLh7Id^KcUVjcoiX}Xx_{#|nO;KrWXc|Bl4swgk>tI@9(t<1fp^NKPsGQf;)Q(+QPrd73y z2)$~Nqq0m*D2ZNOlh5Xv{zEbIDp=g5E&GHi;lI~p(}gDUe^U~>4A`>p3sb}YUXxLa zP38XwrCCc%XwCo4T%KEM`kQlj(ERak&2oYj>1|RYW&M?=mb5AFsn71(+69vuDzB_I z4WKoDB@X2^Id7fma921O*Kr#KIPN&U*d($tH^O|aJ;2hsxZu^gseHveBG&4ipw+XKEdx>)o?jxsyRl}NW8KVB>$dnJ^_j4 z;hE;TWH`iRV}U(EVyIm$A&1Q|cjpo{s5s0;pJ z@~@TA`^|5Wz&{=|Q_se^}K3H8B@Y?1?ebJ_V05h4H8WT`46_ZPR2mlq_QOdk5S@6 zlCR*&iM1`QeObpPy--oh%aV;OcSzKeq5itqPE|d!dlL&i)`)7q;^(bvG_XZ3g{n2gzzLS`0Z2=S ziHL{H%(S#{1A=lJ_(L{ zaX$=vZt%vyQmRe7R|@%)zS{C0xXO!bEdzY6!qpC!qD_`4F>90NfebEt5-`=5YsJBQ zsfp1lBc)|Ho>}DV)0TO@GyL2^b8VS=&hoWy{$&@uJ;W6?gtabPN@?|&*&)wuBH@a~ zE$3af(BqXrI}k4c+3PF3aRVS#)D25TtWlAd!*5u2k>m)Nd3Md`_n(5t&wpB;zm)da z;u3@Yu{dPpUl!Fzj1Xn}e=IA>``mpKnv6ADpU|;Lyv6-!D_-#&*3l%*(1z9|Sw7Ip zH*!yuwV4d?Sd++IJej6gxeC%m+$pD;WvO6mIsdXqE)U4eP%D>L-ta?7YkmK+>{`mY zoixD;zw$ALzKpf1A44>*2m<5ESvf;^`S%LeELvv44pp|Uq<9`t)k?j+z}QUQj{*?fdGo{ohgh$yUv6fPKNwbFjR z$rk>O{q^He#A4sKMo<%pOo$VEs;O=f8LxWfqKVc#vLCvnNz|MmUwm?chh3JMY5k}r zz_`n4UQ5!p4<1PDFLG zI>f9RI4j*w+cL5PpL%SfCpB>5I3jFkU&S6!6WH}C*}f(_bgbgmh{&*bn~6eKyO4IZ zmXy6~*`|_DwVNv-Vs$O(no!&J4yv?-!5)!?ishJ)0LuTgv~4f0GclTkSaD0;Yqn{e zXM+V^V0{wsnD&w1epy6(hz^v)M#ukcSEzIYY*cvz;Nwv9wrKMWcF-8gRnp ztZ6nq*-@*aU9EvcOOZb;w4DxyL~HVFF+_(w%o|EcTYq}i#7dIr)j*AsHxJrA!-d56 z3gRb0Yk~4~f$fTazr6Iltpj->?wlZa0RvCf%^TNfhWz^)ESOq70K0`agJdeDA=JvE!i?LIrZjI!d)NLQZ7C9kD0#)M z7HD)QePF-C&k=*@%S8;U%FA-cL_5`Cd3myZE-8Y0KXUjrWd53IESQ$-0LW+4?AyuK zbic`-X|E!7w}Slk8TRi0q~P8%({3jO$|xWNi94+k{j*xDF4<$2{U*8a<)sjrHOHP! zC4d?++8|T2?HB1zL)DHc0N|37bL7R;-L_{A zd4*>AHykU-a^N!T6`6l-htPhnuY*osvA&71g2=t?P(-(03OSmb#sGPAfI~+p?65rp z9APqKu;X{%35@nEMgV9N$2+K%>~$oxagaVa$z3nD9d!{n#QcK7A#^z z5Jw-5c7&nANOS}t9H;;I_RISd9rLJiBB)U6i4h<+d1R(zs80m6(ukCY4wrm;jzdpo zMl;MD!bGFR*zlqgto6Nc%=7iTxGeAnueLm_GaSF~OGh1FYpzA!Lx)#l_gbQd$0m)Q zj9uV0Bc0Cx?G*ygLJx@_9i}^9m>sSC52`2IbHC_=SHO|TBLl0m^RCh+nBXLgt3WqL~#i=A4Rd?!H z=M3$#0=}_wP7P;sQt`){&fdIO{7&r@IqjWZF+71OQ;^Bn_N zv~1YGxr!{p$Ll3~V2Bu%j#EFOnNvru$8i!T3e(jZ^0U^?3%;lG39&dg(|Y6k&7e1t z#~0f>lj-Qe1-Pyp*xP9$KjMVjKs_$bXH?wYPBgD`QQL=2b6%p8j=v8vyPY{sxBPUj zlOC<(if^MUFv+D>Mft5Y=BFBp>^^G zr-2fmdnm>R*eo3LaX1z9Q*Cn14(CrK6GW~n_w0Ahru!k3=|V>iH+0PP;(4csG<$H- zIjX1|fM!w!21|I`IeB&%|F!=kJi2m>B52mV1h zgc21el2-=?%BS|gPVxTzaf7K?HVh0RA^m;|mzSFd#*~IUuKt1UW*DPZ2R`(*JY0Tf z4@N!gygqO$k=8m35E8>OK&|@5z&6;c^`#IbT%6B95*|7g_#Jh={E30VjfMbx)!-^y z{v~jz_WXJWP(?Pzx-xw+a&$I*!=fn6tm6ujAJ%Z~Czr8}0r}YX zRO|m;f>XpLxhezU{aMHh{Ou8UlU&x95{}E#>~xn|-br%p5s*(yRRUMSp=@P)P-8`(th!rz>8M6EU#h@ zc^lvtt6Y~}0n4~`t}Xkal5%rEMM67>D#m_6wyGHp= z+2WNFW3du*(KYYiE7JOl>kA^!5e{X_$-7rwr71aZ^CyO7#IbjgbA9f+9s^IJrM^e$ z*8Z8RGSu2U*4+|=%-6dwBV6PXi~EExroWwOE=&96PKUcQZS}a^O?+2<|98!X;KT1R zY5DFDc`L~M%t}fjPFmo|E9~J8l;xt_iM}r#eEGkh;0~8xS8%T(wz!8xQ!zyKM%4ql z*prE>pPC7E&sKL+l1hB%_|f+k;3p6-|7qZU#;F}AcS0IrH z|4>zBx#sS75kxYlhx->gCvhS$Gp~5|p;}hn8tER(Drbnr6L5!s7`)<;d1Kt|s7b(w zk3W6PUcs=)#*^LE`5Q84My$x4gr4LWyi8(@Sm$ml_Dog{B5|@>N_JlAP9c5pB`BXx zEG+*>XqdN^^EbNB_)O81ykp#qu-mv&8;`bMCJ6+J+xm_&$=pxap3<0)8S<&KF*Rd-2SXcH3QF z1tO|V1pyqhm|(!qnaWN>UA_9kok8J(&tSh%mNznaT4BI>UQI+yN1fki;yV~_{}n`X z1hz4B!gPdw1+(X_PZ$5&PE9RnP(`bX%uhgnncZXbS)9KuF$t_hi6>6a0WijC-o$r6 zlduB9IyFYK6puqRa{r4xLFHVx=NRP*BDR_Yq^Iu`_t(TA{Kmy&6}OrgsXyRPe9Rco zssM0JNel8siJW@y$+aNQ+oU^`eqECv!BLil$S#48OZP%Nmo;Y3G2oY9Z(!ixM&yQj zDvOXTv|3Y3dJL3WC=UER8!Z>xiwZM0f#B~E)^zx9Z-l2ivBQn7j!294SY%3+hrei` zQ{_z_2{8Y92*p=}5Tc110Yz*o=P4jD2Z<34@%fYq7tDpNkCpe7rNF=~QV@gq7GUtj zJe*}`t9a50f}RddUKLL$o#Bd{5#wpkhuexUvf$^mZeOI;`D-vsZ?g4;q(I$vYh||NVoGV-|hV}IX%8)bSPYZp`go#!Kw=;P96`Rh+|SdNj2|<=)8QrlF~dCQQU-W-lWfSliXwKH zCtPe@j4o$ihNmeRn~H=4q779@)S2aJ4sz&9F5y>UGIcS#Tn=C2Y4z_1VR>nVCyDRB z+BaQ^Z@P`>GL#a+UqiG`rU%zk1;@QjrIlN`fHbjNW?=fFYe<#uImzgTp<8mm6N4#aqkAyOPAF z6*L(#^py>_R;Yo*(GcGPc&K)N7mv6bYV~LHM0DOUP`1~lP40nMCRc?>TZMesqEmp{;<}<@oX5oAf0sZjj&PjQ!aHZyv?#zrYhe^YV`YiaaWT zy@k{u6U)rS-j;ln4HQj+JR#!35g2$vp6U@l=OP?!U%#X>fn|^7-U9Bn2U4XD5j}5c z8%oQOo4pHQUp(QFW=#lzK;-dhA_56#{PEf8pU13cr6=bvtA zGE2z(5d}xFgrzn^!stJ}&3!KO+ag#lc;u~0Li)wF%X@!$pAi#eS|t&_MUA9Dj}nc$ zDK?S%%=;fKMUrWsKl7g9uXfPJ1k>I(DY4pG2UrQ#k0QFBhR|TWMR|eo1?{9yK)00^BoEvaYb@Ff2;sQ5$&A{ z&X?kNlYq7)X&_ZKao>R-&E0b;0Y38hrBsM?c$BvY0~yOQ28zfXIG(q86&-=Wryl7f7vpjg)Y1;rXX?Odw3mK7gbwF#XS>NU>m0AFfTM052aY!4KRlL?w8)j)kfi~DzD-D3zYBkgR zSQ`$nX6}J&c<7=H3)d*r=zh0Gsf)p}76sBGUSCUlAw9a<8Yv6shZ#J{b0|SB7J#m5UN#5o>dmH!-;Ll()2v z4ZC6Eyga3vHvMckrdRV=rtl349Sn0eD1$IO+n|iXFk+)J7{i5)$Q6rtZIhCLVVgFT z->i(lY{6#Upx>g5#B9tK<$Vl)Zc&C|=qnLf_&*ksx3}BMz@1x_(EwK8#vGPuL&@zd z_w?;b7S>AbV9Xgi82Ee#Zy)jv%X0P`We8AO?qu%Ub~0wAU8wyQF=Ll90K=nQjQQqn z1|Hna0>kFdk$9Z@<0c>RcyjsYHy5(AF%*({E-1kaDM1bx0`fscR7YS%u-9$c#p zWeRxqX@N2hG=h$^wWl6uwf{NJk`Fk+w)p-8Yu~1jY33Fxy|KY{l1Yy}$?72f8UYyf z9aU5@_&e6%h&ELCo@bM_;mY@{YvWT&4`41l#o9eQrKDlj<+Rch11$PF2J;WB%FrK} z?WrHwpDoU?NO@;iqmn;zz)ks)fxm0B)U&KZ;aRqKwo68;EOER_={|Ss~4GYyGty| z)=QkD&n~g%DVLR2S{Z(lihSCCnfd;CnK$A+?y@O#g;9bo+}1I`9{x#Qn{3iNBeO z;W5Y9n8$3ki;sC>$YB9fB35>EhK^>@xJ-i3Ru2NgA4;KAvv+aMXty0U< zxeg0+pbiUzlOamHURRCB%9Oe+*l%^2R`+_${6IaHuWEgcjOFzi#nFIgQyQ>Dj~b|b zv=aVeE4YqpsK$cYs)pEAgj<@5qpnhmWd*)ZF155T%2R5%RnTyoqWVX`7WOhqxNA}x^j?5vU z6MJB3Ck6&}W^q66%!=u{uqyq!@V@W5F!x%oGozf>dCl0BXT!Vl?6fv4&O)O1=%!YK zT+_O7(GBR%6vuVvdUCHjoA`}4RO)%QyupMoPs6UdJ=7Wi4e6n#P(WmeJ>dw5TRqff zfX1e%Ss3=DsC4u;>d94QM^BZG<@&uCxUCnH4DQW(Ozq9}$C%2cZComEKm$aNDy`F4 zqP=M>O4W3>{+x8SoAXU3HvLU1klAms`WbJr5r2A%X(jhzv+eG~Ml9c#*?roV1K!k+ z*Z$Lw_g(JCRkmw?_SW|PZ0E`YIE6kRK)~#QY`ne$Im8MEvNhrcF>wAMmg~tNu6ikh z*}MA(bHtR%V0N=JIHZ5qhAu;Rwq*!!2p-C{eZf$5ux3uaplxqZnu$&5HeJG|#STL+AhSY_B%N zkKtL4Hn`sA+56gX=WW)d$2;te{n`*amS+pbl3}vn<QM4AZh48 zsWqL|;uBU*=M(nobPkfFPdGwXeZqNRp24Jg%wY6yW~lwOV$WgGY$k`r=$Xvm_)M0E zv$EGL&dRJ=tmv~@{%w3mo;+Knd;8AW+#J-*Vx>?5Iso_}i=(*f9Ijt-4$BfTmxF4` zTo&TiTsC62dF-Fv^Vk@b<}>E(`4m*y+3bnI*-ZJzY|fARf*XKO1<#%eM(MwRJBGar z*izA-GS`WpGUeN!vOU@?WXgF9)%2G#qQ+;e`dgo|WXH6j*5^z#=X0$`$q-ude4!=J z7iyYDz}5^E>hu?CP3UX;lBvTFuVJ?9OID`hA{OW4MQn>Zix{O#4m%_-N2RB)7dZ^< zx0ppezL+f&_m!H2wb5U3nihP;$4mGUCN_Qvb2zd@rRzb|*J=WWZeOd37#4i3rSR7r z_$`+5hGk0`_VBEBIXLx`KggR&XflRx-ctE7`K! zR`Qx_6|0i5ic8gZtJnuIt6AGQt2yAVt>$p3wT2mexQ29Y`Rr>%=TFxi`!)b^IN%r8NJxR z8{XK+zTUf$1E}04-u~Vu-hOct?@QRsn6o$Y_G_EjX3e*#?a1*1wU?%iTh#Kf`A>ji zsEGg5gJH5%=~3gdWUb@3GSRtPnc>r|?8mm-IDS`dV?ABlH4|>v&Y10NUSLLvlpWj) zP20idytjj8=SLuP{Xg)hHWG@@+-Mw53uJ7d#Pu|B4+PaU4 zsry;V(fc`JFYjl}b_ZCu9S2l;*E1YsA>KU5k{!}!9~^_|%@3*3Kp1d{Pw8!k*w@a( z9H{*cvs(}4#NITUFx0tQg6Pz_TW;yQ_leAV53AF#=20M)=k0h>ACt#Vwzzb~ z1nPh+0@v!JM2=Ty6#L@zB}k#cqKU~9K`^IS z?b4M1QpZFMDM&ok0NJZ8ysNBCcI!w2Im@dngHiM{nza=%Ek`LSy+OL21U{MUh>{ON zbnRPVQZPH9njD&{GbtLs$kyHvk@Kd-6g2lQ~%(S3{CyD^!!aSM)vh--(6H?&v zm%0RTd84App<{Gc9Ds~i3ULTk&Y7e;K{z>9eH~G-QD>2hr|6E^0a=odT~#(KAu=yh zw;DDTv%>rgBEQl(<#wT4N22}9h~{fo~+Zl zzNA9O6HXtM#LK!PUO@bcmlIRBD?xI=BVE_m!A}VsY6|$m3hZC12DFqfT>&40y!00~aw2fI;*rh!2DFXi^NEL})WeeT!o)chNQ9m;P3q`1cpz@>n0jVTDhsmA22$T3l0SyTP#S+Aca{(sN zGY{bW#Q|-r0nBF2ITuh>_CFa=o?I~NT);45`Qk#rf#Sf(eHNfalPI-caY^svfM8-w z7SO_O;FEy+0a`GJmqRcQ336LRYNS3)h-U#5yP&WbBFK&b`r0H4Z)Jqp0eYi6Zq{F= zXoA+qk-KF2IwIkKViI=`DkbFU68eGUvqq8nw>(&07^hFfa3N0LQe!$N(itIA2k9N6 z!C@s>4ydjVAXC9)QH5Z;nAunF6gh`MRo2iKU|qKbdCl9N9af5q6E*d}0vdT6G0e~& zM--QMTuZ-$G>F$*$zPoMym~1f zdaDfTq<2z4awI{rND+P{&~^$XA?l^$#Q`FX!9fUb{a*4hG);7927A~Bbr|e|q+_W*k|NHpd639isaNE? z%k?@EA93NM0&p)vL|IS3&|$6q4Gi#eV|jk9K8BRwN$d6c;Uq0jo@~@p&Phz3_RaRutUT|Da7%%PJvRAxPvkD z>4!Y>@nq!4v*39oz>tFMr8-nWqXBT3{K#n-Pg~dnMU)zP3 zmmotnJ0{HIBhv3DoEdFG4J-a1BC!#MUkQve!-w7I9I%I%F+@?p=IHRVtSok)Q!Mhg z7{hq78d6--Kth8r;0qZYZ)joAY>^fK^Rs5d8yl>0XFbCh@|Is#RgP_JNakZ?uqfRL zUb^4GfbN8H$!C_>Ulgy1xqwg`nPgZ*ejlFZtRNUX=YkR{(mEM#1B!F&)g4%}$yuEZ z4%$&y4i{Z764mC{w1VkxirJmC>RcAnfbbN81eR0h+0hKePU>V;eI?^ zRBf8!zxdlb-OvU@cqgSKSZ8rJ!iJzcG@F3((KI0xYhf+7C|d!caG6{~pvIt;V^bHh`cCRy(9g*&e+;qu9H zLvJz_^s6fx-$1OcTy2OV&q15IV#N)#3nkVXLI@JK&d>?N!$C+VmVD1m90z@GBBsu) zGxQ`BcT;=OS}BpS!H@&B<8lnuh)LQe1C{iS23S7h7L|ruie3J($*_dd)KkV1CklQt zm}LHL!znr>7yo4NQqFH!>Go|{d|L^We?2rbFq1avLJJ~xmceKhL!TJ9Wla}zhUp_j zY^K2_3Jk_bdG3kfFLKeT=Z0q!TFikP{SRO%CgHk$En_&-k7aBb8vIB(#?kUtt&_LrWS5 zvqRAJ6*?rTk}*&mDr^(YKsC z*dImyWxL3Di2D6zHDeDtTykm|j~X>oz7kSo$_Brq_#Liqyvf~36Juw>8YC_jM{#Mi zLkqFud`Ey-BbpoAqs%I1ncLL3haw%2tyH0CMUH7>oJJ<)N&9xjM-(bNnbW~Il+a&x zH0IHm*Tra!#$x6WEslzdo{te;p&uE)Fa!MXA9G{TdyUZ~pHDMZAo_(60fr79$Eak1G1CGFA0kB* zyFEc-n9dn5)1mLr2#uSpddql}G(;!;iV(8?uf}yGGMx<)l&Hbe4hl>v$fggCbYa4U zfj3nUQ=XzELVUvR{dps0lySF&!sqUjw`4 zAN5RU2>jIqho-2sHZ%>O3kSJH=5{bGHEF?>_Q=Kcs<@or)zpq%S?Hll159?&UZ*-_ zo!+MYO z72$f-B1dJKnottGz9yf~H~oiV=5?^RM_cv_Q~dv~$)<};=KrN6b{nu|(U+!%|GOq5 zmzc``Ka^%KHK8^CH*Wu1khPOg0wS6C{S()e>^pTyu9WQG<%YTol;Vin8=V^CYC7T(;ai7NH;`R+@K# zfV{ZIe9*_LFfl~ZN^_Kayx#nbZU#wBt#Jf#$r|69V|~<@EJTc6{#_{{em;toO?l=K zJ}UoO8GXR~4hj6zAu|;%E*A3KQF8}sWwaKL4xZs|$oSD?bCy3vWWwL(9NLKN;AVo; z3BV|M=(*Vuiro+1#n}o-2~p3hmXy&YELV|^5@r7ZXVM_iWRU-0i|u3#luasI0`M3m zE++a4o}5(M(%P4GT+#~^wY)6Z$a0rNJyqOa7u%_-M|N*wp~o6g?N=PV37suoaU#*e zC+Mq;un;NhHnXI|baHu;h2twV)siTxG_wTC)XtVZ7R~3JsHx*DVPbX&@>%U^Nh9)b zNIjX;+p>YYgpEtd2e4i}0br1D6<34hz#*2CzR1C4tE>c-^%MDCt0lG*#e7O%*?Qu#Xlufw~WiQOyvgpU)p#j5Njf^Wn8x9 zN0P9xREmU9HC%LCYC)1ngndol{fFB%)+{16M}YI<1Pc+ii`WpEmqlQg{3|T zj(c%G418|z#=uglO?*%a`IENB@&UNYOY1BHe6GUP4ws_MmPj#sv*v+xE_)I%)t75U z!F;)i(JCXPWjLN$`Mxv!{2_B~nR4Fpjc@){7rZ^h7B+;nu2@QG^_bZq&ut?9 zs>LnmU$M~Rl|VZXCjr^#E4;A-AXVf|OGT_vk(a}7T6UA<2$=bH&F2rEfyXa@T3%>V zPHt>*i9!EZ95UiBi|Qjrh_d}ZmR00^?!F04#+a>7=~yJ*;z5)ZuXqmYXp&}VLu;Ze zA86$pxhK-vOa^$YiR3PxOjoR21!*GgmQ&5LRIs(2e_14z2V_=pE0z}@WghtmX^~xSttAA5GAEH%IV2y)hz18sJ0c!U9FTj ze&kT`JO%<~_p{OiweQZ>)yiO}j2&n_O(!-UG8%}>XRHRjk}RQ8K2xZ34_J*Y~o`qwbH*&AI|VSk514qfZ6Y zlr|86gh^AnZG9jm?O?h_MT_y%Z8nh+N(MNpB%8}!J8D(5t2K~lDe}ifwll$yXl<@7n&_~Hc|$2_>rc;`SVLHs0WEl{4xw_Ww`mzRIAbs#Uqp0_1|_Qdlx52=N*nMi4bDE{T5?FPAkAkuo- z#!pf_>Gxk-iXT_nuG`AcgwEisB)ePOZ>T!OoyPFib)FynTlDa~6_-?x8HTM9)X zN?x(M1sdJS6YY2TIbslfxrk;}d0Fn9WT!eTuS~JeBSmoUM-IP%%wId51=DgJ0Qr2n zeFxc^?l)Pp>{Y~`R*>I5)BZhx6x>^9+3kct83lwOakn+1e|BrtC40=a-y#>jx)dTa z=i0NV1W+SJ8)QnB{Sw`2sM;|F09NO}YMPv33-CJGRWdZr6#arxmD`-Ru=#GW@$ftKI0XYesTSn&HN*cF%k z?$|SiyhgM9TaJ}vIdB>Fn#{knLuh}{*FmSR*wDmSLFC+VD56_0g&a*zV}Lw1z@Z}) zcG%tlj!+pg*zvpX1V(!nEdaEM6CKn_a>y`8G~uFe_K^cPO!Q4cxiF7(lw~?}O=DJA z3l=dUh@+22J3>)mBszi+j?;g9`{jd4j`>tM5mYGk#0U_ZJUYuU)F%R3X++8+hfBUY z*P$mfqZwunp`y_eY=KK0x^b@?nt1S=f49D;P%2CJHnro5w$l;aPy^iSN zu}PyRV^%npl>r2D;`Y)RE(`w7kx#LKau6%rZ>piP+DS)+5J3DE43(eVaNH-Yh>nEj z6DV{2%aNi-SI9T%k)sXh$Pxoj`R7H+`;dr`cG}g&q;n0P$IF)3h z>P|iDoUUC~z&A$Dt>J7=D*jZ{*_#)O-l?4;yS>vZhQ~8y9AB|nX*iyKjCZQs#ts%} zzM}z)k_{U;SCd8fc)e^73=yN!aO%f5bLzdk5*aY(xa7jRuzK9iat22QnH+7DFgT@q&0~xpHe*WNzK?p`a+du%baggz2#Gs4REHL{wg2;8{-UH4#bU%bLUFgW+hK{*jy5RJX zW)CkpM-_Gh(99~oy5sCZkRsfwe>umI%v_bT&4H?DJrKv>pSr+FWL55NSd_H`VZfv2 zz&|L5P@-Z*(we|P`OF^JDbBw?b}$vohJisOq~A|r@=Ei-=+cnK)j!bP3}fV)z(>B8 zhs*Dr!KjCwHv~>2(pqN$LSk4ts8!z-*amyGz7&Fli3{mS!o#Nnzo*WZKQS=4(GY;I z8C+${zXC2Uz8He4-noh^glI#6y5ji|RFO?Ft_)v{9GgSmuqX;M>bQdBM>Sjr$YpF} zKtAz3)%t&z;1scmuF638a5nM+e|yBeM3?oIgyXU_C(UJ+cN1N^_+FbX@Ca5@U~ZGY zb##^B9)6HG^&_rNk!h~RFbb}=>`oN#k(740`zDC6k?5g!r@Ph^Jw`MW3r0evykV{w zSXlxskQ{~W2_ka6D^M(c>@~_xAGk&Y0nDMaccCjrs`Fg@Egd}|%HMidq)cDniX*EK zjsy>M84+=5gXo9@$-rc zu2H^IwrHiqSgb@}a?StuinRXM^(B$#2!}G|xjqkEPk<-U zQs1X^YyaF;8ES1A>u!lb=IPy65H515#eLEj)8EZ9m!G z@ZtBE)I4{HydC6zZY8ACYNhQ8>{N#HJ@DqrW|1@wvXIrF;@G*EeW~%WCZu;mb@XZC! zE09QpeWa?gTyyvP2qKx?!~I`6CvhS$Gp~65ky=*X9_b#-DyNGj6L5!s7`)<;xntbz zs7b(wk3W6PUc<1+##7wY`5Q84MvTarjGp8;yi8(@SnqBt_D)d^B4LVJN_Jl6P9}Zu zB`A+hEG+*-XqdN^3pTmW`b_6nGEC%TyPab8RJ?8G?Q*~ClaU|KNZrC^MT$K4+aOJ( zn#o27-NE#J?YBah81xBB#fr1;bHsk)d3RTOZNm>Od>=_)-f~A`0Y8x_=L@gEeR$?b zz2mO00uj}wf&h+LOfcZ*Ol7B|u3mfTPN#6eXRzNW%Nvr=}J(sG?Ox#;2ga-0m^@EY9DSm;_cL#Z#x}AQ51fFd@R^W>A5gT#o2_KXfFLzr{pth$&ch6Pq!9!vZr7$t!Ezc$m-Onya%u94d zX)s*Is>;nhJUyudczS!fYT%;8N$3so%X)k6Y773X3lziqB2JH_aISE<7}nPlC__>` z^xz<4-}Y?u*I;?0f~VGa0L10N7J%!Y$_5Gh&EIqQD?TNImn?axr|?h$&@ARayfjdr`5k7gyrRx zox^xDLo z<#;&%`30g6|Y=S-tl>07E*ziYM-_0EhbqFE_k8i?^1K zcO{8UD`_%h=xZBpuT%qxr%fceyc@Cpb8)E29J2BAHQB)J<*x(yu?IgJvH%ZO;R*Gv za^7s<4>JSbx(4TC?ebp!Ar^iuQBvIc(d%Ncux&<)F0bVMfs6G(fgeeQ6fT#PyP~}> z=^Qyx%1`H?`rbNZQTsk`CDF5$cQ1@ps-=hd@s@WLmRJuUJLUKu-V+>&1L^k%KGA4J99@SO&_zAH*U9oDdMOcd zahi7;-I$70WD+SOyywZ4_|XYMgth`=m*dBKZ_$^m*g<}iGxp~Ty}1;x{{m0?+{-@( zDDd2bV#Jv3(%v_PO)r2DKl zj(@tP$t)rB#}phz5|-Km38Vh>Hut&AZ;N2L@Ugcl3F#NxF7N;4eNIe}X_Z9SRyBeG zJyJC8rr1QvbMJq!6hWqa@!WfszuG|?6HNQSq{L`z9bhF`Ka%Kr8bX5&7Uc>4MmSay z!vpba(SmKNRg_8AerxlprTwcxvawBR<&)NL9DEV=ZH^M>?8;4$%yTGs#1%>H{ILQI zMYMM+IA4n5O#<4Iq=8h`!~+L@GQ`*$lHF*7p#~oZ?DrOyME= z)x<0ENAJQT=i8ym1weJ(p;hlNB}R*xqIjIM8;5A!-DT!49Z1v8N4Aof9if=T z8xj1jS7;asXe?0V-bjTTC%I3R#_$QrLzc0&&0;Q1eDAXeqSwdesSBPX0N8 z_-Hjsd7s{Qco%`?{c%c5DmzGt2*HSeIOXsRWjP^|>aT#4rYZbr$OV$IFD=6l`!-Bh zxCuoD`mhNs&KKb3Gv`xfA~8TLzp^IZ$W;3Alc}$G<}XvYl`64<2$Qk%j+bA$fbdZ4BJCO&JYf_3g}I zxi*yC!E(>op=4sM)K12nxs!n}cJlTi-?A*{zEy?*rR6T>zI_*CR@#l)Urfy0tqj2M zcsFCdy@!E^_OO6)dl~rUUY=Rv@>v*?U-_H~R1+ zC<4XAs3S^u49AbK`{ItW!{#4VIs$m(sFH>O9*z_Pj`7(nj9Il+<-ILWs7;UsI{rhsYY6ezv1!F7sBk3Gfe zApRNw82LR_R5AE_*5If%RQQ2sQ?%jg53FnB(@GCuE;`NHJvyzVV%Fu1(h~zL`X&bR zkF3hjADQjxAK9NR&az0kXIZ0?KXJfK{fU9UYqOMdtV6*$ws+&7abgz}`+sI}qtElc zzfbw8T)XH9Eg)*;lB>Z`m zg-*G~-pIekAyEA~+duO3P< zf3sZTZ>C~+!Z9}H37hTG6W-V1A71-b8!A2J`nB>YZ&#jis7-#xRPH=uwK_g$1N``0 znFv|BzhL_vf5B|)z2sr#ONy%ns){1GV6uubx!|!%RjZFqrA;?<>iZbd0#qtAM*>tT z8L@gE7V?l~;K=}ODA0yFMh0eUgTI@i5J%lB*qdmHeM+SLyf&aHvx-eBw|kw;WD&28M-BUb6qA?B7~ zyQ?Lc*z}Srm3v(%n}0wkZ@&<#QY+9RjMsLBktian6jPaBN~O393RkH#jt*z;_rqDs z)ClHxA%eM&_=@5>QmqQS<&lhTEUohCi$|8NC=b(0tI=4LrP(-TqFBohqu8jwM6pjg zmf=}$8I=wSS6P+LwozqOIt2hf9+<-nTqXr4!v%on1AiI?pau z=iq5xgH4!QgM%)-CeNnVWMWThauB7}V$8#}m|v}UMp+WC4%EaR-UDJ+sjb!ri~hCQ z_CMEFsb%S0hlM#p3tfzi!*nBSZ?JZr8}2iU&_ z?<;7*_GsObQF2_zMZDDHau&`+i_Y@KeVwu^DEVXCHuGon^%{_MQTbCTj@~}yCtO~ z`|V^$<`CbBJ+Q131A{uVxSw=p#dKX*m401#-}haZd#yK_QTCg>X6(wd;az!lMjMu7 zBGG$vQ>#I)>D{>K26ShNr%K0i{ay^*-it{F_hvn&_2&9xOySZtE`>Ls z0is8h)~PJfzEl>aY8qRAZW`Oo`8E@q@irC6tan)b^mo{ZKflAYlKQaO_Vi&Rmha2# zKI_W?Z|cWu|LMp3uJq$7+qFM?Ye#>!bL9b?LSGCZVAeo3Uf+QnV)+Bv8nJ^IxL^>= z^>h$dz2w2{-2;O;V#=g5yE*9`(!Xm%mmxgcI)pa_59QjvaHu+1Gbdki$_``KbQz{n zd%bQL8>0Mh7HQ#dwHtsBhO^XtM=-+^BX})gBrCRIB+p8ZVw9{=3^a~r#r`vzXV%ppM1tuMbq}sM~$W*4^?Un9n1513u9439jvfx$}DZJCva*(;sG%iRpr>UJVyF86unlN3ZzID-b zwFL$w4IL=8X0Td(!pa$Z!d{!fL6Z0>N9gKLIWNpJnN*LNjQ;IRwZB&EIV_sZ;;7+!#+I2@EMs7oI@pDSHgGH~rm4n^H6 z=GT1{TXy>@UURKxRnk{;srr63`yhG^Ydd!h2i)~F91gYCGNX^yGO@F3S)^*~n97uO zY=Ym`ah*(B&&0N_XQu^iV7q*v4c9lYfOT`2ZB`D4>w_F7)+(1xw>p>EKF?)wyKH2B zt2Q#Dmm7J*TbtO|`!;a^mD|kQKiJIMFKy<1@mm;k&KBN&eGA*H`Bt?ZIewt_(zI!- zS{^q48Bh!r@qc4I&T{@e724K*mgU|@2c&rr)!61!X4TfvxChG z%t(>ElY61*JK3D~cd`r}zGbtl|5j}YHjlq$Y1{2$ian2F*LShz7ju4VH*em( zo6${s7_ZMBrm=qyiyE<)1sK1V&2V}zD;|@_z!`ZeJ#ZY$W9NnJV}rfFk88n=eH`LR z``JO;_A@c{082Ug04MB~1B}`3AnUgCpi1w0hC?jG+lN@P!`f`(afsghuo?w~0f+gN z-hP;U?L5MP+V2Rvb^8%^NZ?VnITUV-4J(hb(X7XqaQ|a00-NyWF*afFcN|&of5-A) z{7$8Z#R|t+Q*dsI*@5G%M%8?#KQW(aT*+rcC7j?^c>D=Y%DpF8pb{r}?Y)!ifs-d$ VgxCV+Ft32OKPq68wmqc|{XaD+YPkRa diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java index 6a295e64e..b0428d5bc 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java @@ -115,7 +115,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe else if(taxonBase.isInstanceOf(Taxon.class)){ Taxon taxon = CdmBase.deproxy(taxonBase, Taxon.class); - if (taxon.isMisapplication()){ + if (taxon.getTaxonNodes().size() == 0 && taxon.isMisapplication()){ // TODO get accepted taxon EditorUtil.info("trying to open Mispplied Name "); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java index 62e56bcd4..3219c650c 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java @@ -17,14 +17,18 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import eu.etaxonomy.cdm.api.service.ITaxonService; +import eu.etaxonomy.cdm.api.service.exception.DataChangeNoRollbackException; import eu.etaxonomy.cdm.model.name.HomotypicalGroup; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.SynonymRelationship; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; +import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.store.StoreUtil; /** @@ -87,19 +91,16 @@ public class ChangeConceptToSynonymOperation extends // Create new synonym using concept name TaxonNameBase synonymName = concept.getName(); - - // Remove concept relation from taxon - element.removeTaxon(concept, oldRelationshipType); - monitor.worked(20); - - // Add name to new homotypic group - homotypicalGroup.addTypifiedName(synonymName); - monitor.worked(40); - - // Create a new synonym for the taxon - newSynonymRelationship = element.addHeterotypicSynonymName(synonymName); - - return postExecute(newSynonymRelationship.getSynonym()); + Synonym synonym = null; + try { + synonym = CdmStore.getService(ITaxonService.class).changeRelatedTaxonToSynonym(concept, element, taxonRelationship.getType(), null); + } catch (DataChangeNoRollbackException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + + return postExecute(synonym); } /* (non-Javadoc) diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF index 26bd4ff95..c3b5a4e33 100644 --- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF @@ -80,137 +80,159 @@ Import-Package: org.eclipse.core.commands, Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., - activation-1.1.jar, - antlr-2.7.6.jar, + activation-1.1.1.jar, + antlr-2.7.7.jar, aopalliance-1.0.jar, - asm-attrs.jar, - asm.jar, - aspectjrt-1.6.3.jar, - aspectjweaver-1.6.3.jar, - avalon-framework-4.2.0.jar, - batik-all-1.7.jar, - c3p0-0.9.1.jar, - cdmlib-commons-3.0.7-SNAPSHOT.jar, - cdmlib-ext-3.0.7-SNAPSHOT.jar, - cdmlib-io-3.0.7-SNAPSHOT.jar, - cdmlib-model-3.0.7-SNAPSHOT.jar, - cdmlib-persistence-3.0.7-SNAPSHOT.jar, - cdmlib-print-3.0.7-SNAPSHOT.jar, - cdmlib-remote-3.0.7-SNAPSHOT.jar, - cglib-2.1.3.jar, - commons-beanutils-1.7.0.jar, - commons-collections-3.2.jar, - commons-dbcp-1.2.2.jar, - commons-io-1.3.1.jar, - commons-logging-1.0.4.jar, - commons-pool-1.3.jar, + aspectjrt-1.7.1.jar, + aspectjweaver-1.7.1.jar, + avro-1.6.3.jar, + batik-anim-1.7.jar, + batik-awt-util-1.7.jar, + batik-bridge-1.7.jar, + batik-css-1.7.jar, + batik-dom-1.7.jar, + batik-ext-1.7.jar, + batik-extension-1.7.jar, + batik-gvt-1.7.jar, + batik-js-1.7.jar, + batik-parser-1.7.jar, + batik-script-1.7.jar, + batik-svg-dom-1.7.jar, + batik-svggen-1.7.jar, + batik-transcoder-1.7.jar, + batik-util-1.7.jar, + batik-xml-1.7.jar, + c3p0-0.9.2.jar, + cdmlib-commons-3.3.1-SNAPSHOT-sources.jar, + cdmlib-commons-3.3.1-SNAPSHOT.jar, + cdmlib-ext-3.3.1-SNAPSHOT-sources.jar, + cdmlib-ext-3.3.1-SNAPSHOT.jar, + cdmlib-io-3.3.1-SNAPSHOT-sources.jar, + cdmlib-io-3.3.1-SNAPSHOT.jar, + cdmlib-model-3.3.1-SNAPSHOT-sources.jar, + cdmlib-model-3.3.1-SNAPSHOT.jar, + cdmlib-persistence-3.3.1-SNAPSHOT-sources.jar, + cdmlib-persistence-3.3.1-SNAPSHOT.jar, + cdmlib-print-3.3.1-SNAPSHOT-sources.jar, + cdmlib-print-3.3.1-SNAPSHOT.jar, + cdmlib-remote-3.3.1-SNAPSHOT-sources.jar, + cdmlib-remote-3.3.1-SNAPSHOT.jar, + cdmlib-services-3.3.1-SNAPSHOT-sources.jar, + cglib-nodep-2.2.2.jar, + commons-codec-20041127.091804.jar, + concurrent-1.3.4.jar, + dbunit-2.4.9.jar, dom4j-1.6.1.jar, - dozer-5.3.0-sources.jar, + doxia-core-1.3.jar, + doxia-logging-api-1.3.jar, + doxia-module-apt-1.3.jar, + doxia-module-xhtml-1.3.jar, + doxia-sink-api-1.3.jar, dozer-5.3.0.jar, - ehcache-1.2.3.jar, - ejb3-persistence.jar, - ezmorph-1.0.4.jar, - fop.jar, + easymockclassextension-2.3.jar, + ehcache-core-2.4.3.jar, + ezmorph-1.0.6.jar, + fop-1.1.jar, google-api-translate-java-0.92.jar, - hibernate-annotations-3.4.0-SNAPSHOT.jar, - hibernate-commons-annotations-3.4.0-SNAPSHOT.jar, - hibernate-core-3.4.0-SNAPSHOT.jar, - hibernate-envers-3.4.0-SNAPSHOT.jar, - hibernate-search-3.1.0.GA.jar, - hibernate-tools-3.2.0.ga.jar, - hibernate-validator-4.0.0.CR1.jar, - hsqldb.jar, - httpclient-4.0.1.jar, - httpcore-4.0.1.jar, - javassist.jar, - jaxb-api-2.1.6.jar, - jaxb-impl-2.1.6.jar, - jaxen-1.1.2.jar, - jdbc-1.2.jar, - jdbc2_0-stdext.jar, - jdom.jar, - joda-time-1.5.jar, - joda-time-hibernate-1.0.jar, - json-lib-2.2.3-jdk15.jar, + guava-r05.jar, + hamcrest-core-1.3.jar, + hibernate-c3p0-4.1.10.Final.jar, + hibernate-cglib-repack-2.1_3.jar, + hibernate-commons-annotations-4.0.1.Final.jar, + hibernate-core-4.1.10.Final.jar, + hibernate-ehcache-4.1.10.Final.jar, + hibernate-entitymanager-4.1.10.Final.jar, + hibernate-envers-4.1.10.Final.jar, + hibernate-jpa-2.0-api-1.0.1.Final.jar, + hibernate-search-4.2.0.Final.jar, + hibernate-search-analyzers-4.2.0.Final.jar, + hibernate-search-engine-4.2.0.Final.jar, + hibernate-search-orm-4.2.0.Final.jar, + hsqldb-1.8.0.10.jar, + httpclient-4.2.3.jar, + httpcore-4.2.4.jar, + icu4j-2.6.1.jar, + identificationKeyAPI-1.0-SNAPSHOT-sources.jar, + identificationKeyAPI-1.0-SNAPSHOT.jar, + jakarta-regexp-1.4.jar, + jaxb-api-2.2.7.jar, + jaxb-impl-2.2-EA.jar, + jaxb-xjc-2.2-EA.jar, + jaxb1-impl-2.2-EA.jar, + jaxen-1.1.4.jar, + jboss-transaction-api_1.1_spec-1.0.0.Final.jar, + jdbc4-2.0.jar, + jdom-1.1.3.jar, + json-lib-2.4-jdk15.jar, jsr250-api-1.0.jar, - jta.jar, - jtds-1.2.2.jar, - junit-4.4.jar, - junit-4.8.1-sources.jar, - junit-4.8.1.jar, - log4j-1.2.14.jar, + jtds-1.3.0.jar, + junit-4.11.jar, + junit-benchmarks-0.5.0.jar, lsid-client-1.1.2.jar, lsid-server-1.1.2.jar, - lucene-core-2.4.0.jar, - lucene-spellchecker-2.4.0.jar, - mail-1.4.jar, - msbase-2000.3.jar, - mssqlserver-2000.3.jar, - msutil-2000.3.jar, - mysql-connector-java-5.0.5.jar, + lucene-analyzers-3.6.2.jar, + lucene-core-3.6.2.jar, + lucene-facet-3.6.2.jar, + lucene-grouping-3.6.2.jar, + lucene-highlighter-3.6.2.jar, + lucene-kuromoji-3.6.2.jar, + lucene-memory-3.6.2.jar, + lucene-misc-3.6.2.jar, + lucene-phonetic-3.6.2.jar, + lucene-queries-3.6.2.jar, + lucene-smartcn-3.6.2.jar, + lucene-spatial-3.6.2.jar, + lucene-spellchecker-3.6.2.jar, + lucene-stempel-3.6.2.jar, + mchange-commons-java-0.2.3.3.jar, odfdom-0.8.jar, - opencsv-1.8.jar, - org.springframework.aop-3.0.4.RELEASE-sources.jar, - org.springframework.asm-3.0.4.RELEASE-sources.jar, - org.springframework.aspects-3.0.4.RELEASE-sources.jar, - org.springframework.beans-3.0.4.RELEASE-sources.jar, - org.springframework.context-3.0.4.RELEASE-sources.jar, - org.springframework.context.support-3.0.4.RELEASE-sources.jar, - org.springframework.core-3.0.4.RELEASE-sources.jar, - org.springframework.expression-3.0.4.RELEASE-sources.jar, - org.springframework.jdbc-3.0.4.RELEASE-sources.jar, - org.springframework.orm-3.0.4.RELEASE-sources.jar, - org.springframework.oxm-3.0.4.RELEASE-sources.jar, - org.springframework.transaction-3.0.4.RELEASE-sources.jar, - org.springframework.web-3.0.4.RELEASE-sources.jar, - org.springframework.web.servlet-3.0.4.RELEASE-sources.jar, - poi-3.1-FINAL.jar, - postgresql-8.2-504.jdbc4.jar, - saxon9he.jar, - serializer-2.7.0.jar, + odfdom-java-0.8.7.jar, + ognl-2.6.9.jar, + opencsv-2.3.jar, + p6spy-1.3.jar, + paranamer-2.3.jar, + plexus-classworlds-1.2-alpha-9.jar, + plexus-container-default-1.0-alpha-30.jar, + plexus-utils-2.0.5.jar, + poi-3.9.jar, + postgresql-9.1-901.jdbc4.jar, servlet-api-2.5.jar, + solr-analysis-extras-3.6.2.jar, + solr-core-3.6.2.jar, + solr-solrj-3.6.2.jar, + spring-aop-3.2.2.RELEASE.jar, + spring-beans-3.2.2.RELEASE.jar, + spring-context-3.2.2.RELEASE.jar, + spring-context-support-3.2.2.RELEASE.jar, + spring-core-3.2.2.RELEASE.jar, + spring-expression-3.2.2.RELEASE.jar, spring-modules-cache-0.7.jar, - spring-modules-lucene-0.8a.jar, - wsdl4j-1.6.1.jar, - xalan-2.7.0.jar, - xercesImpl-2.7.1.jar, - xercesImpl.jar, - xml-apis-1.3.04.jar, + stax-1.2.0.jar, + stax-api-1.0.1.jar, + unitils-core-3.3.jar, + unitils-database-3.3.jar, + unitils-dbmaintainer-3.3.jar, + unitils-dbunit-3.3.jar, + unitils-easymock-3.3.jar, + unitils-inject-3.3.jar, + unitils-mock-3.3.jar, + unitils-orm-3.3.jar, + unitils-spring-3.3.jar, + usertype.jodatime-2.0.1.jar, + usertype.spi-2.0.1.jar, + validation-api-1.0.0.GA.jar, + wsdl4j-1.6.2.jar, + xalan-2.6.0.jar, + xercesImpl-2.11.0.jar, + xml-apis-1.0.b2.jar, xml-apis-ext-1.3.04.jar, - xml-apis.jar, xml-resolver-1.2.jar, - xmlgraphics-commons-1.3.1.jar, + xmlParserAPIs-2.6.2.jar, + xmlgraphics-commons-1.5.jar, + xmlpull-1.1.3.1.jar, + xmlunit-1.4.jar, xom-1.0.jar, - xsltc.jar, - xstream-1.3.1.jar, - yjp-controller-api-redist-8.0.1.jar, - ant-antlr.jar, - ant-apache-bcel.jar, - ant-apache-bsf.jar, - ant-apache-log4j.jar, - ant-apache-oro.jar, - ant-apache-regexp.jar, - ant-apache-resolver.jar, - ant-commons-logging.jar, - ant-commons-net.jar, - ant-jai.jar, - ant-javamail.jar, - ant-jdepend.jar, - ant-jmf.jar, - ant-jsch.jar, - ant-junit.jar, - ant-launcher.jar, - ant-netrexx.jar, - ant-nodeps.jar, - ant-starteam.jar, - ant-stylebook.jar, - ant-swing.jar, - ant-trax.jar, - ant-weblogic.jar, - ant.jar, - runtime_registry_compatibility.jar, - jdi.jar, - jdimodel.jar, - pdebuild.jar, - compatibility.jar, - junit.jar + xpp3-1.1.4c.jar, + xpp3_min-1.1.4c.jar, + xstream-1.4.4.jar, + yjp-controller-api-redist-9.0.8.jar -- 2.34.1