]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Continued:
authorRoland Häder <roland@mxchange.org>
Sat, 15 Apr 2017 19:12:13 +0000 (21:12 +0200)
committerRoland Häder <roland@mxchange.org>
Sat, 15 Apr 2017 19:12:13 +0000 (21:12 +0200)
- 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 <roland@mxchange.org>
20 files changed:
lib/jproduct-core.jar [new file with mode: 0644]
lib/jshop-core.jar
lib/jshop-ee-lib.jar
lib/pizzaservice-core.jar [deleted file]
lib/pizzaservice-mailer.jar [deleted file]
nbproject/build-impl.xml
nbproject/genfiles.properties
nbproject/project.properties
nbproject/project.xml
src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionBean.java
src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionController.java
src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestBean.java
src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestController.java
src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationBean.java
src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationController.java
src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestBean.java
src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestController.java
src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationBean.java
src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationController.java
src/java/org/mxchange/pizzaapplication/converter/category/PizzaCategoryConverter.java

diff --git a/lib/jproduct-core.jar b/lib/jproduct-core.jar
new file mode 100644 (file)
index 0000000..3c8ae07
Binary files /dev/null and b/lib/jproduct-core.jar differ
index b158fae1130460aecd0ea87662133557b48ea800..f0d098039e0b91f493ada31b419e080b0e17c867 100644 (file)
Binary files a/lib/jshop-core.jar and b/lib/jshop-core.jar differ
index 1e83d3ce6bbaae734e674f9e0f12d07c5ed0c341..30f6d13515c63e60f42ad55d79b79b6b0236a349 100644 (file)
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 (file)
index 5fd2b25..0000000
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 (file)
index 48e0bca..0000000
Binary files a/lib/pizzaservice-mailer.jar and /dev/null differ
index 71854d0580a2fd40e8d5155058e05cc1e4aa9fc3..3bc3f2f7356a65c535439db50e1ef4f57f6920af 100644 (file)
@@ -878,6 +878,9 @@ exists or setup the property manually. For example like this:
                 COMPILATION SECTION
             -->
     <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps">
+        <ant antfile="${project.pizzaservice-core}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
         <ant antfile="${project.pizzaservice-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
@@ -886,6 +889,9 @@ exists or setup the property manually. For example like this:
         </ant>
     </target>
     <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
+        <ant antfile="${project.pizzaservice-core}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
         <ant antfile="${project.pizzaservice-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
@@ -1036,13 +1042,10 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
-        <copyfiles files="${reference.pizzaservice-mailer.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
-    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
-        <copyfiles files="${reference.pizzaservice-mailer.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-    </target>
+    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>
     </target>
@@ -1455,6 +1458,7 @@ exists or setup the property manually. For example like this:
                 CLEANUP SECTION
             -->
     <target depends="init" name="deps-clean" unless="no.deps">
+        <ant antfile="${project.pizzaservice-core}/build.xml" inheritall="false" target="clean"/>
         <ant antfile="${project.pizzaservice-lib}/build.xml" inheritall="false" target="clean"/>
         <ant antfile="${project.pizzaservice-mailer}/build.xml" inheritall="false" target="clean"/>
     </target>
index 11ffbaaf3719877cf3f2dfda17a70bea9d6b813c..413d75710f451c22d837b8e910b522dad89ec753 100644 (file)
@@ -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
index d1557b597b80cb807825a3dc16a6780cd99bafae..e8e6c1d617566169d2197da5042cc858a8eb2ef5 100644 (file)
@@ -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
index d89ea17fdb7650c6a87879d8bdbed6ee563d6863..931b804254860f2ae1efdcb93b4cfbb34aeb5a81 100644 (file)
@@ -42,6 +42,9 @@
                 <library dirs="200">
                     <file>${file.reference.jcustomer-lib.jar}</file>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.jproduct-core.jar}</file>
+                </library>
                 <library dirs="200">
                     <file>${file.reference.jshop-core.jar}</file>
                 </library>
                     <file>${file.reference.jshop-ee-lib.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.pizzaservice-core.jar}</file>
+                    <file>${reference.pizzaservice-core.jar}</file>
                 </library>
                 <library dirs="200">
                     <file>${reference.pizzaservice-lib.jar}</file>
                 </library>
                 <library dirs="200">
                     <file>${reference.pizzaservice-mailer.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
                     <file>${file.reference.cdi-api.jar}</file>
             <definitions>./lib/nblibraries.properties</definitions>
         </libraries>
         <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>pizzaservice-core</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
             <reference>
                 <foreign-project>pizzaservice-lib</foreign-project>
                 <artifact-type>jar</artifact-type>
index d26b5171d9bda516369cd56d19ddb1588e143c98..2faa87138f15d11879a3171490db8706504c320b 100644 (file)
@@ -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;
 
 /**
index 762ea2380f625687f5ba7e3a5e1f0197791814cc..473577bc97bedd472d86f311056b7d0dfa36eda3 100644 (file)
@@ -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
index e088258ff148b54147106300890ccbe8c480916c..b51007368bb4407155094b719591790fc21d91a2 100644 (file)
@@ -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();
index 18ecb90d82b4a1845849e1cec6af05f3697a3bdc..242fa3c4b59f684a53ff09df58e19894f8202ac7 100644 (file)
@@ -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
index 6043ac5c2dc8ea04ceb0f8dec0e0d836affcfad4..579a1e6c9f3f1650ebe2d55b7d3cc09d3059f68f 100644 (file)
@@ -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;
 
index 39ec8496bb3f235430c50d1d7986bab79632dbbc..bee22aa1af969850a04c17d4b36f62d8f78d749a 100644 (file)
@@ -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
index d3c1d80f0b5a174fa06cca59e763b90ab4f24bc1..33b5c1736cefb89da317a1218d8eb12f539e8dc5 100644 (file)
@@ -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();
index 0fc893a27d82e3fe4784457135a34a964a9cd2f5..fb3c8ce0bf8d8bdfd2f074902005390239bbef42 100644 (file)
@@ -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
index fb038895646ac3c02a28d3a18dafe8766061e33c..f8bc3b71abb61acd2b8803583fdc7081b796c303 100644 (file)
@@ -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;
 
index cbda2580ddf42e8fc804d49bdee83e621411663d..aa1dc3e3fcca1160e26463085ec9cf1ae55b513f 100644 (file)
@@ -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
         * <p>
         * @param event Event to be observed
+        * <p>
         * @todo Move this to own controller
         */
        void afterShopProductAdded (final AddedProductEvent event);
index 7f550ef84c8ccd8fb611cec62842ca1deb5945fb..a9ed4593124479b80e7443a81a1ee8008a761baa 100644 (file)
@@ -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
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */