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 (file)
index 0000000..255e0d3
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 (file)
index 0000000..83d9d76
Binary files /dev/null and b/lib/jcustomer-lib.jar differ

diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar
index b11c3b0264404e7c9fe625be16e26daa900f6811..95ea58c91a554ded2373dbaee9bca0e44b98c639 100644 (file)
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 c1bbbe5fa59afd97a0764de5a50069c1f5b9b24d..a209047d22454f437e10f4b35600e6e54fc87074 100644 (file)
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 4bfee71fb1c035265a7fe955bc064ee3074c9c90..bbdd9e37d43d8ca4277a36050f99d3143c51b2fe 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -1037,6 +1037,8 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcountry-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jphone-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jcustomer-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jcustomer-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.PizzaService-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1053,6 +1055,8 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcountry-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jphone-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jcustomer-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jcustomer-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${reference.PizzaService-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index e3a6ca29b119acd7d444e69f615551a9815aef07..342fc01e7ddba06981301bce2c3e2679f864d853 100644 (file)
--- 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 9343b6bef81e70eca7753dd859a578003f9db025..2df1fa2ef341fdcec48b1a0fe54e9a9fa4100135 100644 (file)
--- 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 9d65d23174785fcb775f4283aca75db936d34644..f439710b36fa0bf63ce15016e67b56327b6d5be4 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -34,6 +34,14 @@
                     <file>${file.reference.jcontacts-core.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.jcustomer-core.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jcustomer-lib.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
                 <library dirs="200">
                     <file>${file.reference.jshop-core.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>

diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java
index a2e3e96a69b1bb58e5a9076a988535d5607d5591..a1b119605310a793ec346d859665c5a78e15b638 100644 (file)
--- 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 633c00b00c6f701bb68ad9f38110055306e08fcf..2724eecbb9175a978aba2e3882890c85537c065c 100644 (file)
--- 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 6b3b64b52c457ae97bd6e85f4d322c9ce461984f..d0eaa694f0a4e6b8391162cc014ddeffd4a892f8 100644 (file)
--- 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 825192fdfb91c07a08823e8c5ed8becbc391d8ef..b9674d7e3ce371e0984f82e8e7c84b5d5a6c1164 100644 (file)
--- 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 7239b81ebe1f59cd6cd1ec30e13bd75cf88b5498..28f042f2ef86c5fc2a8ae181f7847b1b25688f4b 100644 (file)
--- 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 0b5fb546e44e6d488a2387d83bd045f054a79f55..63052fd44fb52f8004b5ea7f286a381a2a130062 100644 (file)
--- 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 (file)
index 0000000..68da193
--- /dev/null
+++ b/web/admin/admin_user_unlock.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/jsf/facelets"
+         xmlns:h="http://xmlns.jcp.org/jsf/html"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
+
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER}
+               </ui:define>
+
+               <ui:define name="content">
+                       Here goes your content.
+               </ui:define>
+       </ui:composition>
+</html>