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>
</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>
</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>
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>
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
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=**
${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}:\
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
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
<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>
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;
/**
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
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;
/**
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();
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
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;
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
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;
/**
this.products.add(updatedProduct);
// Fire event
- this.addedProductEvent.fire(new ShopProductAddedEvent(updatedProduct));
+ this.addedProductEvent.fire(new ProductAddedEvent(updatedProduct));
// Set all to null
this.clear();
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
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;
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
* 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);
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>
*/