updated jcore.jar + jshop-core.jar + some other updates, e.g. commons removed

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

diff --git a/PizzaService-ejb/lib/jcore.jar b/PizzaService-ejb/lib/jcore.jar
index 512369dc27f7a8c58957c276db1d90814d7fc208..ad765c651eedef6a31b4c2d1ed677896302df52a 100644 (file)
Binary files a/PizzaService-ejb/lib/jcore.jar and b/PizzaService-ejb/lib/jcore.jar differ

diff --git a/PizzaService-ejb/lib/jshop-core.jar b/PizzaService-ejb/lib/jshop-core.jar
index 48fd3ca3fe4a82a743209c7ba894bf4001565e44..9cd4e02eec23678180f92732ad8202bfc26aa750 100644 (file)
Binary files a/PizzaService-ejb/lib/jshop-core.jar and b/PizzaService-ejb/lib/jshop-core.jar differ

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

diff --git a/PizzaService-ejb/nbproject/genfiles.properties b/PizzaService-ejb/nbproject/genfiles.properties
index 177434f210e3c9b07f6d3dce8caf10d5ecfc007e..cefb34dd3bfe4a120d3679c185e4bf4812fc9003 100644 (file)
--- a/PizzaService-ejb/nbproject/genfiles.properties
+++ b/PizzaService-ejb/nbproject/genfiles.properties
@@ -1,4 +1,4 @@
-build.xml.data.CRC32=d7151c79
+build.xml.data.CRC32=b3168396
 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.

diff --git a/PizzaService-ejb/nbproject/project.properties b/PizzaService-ejb/nbproject/project.properties
index f1abe2ed903f7413f42ae5d35faa58c980b19be3..56852b83bd8200b431b55eb8d4cac96abbea27d1 100644 (file)
--- a/PizzaService-ejb/nbproject/project.properties
+++ b/PizzaService-ejb/nbproject/project.properties
@@ -22,11 +22,10 @@ endorsed.classpath=\
     ${libs.javaee-endorsed-api-6.0.classpath}
 excludes=
 file.reference.cdi-api.jar=lib/cdi-api.jar
-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.jcoreee.jar=lib/jcoreee.jar
 file.reference.jcore.jar=lib/jcore.jar
 file.reference.jshop-core.jar=lib/jshop-core.jar
+file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.jar
 file.reference.jshop-ejb.jar=lib/jshop-ejb.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
@@ -47,16 +46,15 @@ jar.name=PizzaService-ejb.jar
 jars.in.ejbjar=false
 javac.classpath=\
     ${reference.PizzaService-lib.jar}:\
-    ${file.reference.cdi-api.jar}:\
-    ${file.reference.commons-codec-1.10.jar}:\
-    ${file.reference.commons-lang3-3.4.jar}:\
     ${file.reference.jcore.jar}:\
+    ${file.reference.jcoreee.jar}:\
+    ${file.reference.jshop-core.jar}:\
+    ${file.reference.jshop-ee-lib.jar}:\
+    ${file.reference.jshop-ejb.jar}:\
+    ${file.reference.cdi-api.jar}:\
     ${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}:\
-    ${file.reference.jcoreee.jar}:\
-    ${file.reference.jshop-ejb.jar}
+    ${file.reference.log4j-web-2.3.jar}
 javac.debug=true
 javac.deprecation=true
 javac.processorpath=\
@@ -96,6 +94,7 @@ source.encoding=UTF-8
 source.reference.jcore.jar=../../jcore/src
 source.reference.jcoreee.jar=../../jcoreee/src/
 source.reference.jshop-core.jar=../../jshop-core/src/
+source.reference.jshop-ee-lib.jar=../../jshop-ee-lib/src/
 source.reference.jshop-ejb.jar=../../jshop-ejb/src/
 source.root=src
 src.dir=${source.root}/java

diff --git a/PizzaService-ejb/nbproject/project.xml b/PizzaService-ejb/nbproject/project.xml
index acb8f8b8f127f7f1832f53c12dd9fbdd7b4dea46..549512d17b25785caaf15cbdd5a3f741522ebeb0 100644 (file)
--- a/PizzaService-ejb/nbproject/project.xml
+++ b/PizzaService-ejb/nbproject/project.xml
@@ -6,16 +6,15 @@
             <name>PizzaService-ejb</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <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>
-            <included-library dirs="200">file.reference.commons-lang3-3.4.jar</included-library>
             <included-library dirs="200">file.reference.jcore.jar</included-library>
+            <included-library dirs="200">file.reference.jcoreee.jar</included-library>
+            <included-library dirs="200">file.reference.jshop-core.jar</included-library>
+            <included-library dirs="200">file.reference.jshop-ee-lib.jar</included-library>
+            <included-library dirs="200">file.reference.jshop-ejb.jar</included-library>
+            <included-library dirs="200">file.reference.cdi-api.jar</included-library>
             <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>
