From: Roland Haeder Date: Thu, 13 Apr 2017 19:22:39 +0000 (+0200) Subject: Continued a bit: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=40c59140f8de9b21adddd6613031f857a69c87a1;p=jshop-lib.git Continued a bit: - added new depdendency 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 0000000..3c8ae07 Binary files /dev/null and b/lib/jproduct-core.jar differ diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar deleted file mode 100644 index 8fe3b7b..0000000 Binary files a/lib/jshop-core.jar and /dev/null differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 92005f3..c0c76e7 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -18,1421 +18,1443 @@ is divided into following sections: - applet - cleanup ---> + --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No tests executed. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set JVM to use for profiling in profiler.info.jvm - Must set profiler agent JVM arguments in profiler.info.jvmargs.agent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - Must select one file in the IDE or set profile.class - This target only works when run from inside the NetBeans IDE. - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - - - Must select some files in the IDE or set test.includes - - - - - Must select one file in the IDE or set run.class - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - Must select some files in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - Must select one file in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set test.src.dir + Must set build.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.test.classes.dir + Must set build.test.results.dir + Must set build.classes.excludes + Must set dist.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + Must select one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + Must select one file in the IDE or set debug.class + + + + + Must set fix.includes + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + Must select one file in the IDE or set profile.class + This target only works when run from inside the NetBeans IDE. + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + + + Must select some files in the IDE or set test.includes + + + + + Must select one file in the IDE or set run.class + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + Must select some files in the IDE or set test.includes + + + + Some tests failed; see details above. + + + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + Some tests failed; see details above. + + + + + Must select one file in the IDE or set test.class + + + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + + + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 545a0c6..603b222 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=7a07e688 build.xml.stylesheet.CRC32=8064a381@1.75.2.48 # 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=702409c8 -nbproject/build-impl.xml.script.CRC32=4eec5454 -nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48 +nbproject/build-impl.xml.data.CRC32=c08717ab +nbproject/build-impl.xml.script.CRC32=7111533f +nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48 diff --git a/nbproject/project.properties b/nbproject/project.properties index 171fc9a..424e04f 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -33,7 +33,7 @@ excludes= file.reference.jcore.jar=lib/jcore.jar file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jcustomer-core.jar=lib/jcustomer-core.jar -file.reference.jshop-core.jar=lib/jshop-core.jar +file.reference.jproduct-core.jar=lib/jproduct-core.jar includes=** jar.archive.disabled=${jnlp.enabled} jar.compress=false @@ -42,7 +42,8 @@ javac.classpath=\ ${file.reference.jcore.jar}:\ ${file.reference.jcoreee.jar}:\ ${file.reference.jcustomer-core.jar}:\ - ${file.reference.jshop-core.jar}:\ + ${file.reference.jproduct-core.jar}:\ + ${reference.jshop-core.jar}:\ ${libs.javaee-api-7.0.classpath} # Space-separated list of extra javac options javac.compilerargs= @@ -84,7 +85,9 @@ manifest.custom.permissions= meta.inf.dir=${src.dir}/META-INF mkdist.disabled=true platform.active=default_platform +project.jshop-core=../../NetBeansProjects/jshop-core project.license=gpl30 +reference.jshop-core.jar=${project.jshop-core}/dist/jshop-core.jar run.classpath=\ ${javac.classpath}:\ ${build.classes.dir} @@ -99,6 +102,6 @@ source.encoding=UTF-8 source.reference.jcore.jar=../jcore/src/ source.reference.jcoreee.jar=../jcoreee/src/ source.reference.jcustomer-core.jar=../jcustomer-core/src/ -source.reference.jshop-core.jar=../jshop-core/src/ +source.reference.jproduct-core.jar=../jproduct-core/src/ src.dir=src test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml index 7144edb..4a49af5 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -1,19 +1,28 @@ - org.netbeans.modules.java.j2seproject - - - jshop-ee-lib - - - - - - - - - ./lib/nblibraries.properties - - - + org.netbeans.modules.java.j2seproject + + + jshop-ee-lib + + + + + + + + + ./lib/nblibraries.properties + + + + jshop-core + jar + + jar + clean + jar + + + diff --git a/src/org/mxchange/jshopcore/model/basket/BasketSessionBeanRemote.java b/src/org/mxchange/jshopcore/model/basket/BasketSessionBeanRemote.java index adc5041..457d22a 100644 --- a/src/org/mxchange/jshopcore/model/basket/BasketSessionBeanRemote.java +++ b/src/org/mxchange/jshopcore/model/basket/BasketSessionBeanRemote.java @@ -43,4 +43,5 @@ public interface BasketSessionBeanRemote extends Serializable { * @return Access key */ String registerItems (final Customer customer, final List orderedItems); + } diff --git a/src/org/mxchange/jshopcore/model/category/AdminCategorySessionBeanRemote.java b/src/org/mxchange/jshopcore/model/category/AdminCategorySessionBeanRemote.java index 141d22c..5c29837 100644 --- a/src/org/mxchange/jshopcore/model/category/AdminCategorySessionBeanRemote.java +++ b/src/org/mxchange/jshopcore/model/category/AdminCategorySessionBeanRemote.java @@ -18,8 +18,9 @@ package org.mxchange.jshopcore.model.category; import java.io.Serializable; import javax.ejb.Remote; -import org.mxchange.jshopcore.exceptions.CannotAddCategoryException; -import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException; +import org.mxchange.jproduct.exceptions.CannotAddCategoryException; +import org.mxchange.jproduct.exceptions.CategoryTitleAlreadyUsedException; +import org.mxchange.jproduct.model.category.Category; /** * An interface for categories for "ADMIN" role. @@ -36,11 +37,10 @@ public interface AdminCategorySessionBeanRemote extends Serializable { *

