Binded to jshop-core as well: if you use jshop, always use jshop-core

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/PizzaService-ejb/lib/jshop-core.jar b/PizzaService-ejb/lib/jshop-core.jar
new file mode 100644 (file)
index 0000000..4f792b8
Binary files /dev/null and b/PizzaService-ejb/lib/jshop-core.jar differ

diff --git a/PizzaService-ejb/nbproject/build-impl.xml b/PizzaService-ejb/nbproject/build-impl.xml
index 85601fd543229df4adad29fd368bb34d40f1cbf0..8b62fecee3ac58f2fe5d4d307fdf24c5eb0f84d2 100644 (file)
--- a/PizzaService-ejb/nbproject/build-impl.xml
+++ b/PizzaService-ejb/nbproject/build-impl.xml
@@ -809,17 +809,11 @@ exists or setup the property manually. For example like this:
         <ant antfile="${project.PizzaService-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
-        <ant antfile="${project.jshop}/build.xml" inheritall="false" target="jar">
-            <property name="deploy.on.save" value="false"/>
-        </ant>
     </target>
     <target depends="init" if="dist.ear.dir" name="-deps-ear-jar" unless="no.deps">
         <ant antfile="${project.PizzaService-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
-        <ant antfile="${project.jshop}/build.xml" inheritall="false" target="jar">
-            <property name="deploy.on.save" value="false"/>
-        </ant>
     </target>
     <target depends="init, -deps-module-jar, -deps-ear-jar" name="deps-jar"/>
     <target depends="init,deps-jar" name="-pre-pre-compile">
@@ -832,7 +826,6 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="compile,-library-inclusion-in-archive-weblogic,-library-inclusion-in-archive-by-user" name="library-inclusion-in-archive"/>
     <target if="is.jars.in.ejbjar" name="-library-inclusion-in-archive-by-user">
-        <copyfiles files="${reference.jshop.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.PizzaService-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.commons-codec-1.10.jar}" todir="${build.classes.dir}"/>
@@ -843,9 +836,9 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.log4j-api-2.3.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.log4j-core-2.3.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.log4j-web-2.3.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.classes.dir}"/>
     </target>
     <target if="is.server.weblogic" name="-library-inclusion-in-archive-weblogic">
-        <basename file="${reference.jshop.jar}" property="manifest.reference.jshop.jar"/>
         <basename file="${reference.PizzaService-lib.jar}" property="manifest.reference.PizzaService-lib.jar"/>
         <basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/>
         <basename file="${file.reference.commons-codec-1.10.jar}" property="manifest.file.reference.commons-codec-1.10.jar"/>
@@ -856,23 +849,23 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.log4j-api-2.3.jar}" property="manifest.file.reference.log4j-api-2.3.jar"/>
         <basename file="${file.reference.log4j-core-2.3.jar}" property="manifest.file.reference.log4j-core-2.3.jar"/>
         <basename file="${file.reference.log4j-web-2.3.jar}" property="manifest.file.reference.log4j-web-2.3.jar"/>
+        <basename file="${file.reference.jshop-core.jar}" property="manifest.file.reference.jshop-core.jar"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update">
             <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 "/>
-            <attribute name="jar-1-Extension-Name" value="${manifest.reference.jshop.jar}"/>
-            <attribute name="jar-2-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
-            <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
-            <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.commons-codec-1.10.jar}"/>
-            <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.commons-lang3-3.4.jar}"/>
-            <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jcore.jar}"/>
-            <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.jsfcore.jar}"/>
-            <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.jshop.jar}"/>
-            <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.log4j-api-2.3.jar}"/>
-            <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.log4j-core-2.3.jar}"/>
-            <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.log4j-web-2.3.jar}"/>
+            <attribute name="jar-1-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
+            <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
+            <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.commons-codec-1.10.jar}"/>
+            <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.commons-lang3-3.4.jar}"/>
+            <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.jcore.jar}"/>
+            <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jsfcore.jar}"/>
+            <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.jshop.jar}"/>
+            <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.log4j-api-2.3.jar}"/>
+            <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.log4j-core-2.3.jar}"/>
+            <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.log4j-web-2.3.jar}"/>
+            <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
-        <copyfiles files="${reference.jshop.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.PizzaService-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.commons-codec-1.10.jar}" todir="${dist.ear.dir}/lib"/>
@@ -883,6 +876,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.log4j-api-2.3.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.log4j-core-2.3.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.log4j-web-2.3.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jshop-core.jar}" todir="${dist.ear.dir}/lib"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target name="-copy-meta-inf">
@@ -1267,7 +1261,6 @@ exists or setup the property manually. For example like this:
             -->
     <target depends="init" name="deps-clean" unless="no.deps">
         <ant antfile="${project.PizzaService-lib}/build.xml" inheritall="false" target="clean"/>
-        <ant antfile="${project.jshop}/build.xml" inheritall="false" target="clean"/>
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>

diff --git a/PizzaService-ejb/nbproject/genfiles.properties b/PizzaService-ejb/nbproject/genfiles.properties
index 4e22f01fc18f9eded788ca1f81f735e06396994d..2fce4db8ba8d03b03638f9a2384e8617501718ce 100644 (file)
--- 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 3a40384a00a6c940beade30d7e0137911304941e..3ae0961094086eecd9f3bee5f847e73ef5e4ffcf 100644 (file)
--- 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 125251e5b045e808ddbd4c94a557270a5b9343ea..f6efbcd1430596a2d91d2abba3452865035eea21 100644 (file)
--- a/PizzaService-ejb/nbproject/project.xml
+++ b/PizzaService-ejb/nbproject/project.xml
@@ -5,7 +5,6 @@
         <data xmlns="http://www.netbeans.org/ns/j2ee-ejbjarproject/3">
             <name>PizzaService-ejb</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
-            <included-library dirs="200">reference.jshop.jar</included-library>
             <included-library dirs="200">reference.PizzaService-lib.jar</included-library>
             <included-library dirs="200">file.reference.cdi-api.jar</included-library>
             <included-library dirs="200">file.reference.commons-codec-1.10.jar</included-library>
@@ -16,6 +15,7 @@
             <included-library dirs="200">file.reference.log4j-api-2.3.jar</included-library>
             <included-library dirs="200">file.reference.log4j-core-2.3.jar</included-library>
             <included-library dirs="200">file.reference.log4j-web-2.3.jar</included-library>
+            <included-library dirs="200">file.reference.jshop-core.jar</included-library>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>
@@ -35,14 +35,6 @@
                 <clean-target>clean</clean-target>
                 <id>jar</id>
             </reference>
-            <reference>
-                <foreign-project>jshop</foreign-project>
-                <artifact-type>jar</artifact-type>
-                <script>build.xml</script>
-                <target>jar</target>
-                <clean-target>clean</clean-target>
-                <id>jar</id>
-            </reference>
         </references>
     </configuration>
 </project>

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 436538600c4aeb6b783b8de1678b2040b4bd45c7..d6f157602bc33f7b58c25fe7c55fd6974ad1e74e 100644 (file)
--- 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.