fixed project dependencies (you may not want to cherry-pick this, instead you should...

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 32f3dbc6ba66fcff06c373642974f55a0ebaffd1..514a021203240cbd71220c87fd86f6b304e9a80d 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -836,6 +836,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.juser-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.juser-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcustomer-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jcustomer-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jphone-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jphone-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.classes.dir}"/>
@@ -855,6 +856,7 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.juser-core.jar}" property="manifest.file.reference.juser-core.jar"/>
         <basename file="${file.reference.juser-lib.jar}" property="manifest.file.reference.juser-lib.jar"/>
         <basename file="${file.reference.jcustomer-core.jar}" property="manifest.file.reference.jcustomer-core.jar"/>
+        <basename file="${file.reference.jcustomer-lib.jar}" property="manifest.file.reference.jcustomer-lib.jar"/>
         <basename file="${file.reference.jphone-core.jar}" property="manifest.file.reference.jphone-core.jar"/>
         <basename file="${file.reference.jphone-lib.jar}" property="manifest.file.reference.jphone-lib.jar"/>
         <basename file="${file.reference.jshop-core.jar}" property="manifest.file.reference.jshop-core.jar"/>
@@ -863,7 +865,7 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.pizzaservice-core.jar}" property="manifest.file.reference.pizzaservice-core.jar"/>
         <basename file="${reference.PizzaService-lib.jar}" property="manifest.reference.PizzaService-lib.jar"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 jar-16 jar-17 "/>
+            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 jar-16 jar-17 jar-18 "/>
             <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcore.jar}"/>
             <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
             <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcountry-core.jar}"/>
@@ -874,13 +876,14 @@ exists or setup the property manually. For example like this:
             <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/>
             <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/>
             <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.jcustomer-core.jar}"/>
-            <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.jphone-core.jar}"/>
-            <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.jphone-lib.jar}"/>
-            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
-            <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
-            <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
-            <attribute name="jar-16-Extension-Name" value="${manifest.file.reference.pizzaservice-core.jar}"/>
-            <attribute name="jar-17-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
+            <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.jcustomer-lib.jar}"/>
+            <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.jphone-core.jar}"/>
+            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jphone-lib.jar}"/>
+            <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
+            <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
+            <attribute name="jar-16-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
+            <attribute name="jar-17-Extension-Name" value="${manifest.file.reference.pizzaservice-core.jar}"/>
+            <attribute name="jar-18-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -894,6 +897,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.juser-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcustomer-core.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jcustomer-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jphone-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jphone-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${dist.ear.dir}/lib"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 8120b8f25f9f646db431a8867a2efe53eda9d9ff..f77344d88455d0d9d8a363196b11fc4da6d63b43 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=9c0f08a9
 build.xml.stylesheet.CRC32=5910fda3@1.55.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=9e5ca144
-nbproject/build-impl.xml.script.CRC32=c2a539b2
+nbproject/build-impl.xml.data.CRC32=ab70c767
+nbproject/build-impl.xml.script.CRC32=2dec32dc
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index d110bbe510b411e718dc4bbf6983229f3436a13c..924261c2cd7e4a78b6717f60ec7b15076659571d 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -30,6 +30,7 @@ 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.jmailer-ee.jar=lib/jmailer-ee.jar
 file.reference.jphone-core.jar=lib/jphone-core.jar
 file.reference.jphone-lib.jar=lib/jphone-lib.jar
@@ -64,6 +65,7 @@ javac.classpath=\
     ${file.reference.juser-core.jar}:\
     ${file.reference.juser-lib.jar}:\
     ${file.reference.jcustomer-core.jar}:\
+    ${file.reference.jcustomer-lib.jar}:\
     ${file.reference.jphone-core.jar}:\
     ${file.reference.jphone-lib.jar}:\
     ${file.reference.jshop-core.jar}:\
