Fixed package locations

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/lib/jshop-ejb.jar b/lib/jshop-ejb.jar
index cb86732788b63f802f53a0136ce3468c289d4864..0ba207f13c26a94ceedbe943f8ed3350cacd5521 100644 (file)
Binary files a/lib/jshop-ejb.jar and b/lib/jshop-ejb.jar differ

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index d9320034a7fe9060f7f7bd0d7da75b2f5eb3a44e..b37418b106a71831d642fdc3e808c1283c212d93 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,4 +1,4 @@
-build.xml.data.CRC32=46935672
+build.xml.data.CRC32=f043d149
 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.

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 28d7b5b08c92f8d71497eab0852e4d53f521b993..fdf9badc5a6cf06963121a73153dfaa80bb8fc6c 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -35,6 +35,7 @@ file.reference.gf-client.jar=lib/gf-client.jar
 file.reference.jcore.jar=lib/jcore.jar
 file.reference.jcore-ejb.jar=lib/jcore-ejb.jar
 file.reference.jshop-core.jar=lib/jshop-core.jar
+file.reference.jshop-ejb.jar=lib/jshop-ejb.jar
 file.reference.jshop.jar=lib/jshop.jar
 file.reference.log4j-api-2.3.jar=lib/log4j-api-2.3.jar
 file.reference.log4j-core-2.3.jar=lib/log4j-core-2.3.jar
@@ -63,7 +64,9 @@ javac.classpath=\
     ${file.reference.log4j-api-2.3.jar}:\
     ${file.reference.log4j-core-2.3.jar}:\
     ${file.reference.log4j-web-2.3.jar}:\
-    ${file.reference.jshop-core.jar}
+    ${file.reference.jshop-core.jar}:\
+    ${reference.PizzaService-lib.jar}:\
+    ${file.reference.jshop-ejb.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true
@@ -92,6 +95,8 @@ javadoc.windowtitle=
 lib.dir=${web.docbase.dir}/WEB-INF/lib
 persistence.xml.dir=${conf.dir}
 platform.active=default_platform
+project.PizzaService-lib=../pizzaservice-lib
+reference.PizzaService-lib.jar=${project.PizzaService-lib}/dist/PizzaService-lib.jar
 resource.dir=setup
 run.test.classpath=\
     ${javac.test.classpath}:\
@@ -103,6 +108,7 @@ source.encoding=UTF-8
 source.reference.jcore.jar=../jcore/src/
 source.reference.jcore-ejb.jar=../jcore-ejb/src/
 source.reference.jshop-core.jar=../jshop-core/src/
+source.reference.jshop-ejb.jar=../jshop-ejb/src/
 source.reference.jshop.jar=../jshop-ejb/src/
 source.root=src
 src.dir=${source.root}/java

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 49ab0ad296b5a00572dd9fc6994424d66117879f..61b2a915ec0ee9e6c673d8daf1f0749fb79128be 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -15,8 +15,7 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jshop-ejb.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
+                    <file>${file.reference.jshop.jar}</file>
                 </library>
                 <library dirs="200">
                     <file>${file.reference.cdi-api.jar}</file>
@@ -50,6 +49,14 @@
                     <file>${file.reference.jshop-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>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jshop-ejb.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>
@@ -62,6 +69,15 @@
         <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
             <definitions>.\lib\nblibraries.properties</definitions>
         </libraries>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>PizzaService-lib</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
     </configuration>
 </project>

diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java
index 41b832d5359599135300abe2510bd28546bf48c5..dd896a6c86e1af9507e3ba4b79e2c6a88ad650c1 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java
@@ -29,9 +29,9 @@ import javax.faces.FacesException;
 import javax.inject.Named;
 import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException;
 import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException;
+import org.mxchange.jshopcore.model.category.Category;
+import org.mxchange.jshopcore.model.product.Product;
 import org.mxchange.jshopejb.beans.BaseFrameworkBean;
-import org.mxchange.jshopejb.model.category.Category;
-import org.mxchange.jshopejb.model.product.Product;
 
 /**
  * Main application class

diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java
index 11dcdb7622d4b8cd33a7658d7a1ae0396db4a4f0..f24dad1ec565e79882bfe4ed2b94cfd4307954b0 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java
@@ -22,9 +22,9 @@ import java.util.Iterator;
 import javax.faces.FacesException;
 import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException;
 import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException;
+import org.mxchange.jshopcore.model.category.Category;
+import org.mxchange.jshopcore.model.product.Product;
 import org.mxchange.jshopejb.beans.FrameworkBean;
-import org.mxchange.jshopejb.model.category.Category;
-import org.mxchange.jshopejb.model.product.Product;
 
 /**
  *

diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java
index ba0ce6f795a333860cc8bd54a3e8a8cf33ccbcf5..0c5806ad9bd19062b1ff8d69a914b9578f72ee4b 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java
@@ -19,9 +19,9 @@ package org.mxchange.pizzaapplication.beans.customer;
 import javax.enterprise.context.SessionScoped;
 import javax.inject.Named;
 import org.mxchange.jcore.model.contact.gender.Gender;
+import org.mxchange.jshopcore.model.customer.Customer;
+import org.mxchange.jshopcore.model.customer.ShopCustomer;
 import org.mxchange.jshopejb.beans.BaseFrameworkBean;
-import org.mxchange.jshopejb.model.customer.Customer;
-import org.mxchange.jshopejb.model.customer.ShopCustomer;
 
 /**
  * A customer bean which hides the customer instance

diff --git a/src/java/org/mxchange/pizzaapplication/beans/enums/PizzaServiceDataWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/enums/PizzaServiceDataWebBean.java
index 32c77984570b318102fed8410f9335402ef8f216..e9655c12a5a6fbbc3f7b7fdd4b56cbda1663aca9 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/enums/PizzaServiceDataWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/enums/PizzaServiceDataWebBean.java
@@ -17,7 +17,6 @@
 package org.mxchange.pizzaapplication.beans.enums;
 
 import java.text.MessageFormat;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import javax.enterprise.context.ApplicationScoped;
@@ -54,28 +53,8 @@ public class PizzaServiceDataWebBean extends BaseFrameworkBean implements DataWe
                this.getLogger().trace("CALLED!"); //NOI18N
 
                // Init array
-               List<Gender> genders = new ArrayList<>(this.getGenders().length - 1);
-
-               // Debug message
-               this.getLogger().debug(MessageFormat.format("genders.size()={0}", genders.size()));
-
-               // Return it
-               for (final Gender gender : Gender.values()) {
-                       // Debug message
-                       this.getLogger().debug(MessageFormat.format("gender={0}", gender));
-
-                       // Is it unknown?
-                       if (!gender.equals(Gender.UNKNOWN)) {
-                               // Debug message
-                               this.getLogger().debug(MessageFormat.format("gender={0} - adding ...", gender));
-
-                               // Not, then add it
-                               boolean added = genders.add(gender);
-
-                               // Debug message
-                               this.getLogger().debug(MessageFormat.format("added={0}", added));
-                       }
-               }
+               // TODO Call EJB here?
+               List<Gender> genders = null;
 
                // Trace message
                this.getLogger().trace(MessageFormat.format("genders={0} - EXIT!", genders)); //NOI18N