Ignored backup files + updated jars + renamed projects

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

diff --git a/.gitignore b/.gitignore
index 50aae3025a87db523e371832c836d370ca0d8ca3..197e836fd9515cb28794fb93b1447c8127d80d66 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,4 @@
 /PizzaService-ejb/build/
 /PizzaService-ejb/dist/
 /PizzaService-ejb/nbproject/private/
-/PizzaService-war/build/
-/PizzaService-war/data/*.*
-/PizzaService-war/dist/
-/PizzaService-war/nbproject/private/
-/PizzaService-war/config.properties
+/*/*/*~

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

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

diff --git a/PizzaService-ejb/lib/jsfcore.jar b/PizzaService-ejb/lib/jsfcore.jar
deleted file mode 100644 (file)
index c854dee..0000000
Binary files a/PizzaService-ejb/lib/jsfcore.jar and /dev/null differ

diff --git a/PizzaService-ejb/lib/jshop-core.jar b/PizzaService-ejb/lib/jshop-core.jar
index 4f792b81035d945a232fd0899b34a041b7538133..48fd3ca3fe4a82a743209c7ba894bf4001565e44 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-ejb.jar b/PizzaService-ejb/lib/jshop-ejb.jar
new file mode 100644 (file)
index 0000000..0ba207f
Binary files /dev/null and b/PizzaService-ejb/lib/jshop-ejb.jar differ

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

diff --git a/PizzaService-ejb/nbproject/build-impl.xml b/PizzaService-ejb/nbproject/build-impl.xml
index 8b62fecee3ac58f2fe5d4d307fdf24c5eb0f84d2..d85ff1663fc4b003da9fab8920a2d7c0f8846a5f 100644 (file)
--- a/PizzaService-ejb/nbproject/build-impl.xml
+++ b/PizzaService-ejb/nbproject/build-impl.xml
@@ -831,12 +831,12 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.commons-codec-1.10.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.commons-lang3-3.4.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcore.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.jsfcore.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.jshop.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}"/>
         <copyfiles files="${file.reference.log4j-web-2.3.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jcore-ejb.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jshop-ejb.jar}" todir="${build.classes.dir}"/>
     </target>
     <target if="is.server.weblogic" name="-library-inclusion-in-archive-weblogic">
         <basename file="${reference.PizzaService-lib.jar}" property="manifest.reference.PizzaService-lib.jar"/>
@@ -844,12 +844,12 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.commons-codec-1.10.jar}" property="manifest.file.reference.commons-codec-1.10.jar"/>
         <basename file="${file.reference.commons-lang3-3.4.jar}" property="manifest.file.reference.commons-lang3-3.4.jar"/>
         <basename file="${file.reference.jcore.jar}" property="manifest.file.reference.jcore.jar"/>
-        <basename file="${file.reference.jsfcore.jar}" property="manifest.file.reference.jsfcore.jar"/>
-        <basename file="${file.reference.jshop.jar}" property="manifest.file.reference.jshop.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"/>
         <basename file="${file.reference.jshop-core.jar}" property="manifest.file.reference.jshop-core.jar"/>
+        <basename file="${file.reference.jcore-ejb.jar}" property="manifest.file.reference.jcore-ejb.jar"/>
+        <basename file="${file.reference.jshop-ejb.jar}" property="manifest.file.reference.jshop-ejb.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.PizzaService-lib.jar}"/>
@@ -857,12 +857,12 @@ exists or setup the property manually. For example like this:
             <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}"/>
+            <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.log4j-api-2.3.jar}"/>
+            <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.log4j-core-2.3.jar}"/>
+            <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.log4j-web-2.3.jar}"/>
+            <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
+            <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.jcore-ejb.jar}"/>
+            <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.jshop-ejb.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -871,12 +871,12 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.commons-codec-1.10.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.commons-lang3-3.4.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcore.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jsfcore.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jshop.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"/>
         <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"/>
+        <copyfiles files="${file.reference.jcore-ejb.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jshop-ejb.jar}" todir="${dist.ear.dir}/lib"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target name="-copy-meta-inf">

diff --git a/PizzaService-ejb/nbproject/genfiles.properties b/PizzaService-ejb/nbproject/genfiles.properties
index 2fce4db8ba8d03b03638f9a2384e8617501718ce..9b437e9347fb3ce4a1de3d9f9716e61ecd92993e 100644 (file)
--- a/PizzaService-ejb/nbproject/genfiles.properties
+++ b/PizzaService-ejb/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=e3eaa31e
+build.xml.data.CRC32=5a798003
 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=e3eaa31e
-nbproject/build-impl.xml.script.CRC32=a791b0c6
+nbproject/build-impl.xml.data.CRC32=5a798003
+nbproject/build-impl.xml.script.CRC32=04ee0484
 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 3ae0961094086eecd9f3bee5f847e73ef5e4ffcf..ede5b60bb5c27333ab444579d8ee657689530d86 100644 (file)
--- a/PizzaService-ejb/nbproject/project.properties
+++ b/PizzaService-ejb/nbproject/project.properties
@@ -24,10 +24,10 @@ 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.jcore-ejb.jar=lib/jcore-ejb.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.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
@@ -51,12 +51,12 @@ javac.classpath=\
     ${file.reference.commons-codec-1.10.jar}:\
     ${file.reference.commons-lang3-3.4.jar}:\
     ${file.reference.jcore.jar}:\
-    ${file.reference.jsfcore.jar}:\
-    ${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.jshop-core.jar}
+    ${file.reference.jshop-core.jar}:\
+    ${file.reference.jcore-ejb.jar}:\
+    ${file.reference.jshop-ejb.jar}
 javac.debug=true
 javac.deprecation=true
 javac.processorpath=\
@@ -93,10 +93,10 @@ run.test.classpath=\
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
 runmain.jvmargs=
 source.encoding=UTF-8
+source.reference.jcore-ejb.jar=../jcore-ejb/src/
 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.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 f6efbcd1430596a2d91d2abba3452865035eea21..560a51da1320f18e9ee22b7bebfc34547bd273bc 100644 (file)
--- a/PizzaService-ejb/nbproject/project.xml
+++ b/PizzaService-ejb/nbproject/project.xml
@@ -10,12 +10,12 @@
             <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.jsfcore.jar</included-library>
-            <included-library dirs="200">file.reference.jshop.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.jcore-ejb.jar</included-library>
+            <included-library dirs="200">file.reference.jshop-ejb.jar</included-library>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>