From: Roland Haeder Date: Sat, 5 Sep 2015 10:12:33 +0000 (+0200) Subject: Fixed package locations X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0a2b78def9190b6c0b72822d00cd220c7876a047;p=pizzaservice-war.git Fixed package locations Signed-off-by:Roland Häder --- diff --git a/lib/jshop-ejb.jar b/lib/jshop-ejb.jar index cb867327..0ba207f1 100644 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 d9320034..b37418b1 100644 --- 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 28d7b5b0..fdf9badc 100644 --- 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 49ab0ad2..61b2a915 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -15,8 +15,7 @@ WEB-INF/lib - ${file.reference.jshop-ejb.jar} - WEB-INF/lib + ${file.reference.jshop.jar} ${file.reference.cdi-api.jar} @@ -50,6 +49,14 @@ ${file.reference.jshop-core.jar} WEB-INF/lib + + ${reference.PizzaService-lib.jar} + WEB-INF/lib + + + ${file.reference.jshop-ejb.jar} + WEB-INF/lib + @@ -62,6 +69,15 @@ .\lib\nblibraries.properties - + + + PizzaService-lib + jar + + jar + clean + jar + + diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java index 41b832d5..dd896a6c 100644 --- 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 11dcdb76..f24dad1e 100644 --- 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 ba0ce6f7..0c5806ad 100644 --- 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 32c77984..e9655c12 100644 --- 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 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 genders = null; // Trace message this.getLogger().trace(MessageFormat.format("genders={0} - EXIT!", genders)); //NOI18N