Fixed imports + added new project dependencies (no cherry-picking, please)

diff --git a/lib/jcontacts-lib.jar b/lib/jcontacts-lib.jar
index ff548a492e2d2e370762a3405bbeb62ab695b299..a8e5cd544e0bacda20b49a97413c7cb8c127f7da 100644 (file)
Binary files a/lib/jcontacts-lib.jar and b/lib/jcontacts-lib.jar differ

diff --git a/lib/pizzaservice-core.jar b/lib/pizzaservice-core.jar
new file mode 100644 (file)
index 0000000..0f5bdcc
Binary files /dev/null and b/lib/pizzaservice-core.jar differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 73fb727695de94d7585b39801facec6970ac2610..375c9863321cb9d470fb968b341fbb1795f16771 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -1051,6 +1051,7 @@ exists or setup the property manually. For example like this:
         <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="${file.reference.pizzaservice-core.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"/>
         <copyfiles files="${reference.pizzaservice-mailer.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1074,6 +1075,7 @@ exists or setup the property manually. For example like this:
         <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="${file.reference.pizzaservice-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${reference.PizzaService-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${reference.pizzaservice-mailer.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.web.dir}/WEB-INF/lib"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index d8dd36954b16ef222a6622d6f2581e6b16cf022b..66afc33123c85f79e196a6f735aed7e5538e3e60 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=eae02ec4
-nbproject/build-impl.xml.script.CRC32=cf2be072
+nbproject/build-impl.xml.data.CRC32=2b9b38cb
+nbproject/build-impl.xml.script.CRC32=333e4149
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 2718544cef021ec631ab6731c1fc53e5c1516fff..737afe8f8835216647ddbedaba3d8b44c5746fbe 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -52,6 +52,7 @@ 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
 includes=**
 j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
@@ -81,6 +82,7 @@ javac.classpath=\
     ${file.reference.jcustomer-lib.jar}:\
     ${file.reference.jshop-core.jar}:\
     ${file.reference.jshop-ee-lib.jar}:\
+    ${file.reference.pizzaservice-core.jar}:\
     ${reference.PizzaService-lib.jar}:\
     ${reference.pizzaservice-mailer.jar}:\
     ${file.reference.cdi-api.jar}:\
@@ -141,6 +143,7 @@ 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 882fbfa3b08e6504f7f8a30d42e6e4159d032a31..0b06ab793541ca73601e6c7e48c6c29254147706 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -66,6 +66,10 @@
                     <file>${file.reference.jshop-ee-lib.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.pizzaservice-core.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
                 <library dirs="200">
                     <file>${reference.PizzaService-lib.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>

diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java
index 9e5a44624ea9d5e19dcaaf9afbb139f169154095..d530b3e4827db05cf352a5d0bafa33521fa8b163 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java
@@ -37,6 +37,7 @@ import org.mxchange.jcustomercore.model.customer.status.CustomerAccountStatus;
 import org.mxchange.pizzaapplication.beans.contact.PizzaAdminContactWebRequestController;
 import org.mxchange.pizzaapplication.beans.helper.PizzaAdminWebRequestController;
 import org.mxchange.pizzaapplication.model.customer.PizzaAdminCustomerSessionBeanRemote;
+import org.mxchange.pizzaapplication.model.customer.PizzaCustomer;
 
 /**
  * Administrative customer bean (controller)

diff --git a/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java
index 78c3da760ce5e0440f45874c0223c0e2f0398785..c8ea10b64d8b0c9ec1a8cedd86f0a4c9f7b48ab5 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java
@@ -16,7 +16,6 @@
  */
 package org.mxchange.pizzaapplication.beans.login;
 
-import de.chotime.jratecalc.beans.user.RateCalcUserWebSessionController;
 import java.util.Objects;
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.event.Event;