From 149085483ad00472f18d0e4f4660576c4def0bbd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 15 Apr 2017 21:12:13 +0200 Subject: [PATCH] Continued: - pizzaservice-core/mailer are now referenced as projects as they are application-specific projects and not libraries (like e.g. juser-core is) - added new dependency jproduct-core - updated jar(s) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- lib/jproduct-core.jar | Bin 0 -> 22741 bytes lib/jshop-core.jar | Bin 47889 -> 47875 bytes lib/jshop-ee-lib.jar | Bin 6340 -> 6329 bytes lib/pizzaservice-core.jar | Bin 25593 -> 0 bytes lib/pizzaservice-mailer.jar | Bin 9926 -> 0 bytes nbproject/build-impl.xml | 12 ++++++++---- nbproject/genfiles.properties | 4 ++-- nbproject/project.properties | 9 ++++++--- nbproject/project.xml | 14 ++++++++++++-- .../basket/PizzaBasketWebSessionBean.java | 2 +- .../PizzaBasketWebSessionController.java | 2 +- .../PizzaAdminCategoryWebRequestBean.java | 14 +++++++------- ...izzaAdminCategoryWebRequestController.java | 2 +- .../PizzaCategoryWebApplicationBean.java | 4 ++-- ...PizzaCategoryWebApplicationController.java | 4 ++-- .../PizzaAdminProductWebRequestBean.java | 16 ++++++++-------- ...PizzaAdminProductWebRequestController.java | 4 ++-- .../PizzaProductWebApplicationBean.java | 4 ++-- .../PizzaProductWebApplicationController.java | 5 +++-- .../category/PizzaCategoryConverter.java | 4 ++-- 20 files changed, 59 insertions(+), 41 deletions(-) create mode 100644 lib/jproduct-core.jar delete mode 100644 lib/pizzaservice-core.jar delete mode 100644 lib/pizzaservice-mailer.jar diff --git a/lib/jproduct-core.jar b/lib/jproduct-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..3c8ae0768c4fa2ec6ccd58b0655001fed291653a GIT binary patch literal 22741 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 delta 531 zcmdmKc*Kx5z?+$ci-CcIf#EH4??he=<~Pi}8!fV!K=kINOr1=EK!z8y(QIxbCI$u& z_L^M4q%b+2HJmv~!)NkDHnqv~IXEXjXBC({pG^YH7H50K=nRw*pDe+y$7lm)#j>aK zf=rt4p8dX;k%6Ii@e~)UZ$H=6*i8nOkBqCy(xAH+FuY9Oqq;nS6m~I;#1b7x3~kf<3;8Pl_4LI4{V~$P5gb$v1^8zycz|9pJE;JYO^i zVje7LCQFEAE1-B0Xp1WY0xW6V$3D4`Ngfz>oWOA6m~6!K|-v9sr diff --git a/lib/pizzaservice-core.jar b/lib/pizzaservice-core.jar deleted file mode 100644 index 5fd2b25323c4221d036f95df34d14db7a0184b51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25593 zcmcJ234j#U(SKF%G0kjq?ZU#!;ixFEC#S-4$O4Nluz>8Mf(Op-4$I&$v(C(Nh<8jh zF^MrTiD2S=Ycv`KRuZphOw4WaB^piQ@oDnq_>vgSp+^6|dat{uyLV=H`I0|M&+FIq z>eZ{NS5@!5>So=lqT(=-N%T(9r&f~Z&oC;c*5>x6x|TI78a{ZAXq^lCHbCdx{_2u6 zz~%24{B=QFo7S|fXl`q-Z(Y$EO~$vxGTFLQW9dvhm28a6te-JF+?4dxH1$L~x5gr< z!^8RYCkziSOUI(wSXbTB-2y+ae#YkcGwbH{;?gm5PTg#|My9PzM>`X-$g)(rCzXz7 zfqeS#@bGYs#^7*@L1QZ2-B1`}xDBy=SLfDfvO6{a=%gTMPyGDzqtTv3yi?IKK-1#} zYuXjfMmwUJfx4eu0LM`JpE79M?WwLND8;uFh>SB7|8m<+Bod3+gH@ev`O zVDiKePZ~xK@Z>To7d^8^;H&e>U;$x+BT!^QJcv^_3hpB?A!>Fn;xi-Xg zVH(HvVQ%0VVV=pe%6K-<3GrN$j}OyCKB0`x=6Q0NFPBD>7YM|{5HBjDDZJR^6GOZt zOjEg1?wdlqw2Z2yewqB@et8+y%YC!_HkrJ_nGWP}D1^ zc1UTbly*sJx0KG8%O1I0VDg0~Uu5#dCSM{Wywv2&WaJ+)`Erv#Dopv9$yb) z{3ZT!8Q;J+3h+%*x>+u_$mLeK+$J)=y^QbRJB8l6LVS0aKFjx*e6Pv(nf#S7-_H-2 z{8f`5H2EQuzh?5oCO=~Gev=QFd@#&?{HV!?O#Zsb-!SyOuUk5__9l9PRRJnRvbVqbo!?x|21~jni7ch<79?N8+-LZA)R9A0jEX_2*1KR3; z2>6oodSksYrqLd#Q=|&dLK%Ro?kYS_+jJ$KS4_d|i=~C4%<_09+L4HLVGx^`N*BhH z@$6!zqG{7lWh!02?8TDqo%I1Ph{I1n%w15C)o!?aJmxnT&3a zC%a{!QjeZT=XkLq+L=wIcQYOBp;3(>#}^w04H=z|Re%i%*!YI#U7fKW833LYXSc>P zOp8{Fn{b^#(6SF~k$`4+TQ=HxZfmqh4F@6*@pqUanOL?dk&q#P;B{M5$yjqTn~uja zw!34hnda|#8wM%BnFhO{7=Vfe!c)a1+%OHf8Pf<1x+^CIrlo-{dxWqCbxkTkWrR;% z2?(xXIkZ*8wAzOQBObOTx=V|dY2M%n0qx>i;j{!AYkR6Ap0E{!Y4PBgbORSztEc?} z7+%;|m{rW2?pPL~2xbM;^Xox&g`BrvH1*p

