From: Roland Haeder <roland@mxchange.org>
Date: Mon, 7 Sep 2015 18:50:18 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=96ffefefc5f2af43c8ab3efe7ac40ad90fb38d07;p=pizzaservice-core.git

Continued:
- updated jcore.jar, jcoreee.jar, jshop-core.jar jshop-ee-lib.jar
- deleted jshop-ejb.jar as this was wrong ...
- got rid of some things that don't work in EJB container ... :-(
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/PizzaService-ejb/lib/jcore.jar b/PizzaService-ejb/lib/jcore.jar
index 636db5c..1e4a78b 100644
Binary files a/PizzaService-ejb/lib/jcore.jar and b/PizzaService-ejb/lib/jcore.jar differ
diff --git a/PizzaService-ejb/lib/jcoreee.jar b/PizzaService-ejb/lib/jcoreee.jar
index 7ab41e1..8ca2e65 100644
Binary files a/PizzaService-ejb/lib/jcoreee.jar and b/PizzaService-ejb/lib/jcoreee.jar differ
diff --git a/PizzaService-ejb/lib/jshop-core.jar b/PizzaService-ejb/lib/jshop-core.jar
index b803106..9ee0879 100644
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
index 7a715b3..a39d20b 100644
Binary files a/PizzaService-ejb/lib/jshop-ee-lib.jar and b/PizzaService-ejb/lib/jshop-ee-lib.jar differ
diff --git a/PizzaService-ejb/lib/jshop-ejb.jar b/PizzaService-ejb/lib/jshop-ejb.jar
deleted file mode 100644
index b6ef330..0000000
Binary files a/PizzaService-ejb/lib/jshop-ejb.jar and /dev/null differ
diff --git a/PizzaService-ejb/nbproject/build-impl.xml b/PizzaService-ejb/nbproject/build-impl.xml
index ead087e..5d9b661 100644
--- a/PizzaService-ejb/nbproject/build-impl.xml
+++ b/PizzaService-ejb/nbproject/build-impl.xml
@@ -831,7 +831,6 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcoreee.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.jshop-ejb.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
         <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}"/>
@@ -843,23 +842,21 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.jcoreee.jar}" property="manifest.file.reference.jcoreee.jar"/>
         <basename file="${file.reference.jshop-core.jar}" property="manifest.file.reference.jshop-core.jar"/>
         <basename file="${file.reference.jshop-ee-lib.jar}" property="manifest.file.reference.jshop-ee-lib.jar"/>
-        <basename file="${file.reference.jshop-ejb.jar}" property="manifest.file.reference.jshop-ejb.jar"/>
         <basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/>
         <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"/>
         <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 "/>
+            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 "/>
             <attribute name="jar-1-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
             <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcore.jar}"/>
             <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
             <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
             <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
-            <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jshop-ejb.jar}"/>
-            <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.cdi-api.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-6-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
+            <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.log4j-api-2.3.jar}"/>
+            <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.log4j-core-2.3.jar}"/>
+            <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.log4j-web-2.3.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -868,7 +865,6 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcoreee.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jshop-ejb.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
         <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"/>
diff --git a/PizzaService-ejb/nbproject/genfiles.properties b/PizzaService-ejb/nbproject/genfiles.properties
index 578e6ce..3f1e3e5 100644
--- a/PizzaService-ejb/nbproject/genfiles.properties
+++ b/PizzaService-ejb/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=2c1622bd
+build.xml.data.CRC32=3acb4892
 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=2c1622bd
-nbproject/build-impl.xml.script.CRC32=ef23a460
+nbproject/build-impl.xml.data.CRC32=3acb4892
+nbproject/build-impl.xml.script.CRC32=eedbb4d3
 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 5c441a0..c1ae070 100644
--- a/PizzaService-ejb/nbproject/project.properties
+++ b/PizzaService-ejb/nbproject/project.properties
@@ -25,7 +25,6 @@ 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
 file.reference.log4j-web-2.3.jar=lib/log4j-web-2.3.jar
@@ -42,14 +41,13 @@ j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 jar.name=PizzaService-ejb.jar
-jars.in.ejbjar=true
+jars.in.ejbjar=false
 javac.classpath=\
     ${reference.PizzaService-lib.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}:\
@@ -94,7 +92,6 @@ 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
 test.src.dir=test
diff --git a/PizzaService-ejb/nbproject/project.xml b/PizzaService-ejb/nbproject/project.xml
index 549512d..bb88ff9 100644
--- a/PizzaService-ejb/nbproject/project.xml
+++ b/PizzaService-ejb/nbproject/project.xml
@@ -10,7 +10,6 @@
             <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>