updated jcore.jar + jshop-core.jar + added jshop-ee-lib.jar (maybe not needed here...

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

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

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

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

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 76bf30586e6bfbeda549e1716324ede1881834e9..206bd6493a5ae631a28e03a10ddf9d50ff4e9ad0 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,4 +1,4 @@
-build.xml.data.CRC32=ff1dc0da
+build.xml.data.CRC32=1edfee4e
 build.xml.script.CRC32=82213886
 build.xml.stylesheet.CRC32=651128d4@1.68.1.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 86ee86fbe1f624d173f90ef4d53261d1b381086b..c8f807dd5fa102e39b7918825307b9dbbfaa694e 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -29,13 +29,11 @@ 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.gf-client.jar=lib/gf-client.jar
 file.reference.jcore.jar=lib/jcore.jar
 file.reference.jcoreee.jar=lib/jcoreee.jar
 file.reference.jshop-core.jar=lib/jshop-core.jar
-file.reference.jshop-ejb.jar=lib/jshop-ejb.jar
+file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.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
@@ -53,15 +51,13 @@ j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 javac.classpath=\
+    ${reference.PizzaService-lib.jar}:\
     ${file.reference.jcore.jar}:\
     ${file.reference.jcoreee.jar}:\
     ${file.reference.jshop-core.jar}:\
-    ${file.reference.jshop-ejb.jar}:\
-    ${reference.PizzaService-lib.jar}:\
+    ${file.reference.jshop-ee-lib.jar}:\
     ${file.reference.cdi-api.jar}:\
     ${file.reference.gf-client.jar}:\
-    ${file.reference.commons-codec-1.10.jar}:\
-    ${file.reference.commons-lang3-3.4.jar}:\
     ${file.reference.log4j-api-2.3.jar}:\
     ${file.reference.log4j-core-2.3.jar}:\
     ${file.reference.log4j-web-2.3.jar}
@@ -106,7 +102,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-ejb.jar=../jshop-ejb/src/
+source.reference.jshop-ee-lib.jar=../jshop-ee-lib/src/
 source.root=src
 src.dir=${source.root}/java
 test.src.dir=test

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 53d981aeb66539627dae41ff0a52d250a3090073..dee8330a3db86865cef696812d1c25ab0a3134c1 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -6,6 +6,10 @@
             <name>PizzaService-war</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <web-module-libraries>
+                <library dirs="200">
+                    <file>${reference.PizzaService-lib.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
                 <library dirs="200">
                     <file>${file.reference.jcore.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
@@ -19,7 +23,7 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${reference.PizzaService-lib.jar}</file>
+                    <file>${file.reference.jshop-ee-lib.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
@@ -30,14 +34,6 @@
                     <file>${file.reference.gf-client.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library dirs="200">
-                    <file>${file.reference.commons-codec-1.10.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.commons-lang3-3.4.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
                 <library dirs="200">
                     <file>${file.reference.log4j-api-2.3.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
@@ -50,10 +46,6 @@
                     <file>${file.reference.log4j-web-2.3.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library dirs="200">
-                    <file>${file.reference.jshop-ejb.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>