From: Roland Häder Date: Sat, 15 Apr 2017 19:12:13 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=149085483ad00472f18d0e4f4660576c4def0bbd;p=pizzaservice-war.git Continued: - pizzaservice-core/mailer are now referenced as projects as they are application-specific projects and not libraries (like e.g. juser-core is) - added new dependency jproduct-core - updated jar(s) Signed-off-by: Roland Häder --- diff --git a/lib/jproduct-core.jar b/lib/jproduct-core.jar new file mode 100644 index 00000000..3c8ae076 Binary files /dev/null and b/lib/jproduct-core.jar differ diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar index b158fae1..f0d09803 100644 Binary files a/lib/jshop-core.jar and b/lib/jshop-core.jar differ diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar index 1e83d3ce..30f6d135 100644 Binary files a/lib/jshop-ee-lib.jar and b/lib/jshop-ee-lib.jar differ diff --git a/lib/pizzaservice-core.jar b/lib/pizzaservice-core.jar deleted file mode 100644 index 5fd2b253..00000000 Binary files a/lib/pizzaservice-core.jar and /dev/null differ diff --git a/lib/pizzaservice-mailer.jar b/lib/pizzaservice-mailer.jar deleted file mode 100644 index 48e0bca4..00000000 Binary files a/lib/pizzaservice-mailer.jar and /dev/null differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 71854d05..3bc3f2f7 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -878,6 +878,9 @@ exists or setup the property manually. For example like this: COMPILATION SECTION --> + + + @@ -886,6 +889,9 @@ exists or setup the property manually. For example like this: + + + @@ -1036,13 +1042,10 @@ exists or setup the property manually. For example like this: - - - - + @@ -1455,6 +1458,7 @@ exists or setup the property manually. For example like this: CLEANUP SECTION --> + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 11ffbaaf..413d7571 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=340aa771 -nbproject/build-impl.xml.script.CRC32=a8bfb2c9 +nbproject/build-impl.xml.data.CRC32=d8612883 +nbproject/build-impl.xml.script.CRC32=573c4f4b nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index d1557b59..e8e6c1d6 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -47,11 +47,11 @@ file.reference.jcustomer-core.jar=lib/jcustomer-core.jar file.reference.jcustomer-lib.jar=lib/jcustomer-lib.jar file.reference.jphone-core.jar=lib/jphone-core.jar file.reference.jphone-lib.jar=lib/jphone-lib.jar +file.reference.jproduct-core.jar=lib/jproduct-core.jar 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 file.reference.poi-3.14-20160307.jar=lib/poi-3.14-20160307.jar file.reference.poi-ooxml-3.14-20160307.jar=lib/poi-ooxml-3.14-20160307.jar includes=** @@ -80,9 +80,10 @@ javac.classpath=\ ${file.reference.juser-lib.jar}:\ ${file.reference.jcustomer-core.jar}:\ ${file.reference.jcustomer-lib.jar}:\ + ${file.reference.jproduct-core.jar}:\ ${file.reference.jshop-core.jar}:\ ${file.reference.jshop-ee-lib.jar}:\ - ${file.reference.pizzaservice-core.jar}:\ + ${reference.pizzaservice-core.jar}:\ ${reference.pizzaservice-lib.jar}:\ ${reference.pizzaservice-mailer.jar}:\ ${file.reference.cdi-api.jar}:\ @@ -121,8 +122,10 @@ lib.dir=${web.docbase.dir}/WEB-INF/lib persistence.xml.dir=${conf.dir} platform.active=default_platform project.license=agpl30 +project.pizzaservice-core=../../NetBeansProjects/pizzaservice-core project.pizzaservice-lib=../pizzaservice-lib project.pizzaservice-mailer=../../NetBeansProjects/pizzaservice-mailer +reference.pizzaservice-core.jar=${project.pizzaservice-core}/dist/pizzaservice-core.jar reference.pizzaservice-lib.jar=${project.pizzaservice-lib}/dist/pizzaservice-lib.jar reference.pizzaservice-mailer.jar=${project.pizzaservice-mailer}/dist/pizzaservice-mailer.jar resource.dir=setup @@ -143,11 +146,11 @@ source.reference.jcustomer-core.jar=../jcustomer-core/src/ source.reference.jcustomer-lib.jar=../jcustomer-lib/src/ source.reference.jphone-core.jar=../jphone-core/src/ source.reference.jphone-lib.jar=../jphone-lib/src/ +source.reference.jproduct-core.jar=../jproduct-core/src/ 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 d89ea17f..931b8042 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -42,6 +42,9 @@ ${file.reference.jcustomer-lib.jar} + + ${file.reference.jproduct-core.jar} + ${file.reference.jshop-core.jar} @@ -49,14 +52,13 @@ ${file.reference.jshop-ee-lib.jar} - ${file.reference.pizzaservice-core.jar} + ${reference.pizzaservice-core.jar} ${reference.pizzaservice-lib.jar} ${reference.pizzaservice-mailer.jar} - WEB-INF/lib ${file.reference.cdi-api.jar} @@ -86,6 +88,14 @@ ./lib/nblibraries.properties + + pizzaservice-core + jar + + jar + clean + jar + pizzaservice-lib jar diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionBean.java index d26b5171..2faa8713 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionBean.java @@ -25,13 +25,13 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; +import org.mxchange.jproduct.model.product.Product; import org.mxchange.jshopcore.exceptions.BasketItemAlreadyAddedException; import org.mxchange.jshopcore.model.basket.AddableBasketItem; import org.mxchange.jshopcore.model.basket.Basket; import org.mxchange.jshopcore.model.basket.BasketSessionBeanRemote; import org.mxchange.jshopcore.model.basket.ShopBasket; import org.mxchange.jshopcore.model.basket.items.BasketItem; -import org.mxchange.jshopcore.model.product.Product; import org.mxchange.pizzaapplication.beans.BasePizzaController; /** diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionController.java index 762ea238..473577bc 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionController.java @@ -19,8 +19,8 @@ package org.mxchange.pizzaapplication.beans.basket; import java.io.Serializable; import java.util.List; import javax.ejb.Local; +import org.mxchange.jproduct.model.product.Product; import org.mxchange.jshopcore.model.basket.AddableBasketItem; -import org.mxchange.jshopcore.model.product.Product; /** * An interface for a basket diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestBean.java index e088258f..b5100736 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestBean.java @@ -25,13 +25,13 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jshopcore.events.category.AddedCategoryEvent; -import org.mxchange.jshopcore.events.category.ShopCategoryAddedEvent; -import org.mxchange.jshopcore.exceptions.CannotAddCategoryException; -import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException; +import org.mxchange.jproduct.events.category.AddedCategoryEvent; +import org.mxchange.jproduct.events.category.CategoryAddedEvent; +import org.mxchange.jproduct.exceptions.CannotAddCategoryException; +import org.mxchange.jproduct.exceptions.CategoryTitleAlreadyUsedException; +import org.mxchange.jproduct.model.category.Category; +import org.mxchange.jproduct.model.category.ProductCategory; import org.mxchange.jshopcore.model.category.AdminCategorySessionBeanRemote; -import org.mxchange.jshopcore.model.category.Category; -import org.mxchange.jshopcore.model.category.ProductCategory; import org.mxchange.pizzaapplication.beans.BasePizzaController; /** @@ -100,7 +100,7 @@ public class PizzaAdminCategoryWebRequestBean extends BasePizzaController implem Category updatedCategory = this.categoryBean.doAdminAddCategory(category); // Fire event - this.categoryAddedEvent.fire(new ShopCategoryAddedEvent(updatedCategory)); + this.categoryAddedEvent.fire(new CategoryAddedEvent(updatedCategory)); // Unset all older values this.clear(); diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestController.java index 18ecb90d..242fa3c4 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestController.java @@ -19,7 +19,7 @@ package org.mxchange.pizzaapplication.beans.category; import java.io.Serializable; import javax.ejb.Local; import javax.faces.view.facelets.FaceletException; -import org.mxchange.jshopcore.model.category.Category; +import org.mxchange.jproduct.model.category.Category; /** * An interface for product controllers for "ADMIN" role diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationBean.java index 6043ac5c..579a1e6c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationBean.java @@ -28,8 +28,8 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jshopcore.events.category.AddedCategoryEvent; -import org.mxchange.jshopcore.model.category.Category; +import org.mxchange.jproduct.events.category.AddedCategoryEvent; +import org.mxchange.jproduct.model.category.Category; import org.mxchange.jshopcore.model.category.CategorySessionBeanRemote; import org.mxchange.pizzaapplication.beans.BasePizzaController; diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationController.java b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationController.java index 39ec8496..bee22aa1 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationController.java @@ -20,8 +20,8 @@ import java.io.Serializable; import java.util.List; import javax.ejb.Local; import javax.faces.view.facelets.FaceletException; -import org.mxchange.jshopcore.events.category.AddedCategoryEvent; -import org.mxchange.jshopcore.model.category.Category; +import org.mxchange.jproduct.events.category.AddedCategoryEvent; +import org.mxchange.jproduct.model.category.Category; /** * An interface for (product) categories diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestBean.java index d3c1d80f..33b5c173 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestBean.java @@ -28,14 +28,14 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jshopcore.events.product.AddedProductEvent; -import org.mxchange.jshopcore.events.product.ShopProductAddedEvent; -import org.mxchange.jshopcore.exceptions.CannotAddProductException; -import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException; -import org.mxchange.jshopcore.model.category.Category; +import org.mxchange.jproduct.events.product.AddedProductEvent; +import org.mxchange.jproduct.events.product.ProductAddedEvent; +import org.mxchange.jproduct.exceptions.CannotAddProductException; +import org.mxchange.jproduct.exceptions.ProductTitleAlreadyUsedException; +import org.mxchange.jproduct.model.category.Category; +import org.mxchange.jproduct.model.product.GenericProduct; +import org.mxchange.jproduct.model.product.Product; import org.mxchange.jshopcore.model.product.AdminProductSessionBeanRemote; -import org.mxchange.jshopcore.model.product.GenericProduct; -import org.mxchange.jshopcore.model.product.Product; import org.mxchange.pizzaapplication.beans.BasePizzaController; /** @@ -125,7 +125,7 @@ public class PizzaAdminProductWebRequestBean extends BasePizzaController impleme this.products.add(updatedProduct); // Fire event - this.addedProductEvent.fire(new ShopProductAddedEvent(updatedProduct)); + this.addedProductEvent.fire(new ProductAddedEvent(updatedProduct)); // Set all to null this.clear(); diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestController.java index 0fc893a2..fb3c8ce0 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestController.java @@ -20,8 +20,8 @@ import java.io.Serializable; import java.util.List; import javax.ejb.Local; import javax.faces.view.facelets.FaceletException; -import org.mxchange.jshopcore.model.category.Category; -import org.mxchange.jshopcore.model.product.Product; +import org.mxchange.jproduct.model.category.Category; +import org.mxchange.jproduct.model.product.Product; /** * An interface for product controllers for "ADMIN" role diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationBean.java index fb038895..f8bc3b71 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationBean.java @@ -27,8 +27,8 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jshopcore.events.product.AddedProductEvent; -import org.mxchange.jshopcore.model.product.Product; +import org.mxchange.jproduct.events.product.AddedProductEvent; +import org.mxchange.jproduct.model.product.Product; import org.mxchange.jshopcore.model.product.ProductSessionBeanRemote; import org.mxchange.pizzaapplication.beans.BasePizzaController; diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationController.java b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationController.java index cbda2580..aa1dc3e3 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationController.java @@ -20,8 +20,8 @@ import java.io.Serializable; import java.util.List; import javax.ejb.Local; import javax.faces.view.facelets.FaceletException; -import org.mxchange.jshopcore.events.product.AddedProductEvent; -import org.mxchange.jshopcore.model.product.Product; +import org.mxchange.jproduct.events.product.AddedProductEvent; +import org.mxchange.jproduct.model.product.Product; /** * An interface for products @@ -44,6 +44,7 @@ public interface PizzaProductWebApplicationController extends Serializable { * Observes events fired after a new product has been added *

* @param event Event to be observed + *

* @todo Move this to own controller */ void afterShopProductAdded (final AddedProductEvent event); diff --git a/src/java/org/mxchange/pizzaapplication/converter/category/PizzaCategoryConverter.java b/src/java/org/mxchange/pizzaapplication/converter/category/PizzaCategoryConverter.java index 7f550ef8..a9ed4593 100644 --- a/src/java/org/mxchange/pizzaapplication/converter/category/PizzaCategoryConverter.java +++ b/src/java/org/mxchange/pizzaapplication/converter/category/PizzaCategoryConverter.java @@ -28,11 +28,11 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcoreeelogger.beans.local.logger.Log; import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; -import org.mxchange.jshopcore.model.category.Category; +import org.mxchange.jproduct.model.category.Category; import org.mxchange.jshopcore.model.category.CategorySessionBeanRemote; /** - * A converter for transfering category objects + * A converter for transferring category objects *

* @author Roland Häder */