* @return Updated category instance *

- * @throws - * org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException If - * the given title is already used - * @throws org.mxchange.jshopcore.exceptions.CannotAddCategoryException If - * the category cannot be added + * @throws CategoryTitleAlreadyUsedException If the given title is already + * used + * @throws CannotAddCategoryException If the category cannot be added */ Category doAdminAddCategory (final Category category) throws CategoryTitleAlreadyUsedException, CannotAddCategoryException; + } diff --git a/src/org/mxchange/jshopcore/model/category/CategorySessionBeanRemote.java b/src/org/mxchange/jshopcore/model/category/CategorySessionBeanRemote.java index 55f71bd..7cd9355 100644 --- a/src/org/mxchange/jshopcore/model/category/CategorySessionBeanRemote.java +++ b/src/org/mxchange/jshopcore/model/category/CategorySessionBeanRemote.java @@ -19,6 +19,7 @@ package org.mxchange.jshopcore.model.category; import java.io.Serializable; import java.util.List; import javax.ejb.Remote; +import org.mxchange.jproduct.model.category.Category; /** * A remote-call interface for the shop @@ -34,4 +35,5 @@ public interface CategorySessionBeanRemote extends Serializable { * @return All categories */ List getAllCategories (); + } diff --git a/src/org/mxchange/jshopcore/model/product/AdminProductSessionBeanRemote.java b/src/org/mxchange/jshopcore/model/product/AdminProductSessionBeanRemote.java index fb24c07..1fd163e 100644 --- a/src/org/mxchange/jshopcore/model/product/AdminProductSessionBeanRemote.java +++ b/src/org/mxchange/jshopcore/model/product/AdminProductSessionBeanRemote.java @@ -19,8 +19,9 @@ package org.mxchange.jshopcore.model.product; import java.io.Serializable; import java.util.List; import javax.ejb.Remote; -import org.mxchange.jshopcore.exceptions.CannotAddProductException; -import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException; +import org.mxchange.jproduct.exceptions.CannotAddProductException; +import org.mxchange.jproduct.exceptions.ProductTitleAlreadyUsedException; +import org.mxchange.jproduct.model.product.Product; /** * Product interface for "ADMIN" role @@ -44,11 +45,9 @@ public interface AdminProductSessionBeanRemote extends Serializable { *

* @return Updated product instance *

- * @throws - * org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException If the - * given product title is already used - * @throws org.mxchange.jshopcore.exceptions.CannotAddProductException If - * something unexpected happened + * @throws ProductTitleAlreadyUsedException If the given product title is + * already used + * @throws CannotAddProductException If something unexpected happened */ Product doAdminAddProduct (final Product product) throws ProductTitleAlreadyUsedException, CannotAddProductException; diff --git a/src/org/mxchange/jshopcore/model/product/ProductSessionBeanRemote.java b/src/org/mxchange/jshopcore/model/product/ProductSessionBeanRemote.java index da63a2f..82974f7 100644 --- a/src/org/mxchange/jshopcore/model/product/ProductSessionBeanRemote.java +++ b/src/org/mxchange/jshopcore/model/product/ProductSessionBeanRemote.java @@ -19,6 +19,7 @@ package org.mxchange.jshopcore.model.product; import java.io.Serializable; import java.util.List; import javax.ejb.Remote; +import org.mxchange.jproduct.model.product.Product; /** * An interface for non-administrative purposes diff --git a/src/org/mxchange/jshopcore/model/receipt/ReceiptBeanRemote.java b/src/org/mxchange/jshopcore/model/receipt/ReceiptBeanRemote.java index 2708ea0..e359807 100644 --- a/src/org/mxchange/jshopcore/model/receipt/ReceiptBeanRemote.java +++ b/src/org/mxchange/jshopcore/model/receipt/ReceiptBeanRemote.java @@ -74,4 +74,5 @@ public interface ReceiptBeanRemote extends Serializable { * @param customer Customer instance */ void setCustomer (final Customer customer); + } diff --git a/src/org/mxchange/jshopcore/model/receipt/WrapableReceipt.java b/src/org/mxchange/jshopcore/model/receipt/WrapableReceipt.java index 90bf7a2..0cc6c1d 100644 --- a/src/org/mxchange/jshopcore/model/receipt/WrapableReceipt.java +++ b/src/org/mxchange/jshopcore/model/receipt/WrapableReceipt.java @@ -24,4 +24,5 @@ import java.io.Serializable; * @author Roland Häder */ public interface WrapableReceipt extends Serializable { + }