-            <included-library dirs="200">file.reference.jcoreee.jar</included-library>
-            <included-library dirs="200">file.reference.jshop-ejb.jar</included-library>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 277898f2c501b2ec847939b3f8064679a4f2695a..f15258b582b7b439dfe7a1b5e52ca82e0d3fbad7 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -205,6 +205,10 @@ exists or setup the property manually. For example like this:
             <property location="${build.dir}" name="dist.ear.dir"/>
             <property name="deploy.on.save" value="${build.deploy.on.save}"/>
         </ant>
+        <ant antfile="${project.jshop-ejb}/build.xml" inheritall="false" target="dist-ear">
+            <property location="${build.dir}" name="dist.ear.dir"/>
+            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
+        </ant>
     </target>
     <target depends="init,deps-jar,deps-j2ee-archive" name="pre-pre-compile"/>
     <target name="pre-compile">
@@ -218,6 +222,7 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,deps-jar,pre-pre-compile,pre-compile" name="-do-compile-deps">
         <copyfiles files="${reference.PizzaService-ejb.dist-ear}" todir="${build.dir}//"/>
+        <copyfiles files="${reference.jshop-ejb.dist-ear}" todir="${build.dir}//"/>
     </target>
     <target name="post-compile">
         <!-- Empty placeholder for easier customization. -->
@@ -295,6 +300,7 @@ exists or setup the property manually. For example like this:
     <target name="-run-deploy-am" unless="no.deps">
         <!-- Task to deploy to the Access Manager runtime. -->
         <ant antfile="${project.PizzaService-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
+        <ant antfile="${project.jshop-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
     </target>
     <target depends="-init-cos,dist-directory-deploy,pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,post-run-deploy" name="run-deploy"/>
     <target if="netbeans.home" name="-run-deploy-nb">
@@ -623,6 +629,10 @@ exists or setup the property manually. For example like this:
             <property location="${build.dir}" name="dist.ear.dir"/>
             <property name="deploy.on.save" value="${build.deploy.on.save}"/>
         </ant>
+        <ant antfile="${project.jshop-ejb}/build.xml" inheritall="false" target="clean-ear">
+            <property location="${build.dir}" name="dist.ear.dir"/>
+            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
+        </ant>
     </target>
     <target depends="init" name="do-clean">
         <delete dir="${build.dir}"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 949b84dfdd33b49747939c648a1ac96ffc2ab84f..16a6e787d2ac2aaade7223f5a75766fcdaf3b0c1 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=d066c1f0
+build.xml.data.CRC32=df8eee8a
 build.xml.script.CRC32=8e3e9528
 build.xml.stylesheet.CRC32=a5d15b16@1.49.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=d066c1f0
-nbproject/build-impl.xml.script.CRC32=ec434f5f
+nbproject/build-impl.xml.data.CRC32=df8eee8a
+nbproject/build-impl.xml.script.CRC32=249f8ab6
 nbproject/build-impl.xml.stylesheet.CRC32=5eea63a6@1.49.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 96106b4b06792e003d8deb9e8be38f9b7e00f37b..3811594524f8cd9c0b5cf3f8c5f0fe96c3762564 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -21,7 +21,8 @@ j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 jar.content.additional=\
-    ${reference.PizzaService-ejb.dist-ear}
+    ${reference.PizzaService-ejb.dist-ear}:\
+    ${reference.jshop-ejb.dist-ear}
 jar.name=PizzaService.ear
 javac.debug=true
 javac.deprecation=false
@@ -30,7 +31,9 @@ javac.target=1.6
 meta.inf=src/conf
 no.dependencies=false
 platform.active=default_platform
+project.jshop-ejb=../../MyProjects/jshop-ejb
 project.PizzaService-ejb=PizzaService-ejb
+reference.jshop-ejb.dist-ear=${project.jshop-ejb}/dist/jshop-ejb.jar
 reference.PizzaService-ejb.dist-ear=${project.PizzaService-ejb}/dist/PizzaService-ejb.jar
 resource.dir=setup
 run.classpath=

diff --git a/nbproject/project.xml b/nbproject/project.xml
index b552f0e0f84a460ac096942c8ad4a585e5ffbd36..6639f51fa5984d9c4beef29dd742bb2326788845 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -11,6 +11,10 @@
                     <file>${reference.PizzaService-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
+                <library>
+                    <file>${reference.jshop-ejb.dist-ear}</file>
+                    <path-in-war>/</path-in-war>
+                </library>
             </web-module-additional-libraries>
         </data>
         <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
@@ -22,6 +26,14 @@
                 <clean-target>clean-ear</clean-target>
                 <id>dist-ear</id>
             </reference>
+            <reference>
+                <foreign-project>jshop-ejb</foreign-project>
+                <artifact-type>j2ee_ear_archive</artifact-type>
+                <script>build.xml</script>
+                <target>dist-ear</target>
+                <clean-target>clean-ear</clean-target>
+                <id>dist-ear</id>
+            </reference>
         </references>
     </configuration>
 </project>