From: Roland Haeder Date: Sat, 9 Apr 2016 11:17:53 +0000 (+0200) Subject: Some rewrites: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a0c0d54260ac5db7c0df42ee8f89d345d6884447;p=pizzaservice-war.git Some rewrites: - generic customer-related classes/interfaces has been moved to jcustomer-core/lib. - reordered imports (sorted) - added jcustomer-core/lib (new project) --- diff --git a/lib/jcustomer-core.jar b/lib/jcustomer-core.jar new file mode 100644 index 00000000..255e0d34 Binary files /dev/null and b/lib/jcustomer-core.jar differ diff --git a/lib/jcustomer-lib.jar b/lib/jcustomer-lib.jar new file mode 100644 index 00000000..83d9d76a Binary files /dev/null and b/lib/jcustomer-lib.jar differ diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar index b11c3b02..95ea58c9 100644 Binary files a/lib/jshop-core.jar and b/lib/jshop-core.jar differ diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar index c1bbbe5f..a209047d 100644 Binary files a/lib/jshop-ee-lib.jar and b/lib/jshop-ee-lib.jar differ 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. + + +