From fbe8d748a48c419750fcc2775bf85b396d6e2f80 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 4 Sep 2015 23:45:56 +0200 Subject: [PATCH] =?utf8?q?Binded=20to=20jshop-core=20as=20well:=20if=20you?= =?utf8?q?=20use=20jshop,=20always=20use=20jshop-core=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 --- PizzaService-ejb/lib/jshop-core.jar | Bin 0 -> 28048 bytes PizzaService-ejb/nbproject/build-impl.xml | 35 +++++++----------- .../nbproject/genfiles.properties | 6 +-- PizzaService-ejb/nbproject/project.properties | 8 ++-- PizzaService-ejb/nbproject/project.xml | 10 +---- .../tags/basket/MiniBasketTag.java | 4 +- 6 files changed, 24 insertions(+), 39 deletions(-) create mode 100644 PizzaService-ejb/lib/jshop-core.jar diff --git a/PizzaService-ejb/lib/jshop-core.jar b/PizzaService-ejb/lib/jshop-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..4f792b81035d945a232fd0899b34a041b7538133 GIT binary patch literal 28048 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 - - - - - - @@ -832,7 +826,6 @@ exists or setup the property manually. For example like this: - @@ -843,9 +836,9 @@ exists or setup the property manually. For example like this: + - @@ -856,23 +849,23 @@ exists or setup the property manually. For example like this: + - - - - - - - - - - - + + + + + + + + + + + - @@ -883,6 +876,7 @@ exists or setup the property manually. For example like this: + @@ -1267,7 +1261,6 @@ exists or setup the property manually. For example like this: --> - diff --git a/PizzaService-ejb/nbproject/genfiles.properties b/PizzaService-ejb/nbproject/genfiles.properties index 4e22f01..2fce4db 100644 --- a/PizzaService-ejb/nbproject/genfiles.properties +++ b/PizzaService-ejb/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=d34e9153 +build.xml.data.CRC32=e3eaa31e build.xml.script.CRC32=cabe2e92 build.xml.stylesheet.CRC32=5910fda3@1.51.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=d34e9153 -nbproject/build-impl.xml.script.CRC32=c8941b11 +nbproject/build-impl.xml.data.CRC32=e3eaa31e +nbproject/build-impl.xml.script.CRC32=a791b0c6 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.51.1 diff --git a/PizzaService-ejb/nbproject/project.properties b/PizzaService-ejb/nbproject/project.properties index 3a40384..3ae0961 100644 --- a/PizzaService-ejb/nbproject/project.properties +++ b/PizzaService-ejb/nbproject/project.properties @@ -26,6 +26,7 @@ file.reference.commons-codec-1.10.jar=lib/commons-codec-1.10.jar file.reference.commons-lang3-3.4.jar=lib/commons-lang3-3.4.jar file.reference.jcore.jar=lib/jcore.jar file.reference.jsfcore.jar=lib/jsfcore.jar +file.reference.jshop-core.jar=lib/jshop-core.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 @@ -45,7 +46,6 @@ jar.compress=false jar.name=PizzaService-ejb.jar jars.in.ejbjar=false javac.classpath=\ - ${reference.jshop.jar}:\ ${reference.PizzaService-lib.jar}:\ ${file.reference.cdi-api.jar}:\ ${file.reference.commons-codec-1.10.jar}:\ @@ -55,7 +55,8 @@ javac.classpath=\ ${file.reference.jshop.jar}:\ ${file.reference.log4j-api-2.3.jar}:\ ${file.reference.log4j-core-2.3.jar}:\ - ${file.reference.log4j-web-2.3.jar} + ${file.reference.log4j-web-2.3.jar}:\ + ${file.reference.jshop-core.jar} javac.debug=true javac.deprecation=true javac.processorpath=\ @@ -81,10 +82,8 @@ javadoc.windowtitle=Pizza-Service EJBs meta.inf=${source.root}/conf meta.inf.excludes=sun-cmp-mappings.xml platform.active=default_platform -project.jshop=../../jshop project.license=gpl30 project.PizzaService-lib=../../PizzaService-lib -reference.jshop.jar=${project.jshop}/dist/jshop.jar reference.PizzaService-lib.jar=${project.PizzaService-lib}/dist/PizzaService-lib.jar resource.dir=setup run.test.classpath=\ @@ -96,6 +95,7 @@ runmain.jvmargs= source.encoding=UTF-8 source.reference.jcore.jar=../../jcore/src source.reference.jsfcore.jar=../../jsfcore/src/ +source.reference.jshop-core.jar=../../jshop-core/src/ source.reference.jshop.jar=../../jshop/src/ source.root=src src.dir=${source.root}/java diff --git a/PizzaService-ejb/nbproject/project.xml b/PizzaService-ejb/nbproject/project.xml index 125251e..f6efbcd 100644 --- a/PizzaService-ejb/nbproject/project.xml +++ b/PizzaService-ejb/nbproject/project.xml @@ -5,7 +5,6 @@ PizzaService-ejb 1.6.5 - reference.jshop.jar reference.PizzaService-lib.jar file.reference.cdi-api.jar file.reference.commons-codec-1.10.jar @@ -16,6 +15,7 @@ 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 @@ -35,14 +35,6 @@ clean jar - - jshop - jar - - jar - clean - jar - diff --git a/PizzaService-ejb/src/java/org/mxchange/pizzaapplication/tags/basket/MiniBasketTag.java b/PizzaService-ejb/src/java/org/mxchange/pizzaapplication/tags/basket/MiniBasketTag.java index 4365386..d6f1576 100644 --- a/PizzaService-ejb/src/java/org/mxchange/pizzaapplication/tags/basket/MiniBasketTag.java +++ b/PizzaService-ejb/src/java/org/mxchange/pizzaapplication/tags/basket/MiniBasketTag.java @@ -24,8 +24,8 @@ import javax.servlet.jsp.tagext.BodyTagSupport; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.mxchange.jshop.beans.remote.shop.ShopSessionBeanRemote; -import org.mxchange.jshop.model.item.AddableBasketItem; -import org.mxchange.jshop.model.product.Product; +import org.mxchange.jshopcore.model.item.AddableBasketItem; +import org.mxchange.jshopcore.model.product.Product; /** * A basket tag that outputs a small basket and a link to the full basket website. -- 2.39.5