IS;R|S4!?(Q*8_9zzdeNE z4JOgSX&em05QaGz3Z{F8FqHhdH247Ww;KZ4`5R(p<#cQVY$DV8Aoabd?o6d)4LZJ( z+Xew$5bU)eAWW1z>p$ZMXi;YChx7#R4!47dtUG4gAql4PkXqRA1UOp|5XQbM2IB=y zwYvg~Y*OqBL=a5Jda23i3GCPx*EYZ?mu*S)CcE@=CR5$vxy%Q7;530P>Wn24YDxo4 zbWE%r{1D`ZhnZNit9g4go?z;o=5YgUu*Avk1qEt$HAs_&rmn6ueBXiq4+=8BKQ?8z zZ3oR%r2w=KU)!+_uHAOeu!Tkp%yI8PQ+yvAN3O z@eK4kcW*B21b~XE!fmPEbZ2Y@1i*Ae{)Lf5hZa3aPa*!(k)j<#wEzeFxXeKnVojC^ zQpGqh5If?Xu{sqH)@?y(fv_sXKd|_R{39?U7jWi}u9znF!=-diV}wNrV6f;Aecj?8 z^Ya!Rpo56&asYOa8RDN<{8Rofi@rgRS^P8pxkY{SsC1>mUwcr{a7%+GVPP!ewgS8O1&d$gUob7$GvmVgf_i61Y>g3Hix%yfd10h3vaD(K>gMG~ zLB`UFjxY7Rw)iD}ImExT_*eYv5WiyatNdDsU$^+b`3Qg7h3!W zp>l~YEZ&wUY!b|(#cn_*YP}j28kfa?e`~5l#X?$u&hWfizZ<7qiKu(#D8Wwe$Y{X8SVfu1vTw( zlK%;^f!jy$!a=DSAQb%%vC?&zKFVr_Hr(dZTiT)Viv$`G&~n@7H%9zQBs%7eTNmw_ z<(n~Myx@+OW2NS6l&hcQtFKq8*wU4IUfqwJybVP6L;M$u-{QYo{5HQ6;=ft^cm4-c ze+<4j+n(|E=uhm|UA{Rs(D*C;4RRxy?0*m(s>T20cbOXd5#X88gYkZ}3+r@i@q7F} z7SuM@R=vV#j7X#tv~`wL<{JJ>W_X3v)ypL(6pKIL4}mjh>RJ+sSa&qhlK;G>Pm4Mvt08k}qQ9i!steMe0Eu5Q+)9qX)CwYB1Sh`hWFuoiK;~S(2fO1h^eU%4#zkSiim0MYD5eXZ^SUvK@4N6^-6C5QP}?A40oB?81byr zguk`kMVW}IR)xs+vP|4!tr(X@duCr)YcItX?V02Al@%V8&cwu`$udS5BeAXvJjEI? zi_Ot7-hQ1{aInE@2i!|l4t$c(W*c@#TXM71GDh*Qfzt(&g=emDWxsmWnPrSN$`J#* zPn$YBv82z6&FIbKnooBD@=QnVBjQPAt}Ua&7z2}0sKH5y2Xj8FUtl}%%C=b^J1bgy zbsRFrT1KTY4l7p67;jWz@oE`I7!xdGqA|%bCL2duMg#%7agJSYYp5G)8PKTP!xB;2One+iTT=HW+jbSG5j@ zLq@G-)EO{|(`@UiBrLPWZjD7wG>w28#x!oRS&lshEVQ~~X_28iJccMR zCciYa@DmEKp#zXO#gv0)T%~P800mfO0`W3QCV^hqEYcfzsuBQd^U_lV#-K@C99!)6 z2KyLaJNrZd{8B;|5jsO%kxFlm;@q|r8(FF_-#cKt;Tin}>XosJe$l@*aycVOb+;pz z3R}rz^N=B1*5idYdZq1mqfE>DvHtM41;N~kTo10Rgnu3ia+tLKyLCWWnM3J~I}q&+ z1*>*0E@CeRQ5NuQd90%sW?zn$m6K|bjeMU5h+hEk7&r_CA;6wiqM*`VF$5+_m>`QqmrZ^o!85=-j2aAsFl(eH(4+I2A<&jzCJxEYFr8Z6#b zdV{Y$^g#@SEhoJY#|BwHoc;8vTdmm}bPHe^!iKDWh8E|||HLH6bw zhBUB)m44^cm>oU6@Z$5lnr!Ri5LMZNc-F@{<2`XKEM1r2k2IA_kWfQtQ2~$0#v!7f0{v7w76kqsGfA1nw>5{3B@qEx(DocW_sP-_6wrh!2sm@c3>qY?w) zrLEO9lYyQjC_+R`y6+9zqsUYZMj9?KX< zt!j8&v9F=(Szr&*R7hr8A5Ax??n$af!@54grlHfYHh;r9w_%+@RmD$I{a!ku3PNj; zrgf^%8Tp%56}xR`8l)g+<$(lWL?5*S_c( zl?#W;%0>BEspf)a<>CQZ3BUj=PYkef%Hgx}7hvTt!OCBQm9Jpv>tZWT>oc%Fjw=9fqQn01U8l zX@Hg0hs{bZ!TS*=P3JJp<}#Yc!)Ym|_bMJm8+Z(z&*SI5I~5>s_C>WIGyqt_2t4wnDJ&Yjhb&Oa#j23 zr0}(0qDhD7-7 zI^AI(ol*o-vA*>oYTHL+;7Hc*6N1|}mTx#fr)u+aT5!lYdsdsXAS+-fi5uX-X2A{3 zfhC&@S)Bk`&7*bPNZWV;Wq1)?$cyPJUP7PeCc2B4(X)IKz051=uiVNNyiUn3q8aX3 z6dp@&(r+M+m*Jm(i;|%vHiAM8@TOdq&D^Pn=!}i!XZFLV1fw~8mT+x;4ZJ>h3}iNs&(=Ji0v?~ePlOL1Z+3+Q zINjRj`8mNJVAXAyK7tzu>IlOgSMQ~&+G>5Lulp(5M;!_RF@=f@Gz9Jdf$M(i?4vFP zfjC1sat(nyK;XKcVtus58!U9=2G6$I?mOO(JfU8NHXfB&FRyy?nV@ttR3ZwM=zvOe zK_y~PiEhgBxln~9rtEq2bI#K1yo3J9=W_{Pz!Ufqp30Z;BK{cObNV=+!k^^x_-c=O zWL)*gz?zCLzY5CnN0hXBj1u*LZY&DX|Gq~njyeho@+T)$GyVVtDFt;eDh1gV9MAt> z1<_oVcn{)`cn`8{EQV$vrphXU&efU`aP*>BwNNZwZ7WuNV~Lu*$5oX8!9JR-R4bto zRF$Zh!qKg&65VwlZHN5jA*3w9T=ibkhB;}sLty7M=F)RjF}jwB4-f3Vs~bxcO3>d& zDH|n}uTJTm9!ihKh#=GJXa!*%@abwB-4yRorZ_`6FEdX}e#jwBlVx z>0vIE+(CE&m-m9nUjhj?Kn-t%8r}>wyaj4_8`SVF+QWC#Wqc2Pg1OdXJX!JMwJ7&l?5nf*e z%^xNUJ;ki7sRCAnsl}d^#l}!oi94fni^PX%0;oe;Zu7(9M ztIVp>KKcyms!UXm+E3TqNh2H0L-g5=RptTuoObBf+7pDK$Zzm(vC`6OuE(&-BK{Li zc9Jk+xH8RPYF6ERQ!Td8#pk-(p3%msY7(`*bUm)lP=Hm!O&{uQjno zwsZOg5O-3zhLw|1c&>MQhvD}2j$7S33c!QwK|0at{YwRV2b^*=x_8`xeq5aZ$L`(n z3ttX8dGrLw<)s6+nhq57(}T3sq2q>vbO2hpP)!H!KnJc)C}z_Ezo@uyV;(%dy^kbK zfcCATDaIP?(yYU`3QnPUMjI_P+G(Y6Ds>v0=py4R+G}j4M~n{Se09+;jBa|>NYML6 zipLq}@oXc@CmK8WbYnMfHZJ1JjZ67P<0E{?_!#EVmHdiv75~Qg46=`}$;DKd$Icun zw)aN}*~!D*m}(4JvqwbczDG++)#XGfL8C|TNK)R#_!Tr7vyER24T(mc6IeC;<;d z(J0mv>e(2YxR=IOg_P35hoSXt2k5NFCrK^hrzy&_q4svE9a}8brAoFM_ztPI0b3+~ zLPYW;-MN<*+BYC<*tIv<`(bzGku;`TRf)SFcDEREg}+5ica4ip-}tcIQvh43i|t-u z(?e^if^)!Tl1-bw@nO5K0Je~e?JKsv-k%3DkG|eS#~ZiO0^@dSHtwJ`#$9x}aW~@2 zd+8G60lL!oDjd^;be-`q-Dd2k`;7zisL@AH8;{bDjjz*7#uN0R@f1%mp5f`ncevH~ zF2{`@@J{1-zTWsLA25E-&loT9tH#T2U3_T#esMgJ z{9OV7-?_e>u}I_?#Og<;C$Qx^PF5dRSov( zrNez6CUoJvx9iPjSQ^d5JMqj+sjo>y6VOp;DNW8pZZk45V)$lJtP2fF)F}{NXe5R&kM~=+LHT}?La1mbK^fJfE)6wrq>k~jXO-EAe z92V=7PYg1j1mzeNpQlP-D3LrQIFD@_hPAh};=@@@t?T4#FLno#G%-rG)!AouT9NYs z7_Snxh(bA^LGeDovAI?_mDd3vGm{ks?A|>fJU)wJQ)ad-Z(h^h(!LQ{0uEtHvgOX* z>S#vJp4AJ@W1Py($f(P1PT1Aso$4Iy`dAdN+aQ_AGe9@BZCoCXtxk1-{0R;wZwH$p zGKFk}^Hk^fdZfBp=RkRC+%wgjK$Wh_d)fciM{Mkm$t?71>|t4b4D_SHECpw1hi$g} zbQJ!yOn*Vh2{}GCV<(N^l-=jYwhctlGFyk$QM&0sA_4yYg2Qw0o;L>w$Lysk^-%=B zKG_HJx!3vwALx5uk6e6E0LW&gw#8}P8@gMN^9 z;V>-F&#J>=`hea`rGPks&}jqknUa!Y6AtUSC7#~CDhAWwrkSY31$SPK^$_X>_esTu zmi}BD;RTjVUQeI$8YdrKVp+ML42|LNzM<3_^e^yeTEh)C&i_0?HXr)O%Wc>nC`+&ec1{c0%4(&ePGJwvGW+d1SVNICbMZ zaO;pby)%{WI$2GcaUT5sC$3}gS9`_a8e}iG-Ado5FUr^XVr0p)&L1D?R8yGKe34tb zge7B_9Q| zS&P2qb8PZ4v$<`}tDBd#M>-=b)~{`iblMP+rZ!ZqUBA3}ePrpzNN2tC0B_hdwJk#` zQClpU?%e8NT)Nv4*Ybf7o_2Ec`eqL{-6*ms(&*rK(3A)9i_$JU9NeJPgSVy2LN?Ah z7Pi0ZEo!6%7M($-TSybxX<;jTw}k|eOD(#LK4Rf${i7CrjIOZgO8U4(pP;KOq>7;K zQ&RV7y1=5V=^_iMBPd-XrSH&lOtTK(Uxnzq7E+47XW{Fn-$$O8O5s;Va6>ZF+k=n} z!TVZ7SZY<`W{hEuuffZ4E<|KE-bs@2fs~WzWQ$s9jfHFhluo15p-dZKYm@N|K9Xe7 zS=f}NMjx$*6)hl2%#o>m9{ie2(!>C-HRQ{08+uxs&*IyDc6tjPg~i{oSp1B|sl*X< z98Ja2c^cw<1KATb_?0Det-6QQQI@(XSk*V6JYy5GyJn#q3tk8%Jk%QfSy0^#UaRWpx z9z-iO5vyo5I)dcvWU3`vzuuPu7V%|NXd~J0|Z8O%_CG)UHb?XSJyp4B{_VR zavDb00`iMch3jYpQn@OS;3c>vPfxxatZ_?8D}$6o$U?~&#e^dC*^O*J-SZdmM4p`_ zXXK@_B^#2GDWzdj3QMU>N|uy{OKF6ZMoMXvltxPlFCFiviX5>=%PuF~2qxTwj&G*P zbPKfhRw(0b(6ig2LU$;_g~RCHCHy3u5Nrc+42zMliTovCWQBWrHPQl0itm$6(2}D2 zuxmO7X#`_#mz$a=XlyHLDzPmMS`N~pqC=E2z1js*w6M0a-{9q-@PV>enm`b}7=omIFyU&Yw<2{-=l`qUm%;b2`!} zlNdz=Q!a&Z8Po%);W(5mwce-75S=%AG#;lZV-K|lAi|K^QK5yS=1$luJHt3mILEoE z^4?Ucn+Za`p~%-7@+64(CNeRf#<}h@(2Qq2jIOmwD}wRJQZIUC@eX$HGA$U`N^m$< zB&jPJt=^>joxaB~Zvi$dN%p{+5>z1Q_`UIWkDddm!Zf0)%M4!4jwBAtVwYggGxEh;Q-{ z5(yB3?Bx=q)yb^ZHp(j+?T%Q&q&$Qi6(q#UO9;ZNe1seoBxE!QDK9{X_IWH(S{_15 zf`nA&B?Qr3K0-XMN6lfL0751fAVm9DMz*Fyh<^?r-G2^q#6yiU1DQVOp~gFh^IML8zOmKqNsxjFoW{EBi+P(CxkmRTM`yo#bj2?HKmjOleMI6E7r zX)hR#2qq5qts=5GU60sm34IB-U(O&oUj<$_0BZIbRI~(+RDs<@H)rS;_x4t~z0JM7 zU2gAKw~CE1MTP$r0#JfKqv(%K^6UOX1Nz@2$TiLPuM$WD`E%Q)5@fnfJ^x0*K%Gm3 zqW?(eKSWXD^MP7O&b9s{E&hU{FQOl)sr;J)`j0f72xsDJYA*)dFXIn{>Np3JV%lkg zp>ki69|))Xn*;ifkav9noVoL?fpAT6P$~L;J}55dUnI!MI{2?U)cG)0!H?!+UXHrp zXgZ;Kkk$R99wJR5wnK%+E^e+|!c@sP-%yrj#QvU7=kHohp(kW}db*oBB R1!Ech+l;96@^j?w{{g+7TKC;^)U`c7qCQWGCB#k6ZX;JEA_jY%h*_mZ# zwr%PYl&9eP1&SyZP(XaAR31K}i1_;8N6+yb&+({V^c+8`=b*p;otd54>27ER{NyIH zGjr$vxcC3~-T%Ei6T6qTrHN8R|6F?CE{c7YQ5%g7P38MW#)oq+zeF@qC;bOVuYBYW z*Et~PVen`9H+H4-R;(po)eB{zp$!kO z$-b>CJ?IGC6UDxPIi}y7-FWbtO?{hd_?p>tW#3!*TkGB9=mk?~gSJz(9o>WQwO#41 zbYmZ5qrqT^Y^RiKP0XX3kY1W3ts2LV>w2|n8U@*zMR?b|B5y@EOyMjd zV*QzlsMtkeE+Xj4vl9ei#u4GnEg})IM4qTrO}NlqgpQ3J(G`=%?!EA;-`%Sa@v-N> z?Bou=xB84JCfGegY}ahT)Lr+bm%sl!q`sBTQ7Nrbr%D-x&Ub}Xj4_RYT%qCKQ4X7W zP#l)t5jo$qb&DKz;C(o4AI_{%Dhq_oZCN|5PJn6bZJ2Lo^TTG{&gBYFQ(}V5-B>QQYlSkGCJun&8lRksFFs{tWL72nxb3y?4-y| z(>n50s-@^in$Go~A5GD*6wNWo@f5wA&+kdmd(-qjdVh*Oz$$J{(QRq^Abp7WZ|5%~ zO?S|pD&3W)9`45b$m6fOJLw+!a3|eM_wm<9RQgya_0q>x`UIapnW9gn=+n&enPrgs zSr-1e6y2}V11f!9r7ys(u5b+93~+Yu$PSo)mqJ~Gh&E5RylLI6iFVq4%V+-f#3L^# z)X8p}gx3&`3auQC`7&tTqEPn@HOn(9V%l&Ggmm7rY)_(_tI)*(i(YTc-5^{U(co;e z^a`T7QwCE`x(&X+*02n38$zO&^Pz1J;H1#GqlP8MYn2({OmX5Uv|`jQU?@5Ug!`be z%_|#Fn{Q0UvkwS#?sd-drL$s=2N5OOq~{WZ<}<(U)`8(4SkHjq%!;(R_3Y$YOZ4WgEnHO?rA^ z7PgVmq0)oMDV4s6#6ix;w0I~1xL-;D?(#TDu&Xk39py9hWqMelT$7ogUyECR>$^9; zSL@RT^P{6fJ9?VHs!CtU&$X zeO0B0GW0ci975tWSw|F%s)1mNsGp!G6>8{e)~!jP=RAw(zD`dmbXnA;5z`bU-OM|s zS_J}Q-RfyjnGlB9@a8h~4c6L77>3n2kRVhGjSa$*G=a2l(zgIG4U~vQ9pzr#DBq^< zARK3OSL}66mA;#y@6o(Mn;Mux@gbDB*?>XHu|3TdUWQK6(@58l*3GTq|Ll>9N~bdP zeR?uO&(M=9J)5ED=y`?S%rjClM-qXbp&!r>Rr*neeoPC9%MAU5p32Zq=>?U31^|*~ zZ%pqDy-2|2*!1k9MuvXQ?VSLXaP$CXi6hz}+tJW2W3g_Tm*^K6>ZdIk`X&7eg+`m$)Ap2+gj$5X0DhD;0ivC%shfj(>)uYnLm>bFN&G3 zRQW)0NqD1nsU(~Mp<5CGp}2Q#0|A$`LWN1{IeW zww;O&Jnld&$ct-wV;CAtJU7Lf0$5!eYpPFATN`b2mi@z2f{ssNU4|KMRg-S;q@RIl zZU|8e(*umcV+zX1e6i@DCc#M00o`PTTL8y^(l1@>T~-Zuh#^Q86$emFfG>;yMjnNh zNoO#6#DvJ)la3Kkwlc<4#|nks5UP~a6ON5p*E0lnZ)Fr(Q9H7f=SSVJ+}&IPG}s`t zJNkHDOx=)$su?|77eq%ASTNP+LU8eEq1^|G*chOhM~R}ork5bC)3ZnIqo^p5cnV$K zEKN=q>V5Z@iL@iN+h>x@r; zCEGCW6uO>vLI{|bJdG6*i_6iluGOQQQ8d>nES4_EXe>1>*Wgsp}b1_peBu zq-8%?e~Quy{VZte44SYw51YE8rg=K&ekMG3|BB@&={)9L5fPpr5TYqYxH2GI6%k$# z5MBu2e#1OO?r-zeVIXgsCvEH*>e+viE*nQH z1ie7F`xo={<_Bmlyk32Z)+p59*4=iBE?4M&I>=XVQRs)%+uz;|i>&4Ab^RTDz23i8 zmF|wvMjN=VO1JtbbxWJ|`R45IV0-ejzV420b)K^O9{cx$>o)YQU-w7fHkAKj!}LpLki>0QbQ>B=4|D1u6gMP=m{GL`p` zt=vgf89O^k1$`b8cToqpu7c)WXzQUdNZ*5f14K^{S$s7?Z%2gvo*t(gpmhoKK1@@z z7ds8p7!M*b;M@n!8_{w#W!9`%u?l||zD#>n+ON_9m2P^OwyN|FmEMW}i~o)IZ&T@J zl@9s@;CmMi-mB1|V+Pkts6gX5r_t6+AEmL5#NNekUmCc1Hxh-99uRs#DdOg^zoi!n zHkQ)|F-06QoQf!-#N4Tyrmd}(vqr(Y9@|gCsoxG8j_b+lIV2d?D~378O&ikbNkeF5 z-SdQ{xwe?Wsdse^y8wHuMczGKtBsT$H0FJ^+6=Z~7fyIa$;)cfhA{DHhi=VgeL=Ge z^H_mGl2IsY6~mLv6>UIRHSf4^EU2_JDPDG{W)%Yp>;{%tIUY}7^?KBHuokIkV}@5U z4N-KlsuwI%7?!MREGWc7?T{lN1iPhWa9-~$JiG9au+r(>Jb%u5m4$h*7s|5&q*7U> z%7sC#(w|-()bKe2ZCFBOkCnZOnb`Q<^@ojg2jYg0OOl>&M9FYHf7AFibb=ga@6^#2q5{&P>h=U+>R_~<u)I|_LABg_9~Qwu>F(~yi9cCri`!1S4gH~dha2>&18 z{x)DPW{6i6;HS;bvWoFs%+L5O1yvW%@?4hqNq!Vnig0FaOcRUD+OY}xe^3B zsz&63Yjf@CTeTt}p|tRTlu|%I&17bkBQxl5+r%>#qVACA6EVwT=I6* zVjTQxfd65RzvHrDUve>4elNrSFzY1<{sz|5elA>0)|yb1wAziYC`<0y@LL*CG~9B?M@LHMr)B>SCw_aIV!8>0BXQ6B%1QNDPRRGHi|h*WM{6*qB< z4TPk)T!afwxMQc|)4izMBJ1$E?mbS#)_o7H1UsmW<6lKS&EC8V~Pq$YN^ S^E)KS$>sDHc;&?&zWWcl#Zzqn diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 71854d05..3bc3f2f7 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -878,6 +878,9 @@ exists or setup the property manually. For example like this: COMPILATION SECTION --> + + + @@ -886,6 +889,9 @@ exists or setup the property manually. For example like this: + + + @@ -1036,13 +1042,10 @@ exists or setup the property manually. For example like this: - - - - + @@ -1455,6 +1458,7 @@ exists or setup the property manually. For example like this: CLEANUP SECTION --> + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 11ffbaaf..413d7571 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=82213886 build.xml.stylesheet.CRC32=651128d4@1.68.1.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=340aa771 -nbproject/build-impl.xml.script.CRC32=a8bfb2c9 +nbproject/build-impl.xml.data.CRC32=d8612883 +nbproject/build-impl.xml.script.CRC32=573c4f4b nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index d1557b59..e8e6c1d6 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -47,11 +47,11 @@ file.reference.jcustomer-core.jar=lib/jcustomer-core.jar file.reference.jcustomer-lib.jar=lib/jcustomer-lib.jar file.reference.jphone-core.jar=lib/jphone-core.jar file.reference.jphone-lib.jar=lib/jphone-lib.jar +file.reference.jproduct-core.jar=lib/jproduct-core.jar file.reference.jshop-core.jar=lib/jshop-core.jar file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.jar file.reference.juser-core.jar=lib/juser-core.jar file.reference.juser-lib.jar=lib/juser-lib.jar -file.reference.pizzaservice-core.jar=lib/pizzaservice-core.jar file.reference.poi-3.14-20160307.jar=lib/poi-3.14-20160307.jar file.reference.poi-ooxml-3.14-20160307.jar=lib/poi-ooxml-3.14-20160307.jar includes=** @@ -80,9 +80,10 @@ javac.classpath=\ ${file.reference.juser-lib.jar}:\ ${file.reference.jcustomer-core.jar}:\ ${file.reference.jcustomer-lib.jar}:\ + ${file.reference.jproduct-core.jar}:\ ${file.reference.jshop-core.jar}:\ ${file.reference.jshop-ee-lib.jar}:\ - ${file.reference.pizzaservice-core.jar}:\ + ${reference.pizzaservice-core.jar}:\ ${reference.pizzaservice-lib.jar}:\ ${reference.pizzaservice-mailer.jar}:\ ${file.reference.cdi-api.jar}:\ @@ -121,8 +122,10 @@ lib.dir=${web.docbase.dir}/WEB-INF/lib persistence.xml.dir=${conf.dir} platform.active=default_platform project.license=agpl30 +project.pizzaservice-core=../../NetBeansProjects/pizzaservice-core project.pizzaservice-lib=../pizzaservice-lib project.pizzaservice-mailer=../../NetBeansProjects/pizzaservice-mailer +reference.pizzaservice-core.jar=${project.pizzaservice-core}/dist/pizzaservice-core.jar reference.pizzaservice-lib.jar=${project.pizzaservice-lib}/dist/pizzaservice-lib.jar reference.pizzaservice-mailer.jar=${project.pizzaservice-mailer}/dist/pizzaservice-mailer.jar resource.dir=setup @@ -143,11 +146,11 @@ source.reference.jcustomer-core.jar=../jcustomer-core/src/ source.reference.jcustomer-lib.jar=../jcustomer-lib/src/ source.reference.jphone-core.jar=../jphone-core/src/ source.reference.jphone-lib.jar=../jphone-lib/src/ +source.reference.jproduct-core.jar=../jproduct-core/src/ source.reference.jshop-core.jar=../jshop-core/src/ source.reference.jshop-ee-lib.jar=../jshop-ee-lib/src/ source.reference.juser-core.jar=../juser-core/src/ source.reference.juser-lib.jar=../juser-lib/src/ -source.reference.pizzaservice-core.jar=../pizzaservice-core/src/ source.root=src src.dir=${source.root}/java test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml index d89ea17f..931b8042 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -42,6 +42,9 @@ ${file.reference.jcustomer-lib.jar} + + ${file.reference.jproduct-core.jar} + ${file.reference.jshop-core.jar} @@ -49,14 +52,13 @@ ${file.reference.jshop-ee-lib.jar} - ${file.reference.pizzaservice-core.jar} + ${reference.pizzaservice-core.jar} ${reference.pizzaservice-lib.jar} ${reference.pizzaservice-mailer.jar} - WEB-INF/lib ${file.reference.cdi-api.jar} @@ -86,6 +88,14 @@ ./lib/nblibraries.properties + + pizzaservice-core + jar + + jar + clean + jar + pizzaservice-lib jar diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionBean.java index d26b5171..2faa8713 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionBean.java @@ -25,13 +25,13 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; +import org.mxchange.jproduct.model.product.Product; import org.mxchange.jshopcore.exceptions.BasketItemAlreadyAddedException; import org.mxchange.jshopcore.model.basket.AddableBasketItem; import org.mxchange.jshopcore.model.basket.Basket; import org.mxchange.jshopcore.model.basket.BasketSessionBeanRemote; import org.mxchange.jshopcore.model.basket.ShopBasket; import org.mxchange.jshopcore.model.basket.items.BasketItem; -import org.mxchange.jshopcore.model.product.Product; import org.mxchange.pizzaapplication.beans.BasePizzaController; /** diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionController.java index 762ea238..473577bc 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionController.java @@ -19,8 +19,8 @@ package org.mxchange.pizzaapplication.beans.basket; import java.io.Serializable; import java.util.List; import javax.ejb.Local; +import org.mxchange.jproduct.model.product.Product; import org.mxchange.jshopcore.model.basket.AddableBasketItem; -import org.mxchange.jshopcore.model.product.Product; /** * An interface for a basket diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestBean.java index e088258f..b5100736 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestBean.java @@ -25,13 +25,13 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jshopcore.events.category.AddedCategoryEvent; -import org.mxchange.jshopcore.events.category.ShopCategoryAddedEvent; -import org.mxchange.jshopcore.exceptions.CannotAddCategoryException; -import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException; +import org.mxchange.jproduct.events.category.AddedCategoryEvent; +import org.mxchange.jproduct.events.category.CategoryAddedEvent; +import org.mxchange.jproduct.exceptions.CannotAddCategoryException; +import org.mxchange.jproduct.exceptions.CategoryTitleAlreadyUsedException; +import org.mxchange.jproduct.model.category.Category; +import org.mxchange.jproduct.model.category.ProductCategory; import org.mxchange.jshopcore.model.category.AdminCategorySessionBeanRemote; -import org.mxchange.jshopcore.model.category.Category; -import org.mxchange.jshopcore.model.category.ProductCategory; import org.mxchange.pizzaapplication.beans.BasePizzaController; /** @@ -100,7 +100,7 @@ public class PizzaAdminCategoryWebRequestBean extends BasePizzaController implem Category updatedCategory = this.categoryBean.doAdminAddCategory(category); // Fire event - this.categoryAddedEvent.fire(new ShopCategoryAddedEvent(updatedCategory)); + this.categoryAddedEvent.fire(new CategoryAddedEvent(updatedCategory)); // Unset all older values this.clear(); diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestController.java index 18ecb90d..242fa3c4 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestController.java @@ -19,7 +19,7 @@ package org.mxchange.pizzaapplication.beans.category; import java.io.Serializable; import javax.ejb.Local; import javax.faces.view.facelets.FaceletException; -import org.mxchange.jshopcore.model.category.Category; +import org.mxchange.jproduct.model.category.Category; /** * An interface for product controllers for "ADMIN" role diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationBean.java index 6043ac5c..579a1e6c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationBean.java @@ -28,8 +28,8 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jshopcore.events.category.AddedCategoryEvent; -import org.mxchange.jshopcore.model.category.Category; +import org.mxchange.jproduct.events.category.AddedCategoryEvent; +import org.mxchange.jproduct.model.category.Category; import org.mxchange.jshopcore.model.category.CategorySessionBeanRemote; import org.mxchange.pizzaapplication.beans.BasePizzaController; diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationController.java b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationController.java index 39ec8496..bee22aa1 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationController.java @@ -20,8 +20,8 @@ import java.io.Serializable; import java.util.List; import javax.ejb.Local; import javax.faces.view.facelets.FaceletException; -import org.mxchange.jshopcore.events.category.AddedCategoryEvent; -import org.mxchange.jshopcore.model.category.Category; +import org.mxchange.jproduct.events.category.AddedCategoryEvent; +import org.mxchange.jproduct.model.category.Category; /** * An interface for (product) categories diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestBean.java index d3c1d80f..33b5c173 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestBean.java @@ -28,14 +28,14 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jshopcore.events.product.AddedProductEvent; -import org.mxchange.jshopcore.events.product.ShopProductAddedEvent; -import org.mxchange.jshopcore.exceptions.CannotAddProductException; -import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException; -import org.mxchange.jshopcore.model.category.Category; +import org.mxchange.jproduct.events.product.AddedProductEvent; +import org.mxchange.jproduct.events.product.ProductAddedEvent; +import org.mxchange.jproduct.exceptions.CannotAddProductException; +import org.mxchange.jproduct.exceptions.ProductTitleAlreadyUsedException; +import org.mxchange.jproduct.model.category.Category; +import org.mxchange.jproduct.model.product.GenericProduct; +import org.mxchange.jproduct.model.product.Product; import org.mxchange.jshopcore.model.product.AdminProductSessionBeanRemote; -import org.mxchange.jshopcore.model.product.GenericProduct; -import org.mxchange.jshopcore.model.product.Product; import org.mxchange.pizzaapplication.beans.BasePizzaController; /** @@ -125,7 +125,7 @@ public class PizzaAdminProductWebRequestBean extends BasePizzaController impleme this.products.add(updatedProduct); // Fire event - this.addedProductEvent.fire(new ShopProductAddedEvent(updatedProduct)); + this.addedProductEvent.fire(new ProductAddedEvent(updatedProduct)); // Set all to null this.clear(); diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestController.java index 0fc893a2..fb3c8ce0 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestController.java @@ -20,8 +20,8 @@ import java.io.Serializable; import java.util.List; import javax.ejb.Local; import javax.faces.view.facelets.FaceletException; -import org.mxchange.jshopcore.model.category.Category; -import org.mxchange.jshopcore.model.product.Product; +import org.mxchange.jproduct.model.category.Category; +import org.mxchange.jproduct.model.product.Product; /** * An interface for product controllers for "ADMIN" role diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationBean.java index fb038895..f8bc3b71 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationBean.java @@ -27,8 +27,8 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jshopcore.events.product.AddedProductEvent; -import org.mxchange.jshopcore.model.product.Product; +import org.mxchange.jproduct.events.product.AddedProductEvent; +import org.mxchange.jproduct.model.product.Product; import org.mxchange.jshopcore.model.product.ProductSessionBeanRemote; import org.mxchange.pizzaapplication.beans.BasePizzaController; diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationController.java b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationController.java index cbda2580..aa1dc3e3 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationController.java @@ -20,8 +20,8 @@ import java.io.Serializable; import java.util.List; import javax.ejb.Local; import javax.faces.view.facelets.FaceletException; -import org.mxchange.jshopcore.events.product.AddedProductEvent; -import org.mxchange.jshopcore.model.product.Product; +import org.mxchange.jproduct.events.product.AddedProductEvent; +import org.mxchange.jproduct.model.product.Product; /** * An interface for products @@ -44,6 +44,7 @@ public interface PizzaProductWebApplicationController extends Serializable { * Observes events fired after a new product has been added *

* @param event Event to be observed + *

* @todo Move this to own controller */ void afterShopProductAdded (final AddedProductEvent event); diff --git a/src/java/org/mxchange/pizzaapplication/converter/category/PizzaCategoryConverter.java b/src/java/org/mxchange/pizzaapplication/converter/category/PizzaCategoryConverter.java index 7f550ef8..a9ed4593 100644 --- a/src/java/org/mxchange/pizzaapplication/converter/category/PizzaCategoryConverter.java +++ b/src/java/org/mxchange/pizzaapplication/converter/category/PizzaCategoryConverter.java @@ -28,11 +28,11 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcoreeelogger.beans.local.logger.Log; import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; -import org.mxchange.jshopcore.model.category.Category; +import org.mxchange.jproduct.model.category.Category; import org.mxchange.jshopcore.model.category.CategorySessionBeanRemote; /** - * A converter for transfering category objects + * A converter for transferring category objects *

* @author Roland Häder */ -- 2.39.5