From a0c0d54260ac5db7c0df42ee8f89d345d6884447 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 9 Apr 2016 13:17:53 +0200 Subject: [PATCH] Some rewrites: - generic customer-related classes/interfaces has been moved to jcustomer-core/lib. - reordered imports (sorted) - added jcustomer-core/lib (new project) --- lib/jcustomer-core.jar | Bin 0 -> 5872 bytes lib/jcustomer-lib.jar | Bin 0 -> 1799 bytes lib/jshop-core.jar | Bin 49064 -> 44482 bytes lib/jshop-ee-lib.jar | Bin 7271 -> 6338 bytes nbproject/build-impl.xml | 4 ++++ nbproject/genfiles.properties | 4 ++-- nbproject/project.properties | 6 ++++++ nbproject/project.xml | 8 +++++++ .../checkout/PizzaCheckoutWebSessionBean.java | 2 +- .../PizzaCheckoutWebSessionController.java | 2 +- .../customer/PizzaCustomerWebSessionBean.java | 4 ++-- .../PizzaCustomerWebSessionController.java | 2 +- .../receipt/PizzaReceiptWebSessionBean.java | 2 +- .../PizzaReceiptWebSessionController.java | 2 +- web/admin/admin_user_unlock.xhtml | 20 ++++++++++++++++++ 15 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 lib/jcustomer-core.jar create mode 100644 lib/jcustomer-lib.jar create mode 100644 web/admin/admin_user_unlock.xhtml diff --git a/lib/jcustomer-core.jar b/lib/jcustomer-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..255e0d347367c857944ceb227a3bfb9b9528c550 GIT binary patch literal 5872 zcmb_gO>7&-6@J5itw>p-WJ#7BXJsokNkyXM*s&eCt{GaY8T}ciBtT67W3^gK>yTV^ zxk{`WIph+wK-xol=&h$*TeMEwv<=$k79c>b0dniLhoWc?y*23f_J>-o#I59df!*2J zeSh=j&G+8Sy@hB@B1#ecXy=D_$#->8jF#qBOOuu5`QkTU5Z!B$ehAXi&wug3F39;F zz}+HUDlJ#$=c=nyOY=)gLw~3>t;u!GZ0bhiHF;)gIwO@DzAvR+McvV4e8bNhQ?F*E zvZ*PSwl(?sKGR>HntpKY@}%CdG_#@9CO41dGjk-FEkjJjs3h8f0qF`Q9*tZKVFm}ZFbv2Yo6 zV@s=ruosTQ?hPkI&diDAG%dy23yx~~2R}8&F)@5Ehl}%hrtG@9R703-?cdk7^(I0? z+nV#dH>K8;X7h`0{`hAIeT805(U~NTbkiuE<;M#Woud~eguI-ju_T=r)Z5fdU8%WI zx>mU(NW38^Q^r(SO2b-LYI|CosOMjw|MO3n+R5kWYRh!q@?n~bALMG;s@{S_N@F?Xc)9=ZOGmo;_nn?Lw-P(~Gwo~LM zGa#|>7fWkP*0_eVIYdDRXAA1v)-2C& zPP_;j$mJIgG*m59Z){^?Gd|MF79y&RY|*fZhHOSldu$b#v}RM;*5(bfu2=|exYd5S zkvlB?P2VTSm9t0MaQX<|{5p+Ml2Z){8lf(d&~~F2p)}qE+K0GCxCr=lsKw0z$9U0VbCn!jx)A+`k zhHReU_H6JI`QM*@04(DBItWfaO#$S|C+T9+jxRw;)!5xH)oT9_W=K4-M#EB6Oj7}~ z8nDp$)hw#cOVOo8NJvc|=fok<>cq%Eb=ntA5cp6x>kHa`$KX57np}wXlOG)r2u{Cv zC-Dm!^dff8(rd-CQqvk+iivS#{n9<^Avf0AiP`pJt%QtECNGzMf9Tq)g+=+-9}xO& z4U~O8&ek{Ic)WG$r}MrI`RMK;UA+r9mwaJ2)hkX{b{S&lsD0ZGz4LdcVeQ!^xA+fbZhleZQMUL8mOPov@&E+eB zl#}rWFvVc@jKF#*Hz2faY}Acn)h-M4?{g+jFm6O}M*$7}fS(wlB0!q}rg57BqH!xR zrlCy}N=mehYTWh`FbZuJc*N}h(1_bX_y3Ulf7s0wy;hg(AEUuInSiV$uvY?G^SznfGrPbv4dTDWOt}3YV=JPWq@ebFPSON>V{BsoBvAj&$ z`c@taddrVp z*?^H6Lr3pCTE3*GBz{Mc&nWsU^aLX~@(2IpdYF;ip}%5h8qjBB1ys48QH<#$ZS?2y zh3jUndoQqV{Ku9CPu6%Bc?xwbr3({hQ6v{8e@jWHQf8e!b{4w|-Pe#^uERdBTIL-Q zkB4RRh@x}}?-9yD6ZS~1eMPjaIbQe;C4;8jw#7N7#a(eJnxL0m=C?U<;`+{~6x+zA zqS>xbNcxz%?QS}j&Dh-@yL&30?X|mo*apNlqED$C8-b_PgI&N=>Z^WCf=A_eGHZ|c zMdZ_Q_#jV{@M^@hf0Cv^7a<&Jh{!;+^N|-@hIypFm$+@6YB>jB2dqaOfiVMLAH6?; zXN%Q$Am&$o)De}}QwIZWo5C(`!B&%$LorEQovKJs!d9_v@f5vRI&FVy`ro><$=bJ(wj`0(fo zJZN_CNX*ml(fjpq@jlPClF0u!APedaZhsGS{|80m@rUN=cZ$QHmS7=zpyg|n&Bxag XmexGYaoEi`mZra$Hv61 zI}bL7t)Gm_U&jLuJ2-&_UPra{FAh@Xd`#Aky|*B_^0{8_T0mqFkQ4wZsh8P$Jv=R zo9hN<7cIME+1w@S*|d^YdJ%pYN+v-OT6R-CACc}N+WY!0H=7s%y*&(V>3fcAwb9ls zJIe5Gv|-z7pb_Es-bKuVP==pTT+HhRcbwys zZ{LaU5!^_@wG?DhaGgPBM;Jz6_=3BfL2G73et@vNgEjM04`UBZ=Vvct#9&f5ReU8J z>KSY>n7f?sElR}3rbiP*#6T(T>)4S!=cHhYo@>^gtz$_T$ly+ZJ6)|7e@$h$S=}>T z(Z)^Th`NEAXE)|Gd)YOq=6hqhxh3k zn)c~ezw@&c#WVMu|Dao6UwS@=Eo4^ykm3HN+ksL?Ig^Ux4{3Uf4Vey}r6?k)Ks};b zG*O^O=cgnUsYmzzB6NCJPDq~yd50A$U_LthITCNsnWs*HuUG5KV@XLpPQRBVhF|1g G1N;ZEOVscH literal 0 HcmV?d00001 diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar index b11c3b0264404e7c9fe625be16e26daa900f6811..95ea58c91a554ded2373dbaee9bca0e44b98c639 100644 GIT binary patch delta 2675 zcmbtVc}x^%6n`_rF3Y)qT{1gqs9+gBkp5kO0HE7=}e$BEzFxJi|L&GD97o z!LWo+9Yqt?mTK@m@64WKg(QY+g+&an2q_Flgair2g$^?u*r8NY$g@MgbH03-;`Xz^ z7>m#M@*!RKt9&&p;E}5*nVSzL%^Nfd0Fp#ut}Yzy)6`nz95J0xF@w|T zCGY3E07#O+42DfkVq;vT3k&r$rCg3sn10g9U5b!UwC!3ZDQCLiNb7VQ&hf;*`drW} zuY>=@fYJMPXfM#Dtw6YAj_|3_Tr)KKZx&W8bZ@mYXc~r4=RB_PvEUDLVHzaB3`m49NC6|H!)(ZaWnhLX$cB2zg-!4t zY=#_Yggn>|g<|A~pq zAG^)on3ACp6IXZ%x_O3)O#;J>%QzS-D+iO-bFfs+O#V34r<3v zaHLYZQi9?1v~g05Q-4X>br0K`W|PHG6&zJRBy!M<4)>Qr~TOY*i+A zoW=ZSl|gliJho$}#SfD$ChjcbcUTOnPU5?W&*UyL&aK*@>Lcz7)6K0maRbCBs%{YX z731y_ca!M`*BDga5a&ypEw3gBp^!$^VxJHd}?aPh(xvcWO3J7B`=AWrsgoZ)n-!%84@q%kah0fWhS| z07+u8PBRssf9Z$q?PU`tD2AT)<=#HIvuBpe8GPL2x*(sYVMr1;nt=wB&dq=O7*Eb! zj#(k#a58`Z0E>K70WO2N=Ag?xQdXH10f6nWV2Ruy;#MJIE+|sN@dpGM44t49f zmBfbNh_92o(h-JS&~vBgQfiV0Ke`~BScrYh*x`toxZgpI#!IdtQs5QWuiO6S03=C! z9hdM#lZysJjXE5TaKY!!PIye?H)fQ3ywc|d8Ay_5&s!(xc~l!kGj6ED!Df+JT*P{q;=DjWglP9zRwn#X?pj zVx@&1w-6gI%dWTf>iNKh^^%yjoGG1&~DfT8DNpgArd1+HLMwZkJ2cVApdiFxqaw z0lSV>MlpI6>9`#t7dkeHj92B{6;nc?Y`2XnOGCrgHz!M_mhRu7uh|V?Wt;T$A1-Wd A=Kufz delta 4634 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 ZVCT9WG37n=G2)a<1r-*p0IPoe^dG$IH821G diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 4bfee71f..bbdd9e37 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -1037,6 +1037,8 @@ exists or setup the property manually. For example like this: + + @@ -1053,6 +1055,8 @@ exists or setup the property manually. For example like this: + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index e3a6ca29..342fc01e 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=3d4ee603 -nbproject/build-impl.xml.script.CRC32=1aff867f +nbproject/build-impl.xml.data.CRC32=6cb26eb6 +nbproject/build-impl.xml.script.CRC32=ad01ddaf nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index 9343b6be..2df1fa2e 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -43,6 +43,8 @@ file.reference.jcore.jar=lib/jcore.jar file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jcountry-core.jar=lib/jcountry-core.jar file.reference.jcountry-lib.jar=lib/jcountry-lib.jar +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.jshop-core.jar=lib/jshop-core.jar file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.jar @@ -67,6 +69,8 @@ javac.classpath=\ ${file.reference.jcountry-lib.jar}:\ ${file.reference.jphone-core.jar}:\ ${file.reference.jcontacts-core.jar}:\ + ${file.reference.jcustomer-core.jar}:\ + ${file.reference.jcustomer-lib.jar}:\ ${file.reference.jshop-core.jar}:\ ${file.reference.jshop-ee-lib.jar}:\ ${reference.PizzaService-lib.jar}:\ @@ -117,6 +121,8 @@ source.reference.jcore.jar=../jcore/src/ source.reference.jcoreee.jar=../jcoreee/src/ source.reference.jcountry-core.jar=../jcountry-core/src/ source.reference.jcountry-lib.jar=../jcountry-lib/src/ +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.jshop-core.jar=../jshop-core/src/ source.reference.jshop-ee-lib.jar=../jshop-ee-lib/src/ diff --git a/nbproject/project.xml b/nbproject/project.xml index 9d65d231..f439710b 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -34,6 +34,14 @@ ${file.reference.jcontacts-core.jar} WEB-INF/lib + + ${file.reference.jcustomer-core.jar} + WEB-INF/lib + + + ${file.reference.jcustomer-lib.jar} + WEB-INF/lib + ${file.reference.jshop-core.jar} WEB-INF/lib diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java index a2e3e96a..a1b11960 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java @@ -33,8 +33,8 @@ import javax.jms.Session; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; +import org.mxchange.jcustomercore.model.customer.Customer; import org.mxchange.jshopcore.model.basket.AddableBasketItem; -import org.mxchange.jshopcore.model.customer.Customer; import org.mxchange.jshopcore.wrapper.CheckoutWrapper; import org.mxchange.jshopcore.wrapper.WrapableCheckout; import org.mxchange.pizzaapplication.beans.basket.PizzaBasketWebSessionController; diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionController.java index 633c00b0..2724eecb 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionController.java @@ -17,7 +17,7 @@ package org.mxchange.pizzaapplication.beans.checkout; import java.io.Serializable; -import org.mxchange.jshopcore.model.customer.Customer; +import org.mxchange.jcustomercore.model.customer.Customer; /** * An interface for the shop diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaCustomerWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaCustomerWebSessionBean.java index 6b3b64b5..d0eaa694 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaCustomerWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaCustomerWebSessionBean.java @@ -26,11 +26,11 @@ import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; import org.mxchange.jcontacts.contact.gender.Gender; import org.mxchange.jcountry.data.Country; +import org.mxchange.jcustomercore.model.customer.Customer; +import org.mxchange.jcustomercore.model.customer.CustomerSessionBeanRemote; import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jshopcore.model.customer.Customer; -import org.mxchange.jshopcore.model.customer.CustomerSessionBeanRemote; import org.mxchange.jshopcore.model.customer.ShopCustomer; /** diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaCustomerWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaCustomerWebSessionController.java index 825192fd..b9674d7e 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaCustomerWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaCustomerWebSessionController.java @@ -19,10 +19,10 @@ package org.mxchange.pizzaapplication.beans.customer; import java.io.Serializable; import org.mxchange.jcontacts.contact.gender.Gender; import org.mxchange.jcountry.data.Country; +import org.mxchange.jcustomercore.model.customer.Customer; import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jshopcore.model.customer.Customer; /** * An interface for customer beans diff --git a/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebSessionBean.java index 7239b81e..28f042f2 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebSessionBean.java @@ -22,7 +22,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jshopcore.model.customer.Customer; +import org.mxchange.jcustomercore.model.customer.Customer; import org.mxchange.jshopcore.model.receipt.ReceiptBeanRemote; /** diff --git a/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebSessionController.java index 0b5fb546..63052fd4 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebSessionController.java @@ -17,7 +17,7 @@ package org.mxchange.pizzaapplication.beans.receipt; import java.io.Serializable; -import org.mxchange.jshopcore.model.customer.Customer; +import org.mxchange.jcustomercore.model.customer.Customer; /** * An interface for the shop diff --git a/web/admin/admin_user_unlock.xhtml b/web/admin/admin_user_unlock.xhtml new file mode 100644 index 00000000..68da193c --- /dev/null +++ b/web/admin/admin_user_unlock.xhtml @@ -0,0 +1,20 @@ + + + + + + #{msg.PAGE_TITLE_ADMIN_UNLOCK_USER} + + + #{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER} + + + + Here goes your content. + + + -- 2.39.2