From 0a2b78def9190b6c0b72822d00cd220c7876a047 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 5 Sep 2015 12:12:33 +0200 Subject: [PATCH] =?utf8?q?Fixed=20package=20locations=20Signed-off-by:Rola?= =?utf8?q?nd=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jshop-ejb.jar | Bin 89288 -> 99138 bytes nbproject/genfiles.properties | 2 +- nbproject/project.properties | 8 +++++- nbproject/project.xml | 22 ++++++++++++--- .../beans/controller/PizzaServiceWebBean.java | 4 +-- .../beans/controller/PizzaWebBean.java | 4 +-- .../customer/PizzaServiceCustomerWebBean.java | 4 +-- .../beans/enums/PizzaServiceDataWebBean.java | 25 ++---------------- 8 files changed, 35 insertions(+), 34 deletions(-) diff --git a/lib/jshop-ejb.jar b/lib/jshop-ejb.jar index cb86732788b63f802f53a0136ce3468c289d4864..0ba207f13c26a94ceedbe943f8ed3350cacd5521 100644 GIT binary patch delta 13626 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 e@%l%T(Gov1{oecC?VNMZdhfaS{?D(q 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 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 -- 2.39.5