@@ -116,6 +118,7 @@ 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.jmailer-ee.jar=../jmailer-ee/src/
 source.reference.jphone-core.jar=../jphone-core/src/
 source.reference.jphone-lib.jar=../jphone-lib/src/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 855481ff8f8fd47a1568d50d51560014a657d5d9..ee93a6a199349c0667b207ac0bf262583f257dc1 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -15,6 +15,7 @@
             <included-library dirs="200">file.reference.juser-core.jar</included-library>
             <included-library dirs="200">file.reference.juser-lib.jar</included-library>
             <included-library dirs="200">file.reference.jcustomer-core.jar</included-library>
+            <included-library dirs="200">file.reference.jcustomer-lib.jar</included-library>
             <included-library dirs="200">file.reference.jphone-core.jar</included-library>
             <included-library dirs="200">file.reference.jphone-lib.jar</included-library>
             <included-library dirs="200">file.reference.jshop-core.jar</included-library>

diff --git a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java
index 109fbfd49030b48f370569ab41ea567ceadef3f7..ddba1e8c40147782f949eeaa65f5e5bc8fc3e7fc 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java
@@ -74,9 +74,9 @@ public class PizzaAdminCustomerSessionBean extends BasePizzaDatabaseBean impleme
                } else if (customer.getCustomerNumber() == null) {
                        // Customer numbers should be set, at least generate one with CustomerUtils
                        throw new NullPointerException("customer.customerNumber is null"); //NOI18N
-               } else if (customer.getCustomerNumber().length() < RateCalcAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH) {
+               } else if (customer.getCustomerNumber().length() < PizzaAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH) {
                        // To short number
-                       throw new IllegalArgumentException(MessageFormat.format("customer.customerNumber.length={0} is shorter than expected: {1}", customer.getCustomerNumber().length(), RateCalcAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH)); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("customer.customerNumber.length={0} is shorter than expected: {1}", customer.getCustomerNumber().length(), PizzaAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH)); //NOI18N
                } else if (this.customerBean.isReqistered(customer)) {
                        // Throw exception
                        throw new CustomerAlreadyRegisteredException(customer);
@@ -196,9 +196,9 @@ public class PizzaAdminCustomerSessionBean extends BasePizzaDatabaseBean impleme
                } else if (customer.getCustomerNumber() == null) {
                        // Customer numbers should be set, at least generate one with CustomerUtils
                        throw new NullPointerException("customer.customerNumber is null"); //NOI18N
-               } else if (customer.getCustomerNumber().length() < RateCalcAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH) {
+               } else if (customer.getCustomerNumber().length() < PizzaAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH) {
                        // To short number
-                       throw new IllegalArgumentException(MessageFormat.format("customer.customerNumber.length={0} is shorter than expected: {1}", customer.getCustomerNumber().length(), RateCalcAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH)); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("customer.customerNumber.length={0} is shorter than expected: {1}", customer.getCustomerNumber().length(), PizzaAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH)); //NOI18N
                } else if (this.customerBean.isReqistered(customer)) {
                        // Throw exception
                        throw new CustomerAlreadyRegisteredException(customer);

diff --git a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java
index 82f836b11307a2cd51ba50e7d5a461722632280b..0229a31ffdc40948ed7accf9a0c0224717a09fcd 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java
@@ -60,9 +60,9 @@ public class PizzaCustomerSessionBean extends BasePizzaDatabaseBean implements P
                } else if (customer.getCustomerNumber() == null) {
                        // Customer numbers should be set, at least generate one with CustomerUtils
                        throw new NullPointerException("customer.customerNumber is null"); //NOI18N
-               } else if (customer.getCustomerNumber().length() < RateCalcAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH) {
+               } else if (customer.getCustomerNumber().length() < PizzaAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH) {
                        // To short number
-                       throw new IllegalArgumentException(MessageFormat.format("customer.customerNumber.length={0} is shorter than expected: {1}", customer.getCustomerNumber().length(), RateCalcAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH)); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("customer.customerNumber.length={0} is shorter than expected: {1}", customer.getCustomerNumber().length(), PizzaAdminCustomerSessionBeanRemote.CUSTOMER_NUMBER_LENGTH)); //NOI18N
                }
 
                // Init query instance