From 098b2cfe1340fe10a85ce96207f41ab319eefe56 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 12 Nov 2017 13:53:12 +0100 Subject: [PATCH] Don't cherry-pick: - remove depdendency to jcore-logger-lib as this cannot be done from an entity (remember *-core is the data model AKA entity) - added new dependency jcustomer-core as bonus cards are coming MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- lib/jcore-logger-lib.jar | Bin 2537 -> 0 bytes lib/jcustomer-core.jar | Bin 0 -> 24363 bytes nbproject/project.properties | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 lib/jcore-logger-lib.jar create mode 100644 lib/jcustomer-core.jar diff --git a/lib/jcore-logger-lib.jar b/lib/jcore-logger-lib.jar deleted file mode 100644 index f6e2712e830737b6a72d36a2ae92cfba525c8916..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2537 zcmbtVO>f&q5FOgGWzlAAw+hfAXsh&)Pe_cKLz4zQD2{{*mTXmK93(jeD|Ri@ph;sz zrFL)m6a582e?!qj&xLQjwm^ZR=K=+K5Bi3rBvO?b8(CmK`DTVY`(~!IIiJ&smWUqz zxV}k=R-hcU>sGDY+-jI_PKi2Ws0HW``G5Wj0OwvrA4A)+%fc;mpG{%3433baE6cfEB6h3LrD?HZ^{o(7=N#F=SB5ywR~^LW3O5* zf5v0!#YPMic3U81he*HY+u5SxBLrLZQN@m{Y_SSEI{-F_Z|NO$bT7JJ`yJ9dn zee=`LkiJWo^YmVx-p^A}BYnpoDqA)jS8BAx*aPuWX!K!s=mpN9+;s*{&y_XL^Mml! z2O53QV$8AWcn8uB%&&*Sb@m*o9%xhwKbbC`(-dPFvnvA$b-oA4!b{-}VeHylpdH_J z>=Ov&yN|c5X1lJ@N3%sNq53ia^3&Ph>#jV6dF$jz0uCpus!ZH5Ez?|!C=*2p2 zoARJ%hTZ|CzI-S5&ZJH;q>kg8J5o7_ukYAJi%Gs1InWhcp>PIcFz30lU@pYx1!fZV zdc4=;{c^ltj`u6^ekI-;@!sG)7&YxY&fJ9rPziT{?%T-j_ zCZe-y8w+rI{pvQxv1p>wC5^L&5FQU4Ls4VnzhW6xp|s5rhG(urQDcdJu}r;ZmNBkN zQDf1Mk)Tte>CBO(=;}yM=&~o-ibhrI>??8IiW>jd_vcYJs$yp=q^NQ#Ff>Xs~tA}NUy4~d5)+D>E$d?I0k01be) z73Xq}I&E6lX`JS8?l?}|x;f;SQli>&dc-+8out#I$24uGola-kw9`qa`J>Gw{e8Rd zSUf&}ghEZ4w&VbKZ{O~>-+ue;x8L>l>=}O`LKG(Q&&AJ>@>fX#8t5JEYU>+3(eaaS z5}mcH`cQT2YjdyUQJp`v_}Enkx(54B^p1?S51bf?r;}HVT)yqRk4UMI?K`R? zU1_DHYbKtUGGZvh!vpOHsw3T5Bc3-V+Kyl4`up2=T-v#NXWRZ+{=U3(Pg^H{$C`$+ z@kGjqb!W0OnQS}{@Xghc>WG8o546UD0R@0%COg?tyhgQIWBSp=R6IRtl&IS1uKGY? zHkZ##8`(rATdLuv(hZG=jdVU&qT}t0YHuN<0OCnQTl;S(u9zJ5U<*fJB4PuIPfQpS z3OF})JIe!?kdv$coO@+&0e-v612{V~0j^QtU3bB|YXNwVCX5;8qEf`)SQ^H3X2M7* zD7Z=9vY6&J#f$Ul0#hf^u;JwL@%-%1Fsj*nGNm@>QT_0#p3feI(BRKt=}~zzQrE0*Q;)E1)lFm*)8M?0!$C+!MTXM}dso)GN~ z)4mYxkI(@+7=aKI&ku#^aG37qsz<_fw2F>VSD226sk@TusV79eAv&Saiky*6##5$f z8td!PNIR`jbvIZbA5Z7c$5XRL1qH{duK(Rf=I}tQ01I13TcsQ9( z=8tH!ujzIGG@sWf&<#G*XnB7!Z4Ay%UpBI%@yjWcMEf%dj3|zA;od9^g`Y-S7pi7V&*ZP_G)iMdD`O2{g7X&85S`cQ z0@J6%8@O4&Jt5mUtg^D$R-@svK@DAoka(CEQxOi-XjciK zMc7*-e-p3cx~6_-%183qWP0)tmsevQSrVfUj1k2maw_&`P)(y{g(VtQrtm-rEdd{* zY?Y{zHy+J*3>djwe9}0P$xg@f5JFeXivu1g+^cjZ8S#+Xzlo?uH42)N2{o!MK-I1q zRjQi2qS21|vO%&>uEQjpyzMYsV9>2DVwbG1kX^H4#O(MWfMGJ3;nlYLUdJ4*Y7UTha0*s`~;id;-;=C>#`B=(2*@g+{C! z`>3^0ar)6$K6+#~0P*J{D!5ok)!Mz~$$~<_rL)~75Jm3bmU!2~Sn=w=Lqc!f zR)v)>giSKjF(TBeh!{2DgfAG z{9r{5OM*9~AT}F~9Wl78#D;`{iEHQsvhEA@9w{;et8#U zEPpPb!je<1gqXd947j=URJKbgdnb5g>4hx2SRQ}%Prm-I5W@T!D{q=i7mHAZ$Ar7Z zHr{*U`M8&`?P3FdYl!X&(>6BXo2qz+57YJtv<=g+57CYYoAqqKH&udaa1H%)$R^OxVs)*L1aph5c0p##+l?>mp#%4XgviLbNeNn-;zO)3P7F_T*!?{-?Uu z%b^jr>u|#KNZhvaQs6q@wup(5Ds0B88DrOUT+U-GYfohCkz{@fK68#Y#2(v;DtSCb zv=hGZiP&Si-qao&h+n;I#Nb<;gjYMCi6Iz~!j|nYLz6YQ=GalseRH$U&Kw;wj~zog zD~meB^7aM%z~#_bqm?{h87i>3^EMs1W%xiB<<-5zE?aMpGd2OZtRSk{A6hB)z$)DN zV1TlzxD2KzCJQC^VK-p&b4yE93%(3jsDJy&cmVE9zeXeD6}W(l2QJ2n>lBoRDI1}z z_Y-DvGhBPTpGu>23rteZ8vrzOkK&z`dtF_)pVWM>Z(uo$75?<1LaF^^J|7Hb@+UI0 z>7rt2Pgn?>2(a5CY?ZKSt29wF-?xNldx%;WEsVbP*I)mOzkKekKR;pARnml51c8=B z2CY=%3L;{`fsKf@{5h(zLJ2dNF^#5qt&}>WQ`yWT>{Jvnl8QupHiyt)oo5YnrN$4} zTcT|~H%QsH%Bmn_UmDWu3NwwjZr`TEOWvVlMeM+Wv0Jhbgy2*gZ!P{X*3I}IWI-CD zojUEJPKF34_0gY^!HdbapNnWIK*pXyOb;S6W=yJR(5OY_1~Zi8Ior+WA;DN~NeRY| zGj^J>EMcb@%PvcoKW$2|C?ptyBSM1RAP(qAdBturOJ3DLUa^Fd^2)LRpf{Tq0K?@N z63a9NZbfOh>`~iY1a1TLAeOi*pubDFEOFU)-p~>aR@f4^6;U3DS%2$w3cK+>0-TNt z_%Yeiv|IoK{|uk6INHU2`3<=9QOuFJoZRuF$DeuP#AEV*cFb@l z95mx}!sr;y#?!eZ5(Xf0>k_8g*Of>>^yHCXfutR%J*C9Ci~2}g;Y1&c`UQ~C#TpM3 zj>mJ!1WWvk$bE{ZnAyM=>pklBLiaO}X=hBJK?R&2vz(eyq~hq+83WaVBcsE8gUAhO z@Tk|FNzG2DQ7e#+PXpF+iw2kENPrfnXt2yz9@_Eab~kBCMuX9f*Pu=#PsGM!rHw#B z!n(wH8I{5(Be4k1rjrlN8cZe4d+E*=^rz?JS;)CwFh%|<6wJlpI|i!Xo>~ zPI_47F_QkwWuV_^K~g)ogozNqmRV1&qzY$UNb5_PW7El@PN?)CVi<~oIVo->rI#Cx(o22*Y_RqjN@QlPcBN83OX^+Nnw#6U&V$B7 zv+)!pdx0%x<=NbWY0HS@uR^9WpF{3u@>523eg@u4SQJz7+>}fW#Ekbrta1VL30$sL z5^xIk1tbQ}Ps1rO$t7nA{p6g~C09RZmW&yAGVMh&Vs4am$_T-USCZN3GX~^Ck&L7| z1yQwn!K|1|nftQ^g<5&3(wd@$$Z+bNMmy)xt2EOKEL9>{g56FZQ#XKuF0GoD)#g-W zpo?-`R4YSZ>&^ltM51i~s*~hMQLF`}wOZb&jK?Xrq;8{UE9B(X>?HTFq@9iFqC1NLrhX!JnG>mnP zplE2gr*}AZd_0zDw;mu9v}**Bfcg<5o=r?y5RYHAsNYix;DuAY!@UYL*(i2*?4Si- zmgopH+^j2?N{{RGHhQ~G@1S?;^h@-FPVb^$*6CO1 z-8%g$m;D--JxOoW>DTGaIz7c#@8PRIpg+7V-(ZNorqhG;noe2zx<=a^pW|3MH#-Bh z3X1d)%mHB`D1OK&oD?y;M(nDQ$EYqbDktfb$UW8(xX0B6x(GdM45BWb%uN{+I=zk) zp%2`)xdtu5!BXxx*j0FWq_8e{O{;mJq7a-?Biaa&A={wlHq~@D_bz2qHcOhZ+ZD)L ztGo~PJf{ufG3@#V_6EaBMV=tOn?;r%N2OZDJtiI3ocXr}_AUppcHG0+1i0ul_$>jX zFZyU-j`q_5e&AycF*m9Rk8W(qUL+R55EDg&U@iKep)VB&;ZqTX^nRQm91mjUk)}REVu}T6j z0Jfia$_|34M9+fIpGGj?IZWASQ1V$glb(mWn?+F`Dh04t0@=?>OZFX5It1GKDjLA%%RSh^U=B@ba=&{ z#wmN!(3c!?6N7mf-m_QW-?|0w-B%Stx0qOw@ydfgMhe%ivp}=^rVG1Z^4x=?y}7Y4jMq z(S)@dL*Nw^xk-)V(Y4oU-7R~N5}R);*hEZN8nUt9Y-8gGKBXZ1nSzZ4ffwytgt*Xn zyEI{`WC^&*@>dEX6*eN+W^F{|3KL{8{i{q=NtV9_S-!6zqLM{QXpMJk4@B0x5%~vC zM6kcHYG(0avl&wcFt5yd@>Wd&EH(3qal7&d&8s0R24QmYwHr5K%u&FuN zsB72@!UhE!3j!~#r_D9|K2Jv3>?X@r1rcWr|E4#iYP_HK0+VO(Z}rDkMr#(oDc9 zd*!zBTs;irg&^QO=6wvNHpAJ($(;BVZ|mWgO>Q>TOrzV8 zzI^UOZ040N1X?-R3e&b6>08Qu?2^cXd;rPb2;MwIrZ;i|4@59%yyag{hxo~1{<=F% ztHa_ge}1X!7#DSgslj^NKR`WUY7A3vm`?DslOZ}4BDlk=#s<5G22b=25A^mdX^gc} z0UPWe>ORBpBh&KjTj7uP3>8Ik`Ku|zbhCuEobT!%>mAXk?_PJ@ z^AdtB8dVC3{)Vn-bf4-BvRvv*H!$x*4`f8y4uKu?z@bm^NSSEOFX3&-JVBvyBsrNz zgguL3Y=MKTWMkf$%uJV3@d&OqqA)@Da3Wgw(u8XFwFgn;wt*vO@V6>SGt+hh-Iv+0D439*}0B$eX*Z)Cq0gQhIwHI}d0 zf~7!eU?A&@0kPJ9y&HmzDC=;np!qV#=gRYnh?OXCO$ThU1YYn5>lG?&rppwbd6mPZ zZ&u+Ld)XCshDokh+nLq+n$I8G33Z!u{GjtdBQISO#BPXA@`%^dj?US8=@5r z;@x?6n^a<3;TH?Asfb_vP~;kEbL4xKgoA~*8q2}LS*KgE<;eQGVFd^mNHoxbT+&y` z^gO8bd2^BunFzKhe%FCL!!7vc9`A#l0mFczE!*Ki39>ga)Uqb$i%IVEa5Owmj*`io#yu5n5yPiz^;w!1g<9oCav(tU5|U(#UeqJt+WN{v!z(#(-zz zu)FbDkH%p*soBBJV|@rC;J<;J6u@}{{%9o1hYY;P2NR%RSs=PRx_Jc6Njhp8vRUU{6| z5&`?13LgDF`odoXF8I?CaON2<@8_=p{(?TSmWG1IcwWqEXCriuh9mI5k4E5aKOX_# zTnO>0Lk;{p4(=cB8tfSwxHLF6a2zt{Wba__aM$S2FcdSnx`e?p98XVVrg&U#~ z2leb3WrD_1f}*j^6;9>FA#gZj4sWsK_`O5C&ybr!)GpSvCx)}DlGC%(%^nf65Z%M^ z$NNI`I-Oommvls+?nkzWAW$raIRbQ%DO?PErwu+tafWpn{Ns$FV7?f7B1G8K47y@w z5hKQ-BhZo5;dXyeoT8&6pfDYxv<_GN3|#LFG#jFv&Yo}vu@?z?qKBN3n9U+v4W~HZ z!jOy&L08@ywt|8p_}_7F6e@;2d%N6SK6!Ruq$j4j?`~pB6 z3Zb%P55#!^R%AI{oS*kJ^MZ-b%ou#%=CQe|BQKasz+c93%3>^O98+? zlX(Q_H1+f}!|;&Ssv@E=327V$1cJ-4K$0jHtp&TTaC&UuTbK*t;=IO=L}q%L&&uN| z?(C3N#G*qNDdS51Y#hTc$mch~^m&Z%5VVE0kiBeh%G_kwq7d26Nj&>tHe)-Xry9ba zq{f@1jYoaRv-Xes8*Wg*eC6a;W6*jSk`EhiP}q8SlPbp>u2W>Np)oL#dZL!9CT~!6 z#Ml?`?+w-k-&r5PsXg^=XtE43zO{3-;=((E+Gl?Hj}7l^4BU^$Nn>BItv>j!_sSX< z+7JNb-C7=@vkUqN!C0-pE6M8+PTPcF-$6Qt0CG11WhdxXvHCul~wEZi-XW3Y!+5>{$vB)7b%Zp)?@#l$cWRm~sxh_b&>bWi1sD%YBsQ zP7AJ>+wYeLSR6@L0Ny=&odw`Kz?B7aQAp5Yr{$=G@jBhqAtNP8>(pUjuhUK) z_}^XtzVlj`inE(28w-e13wd3FDALkb!MUf9PeYY|%(Q&y(}LhUS;LKHA!|HS7F^RI zp`z^uUr2?2Dh*z$uPQjEg8TGTiw@5|-VCu(f(mX^}4azB?|!e8+J~YK^%`*g7z-|sTmQrMm~R{y<+7~ zXU`ugtFwa0xjH14EAE(()62G=a(XG{5}rRk?%C~ca(eDXaH<3`rEs>0C#)B%hYI0T PYlH$l2Ho=2QHJ^7zTrp4 literal 0 HcmV?d00001 diff --git a/nbproject/project.properties b/nbproject/project.properties index f780d2b..e6da131 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -32,9 +32,9 @@ endorsed.classpath= excludes= file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar file.reference.jcontacts-core.jar=lib/jcontacts-core.jar -file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jcountry-core.jar=lib/jcountry-core.jar +file.reference.jcustomer-core.jar=lib/jcustomer-core.jar file.reference.jphone-core.jar=lib/jphone-core.jar file.reference.jproduct-core.jar=lib/jproduct-core.jar file.reference.juser-core.jar=lib/juser-core.jar @@ -44,12 +44,12 @@ jar.compress=false jar.index=${jnlp.enabled} javac.classpath=\ ${file.reference.jcoreee.jar}:\ - ${file.reference.jcore-logger-lib.jar}:\ ${file.reference.jcountry-core.jar}:\ ${file.reference.jphone-core.jar}:\ ${file.reference.juser-core.jar}:\ ${file.reference.jcontacts-core.jar}:\ ${file.reference.jcontacts-business-core.jar}:\ + ${file.reference.jcustomer-core.jar}:\ ${file.reference.jproduct-core.jar}:\ ${libs.jpa20-persistence.classpath}:\ ${libs.javaee-api-7.0.classpath} @@ -111,9 +111,9 @@ run.test.classpath=\ source.encoding=UTF-8 source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/ source.reference.jcontacts-core.jar=../jcontacts-core/src/ -source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/ source.reference.jcoreee.jar=../jcoreee/src/ source.reference.jcountry-core.jar=../jcountry-core/src/ +source.reference.jcustomer-core.jar=../jcustomer-core/src/ source.reference.jphone-core.jar=../jphone-core/src/ source.reference.jproduct-core.jar=../jproduct-core/src/ source.reference.juser-core.jar=../juser-core/src/ -- 2.39.5