From: Roland Haeder Date: Wed, 27 Apr 2016 20:26:15 +0000 (+0200) Subject: Fixed imports + added new project dependencies (no cherry-picking, please) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=809c5491f300e81cc056126fb70d921f74093788;p=pizzaservice-war.git Fixed imports + added new project dependencies (no cherry-picking, please) --- diff --git a/lib/jcontacts-lib.jar b/lib/jcontacts-lib.jar index ff548a49..a8e5cd54 100644 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 index 00000000..0f5bdcc4 Binary files /dev/null and b/lib/pizzaservice-core.jar differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 73fb7276..375c9863 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -1051,6 +1051,7 @@ exists or setup the property manually. For example like this: + @@ -1074,6 +1075,7 @@ exists or setup the property manually. For example like this: + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index d8dd3695..66afc331 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=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 2718544c..737afe8f 100644 --- 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 882fbfa3..0b06ab79 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -66,6 +66,10 @@ ${file.reference.jshop-ee-lib.jar} WEB-INF/lib + + ${file.reference.pizzaservice-core.jar} + WEB-INF/lib + ${reference.PizzaService-lib.jar} WEB-INF/lib diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java index 9e5a4462..d530b3e4 100644 --- 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 78c3da76..c8ea10b6 100644 --- 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;