removed no longer used jars + switched to jcontacts as this is the model jar

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

diff --git a/PizzaService-ejb/lib/MySQLDriver/mysql-connector-java-5.1.23-bin.jar b/PizzaService-ejb/lib/MySQLDriver/mysql-connector-java-5.1.23-bin.jar
deleted file mode 100644 (file)
index 1f90414..0000000
Binary files a/PizzaService-ejb/lib/MySQLDriver/mysql-connector-java-5.1.23-bin.jar and /dev/null differ

diff --git a/PizzaService-ejb/lib/commons-codec-1.10.jar b/PizzaService-ejb/lib/commons-codec-1.10.jar
deleted file mode 100644 (file)
index 1d7417c..0000000
Binary files a/PizzaService-ejb/lib/commons-codec-1.10.jar and /dev/null differ

diff --git a/PizzaService-ejb/lib/commons-lang3-3.4.jar b/PizzaService-ejb/lib/commons-lang3-3.4.jar
deleted file mode 100644 (file)
index 8ec91d4..0000000
Binary files a/PizzaService-ejb/lib/commons-lang3-3.4.jar and /dev/null differ

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

diff --git a/PizzaService-ejb/lib/log4j-api-2.3.jar b/PizzaService-ejb/lib/log4j-api-2.3.jar
deleted file mode 100644 (file)
index 2a61bbe..0000000
Binary files a/PizzaService-ejb/lib/log4j-api-2.3.jar and /dev/null differ

diff --git a/PizzaService-ejb/lib/log4j-core-2.3.jar b/PizzaService-ejb/lib/log4j-core-2.3.jar
deleted file mode 100644 (file)
index 5438b0b..0000000
Binary files a/PizzaService-ejb/lib/log4j-core-2.3.jar and /dev/null differ

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

diff --git a/PizzaService-ejb/nbproject/build-impl.xml b/PizzaService-ejb/nbproject/build-impl.xml
index 04f7983745db35013e4e0aa0b6cadf6979e0337e..59e452317c1919e7718305c6794cabf4efc52f69 100644 (file)
--- a/PizzaService-ejb/nbproject/build-impl.xml
+++ b/PizzaService-ejb/nbproject/build-impl.xml
@@ -827,44 +827,36 @@ exists or setup the property manually. For example like this:
     <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="${file.reference.jcoreee.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jcore-logger-lib.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="${reference.PizzaService-lib.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}"/>
-        <copyfiles files="${file.reference.log4j-web-2.3.jar}" todir="${build.classes.dir}"/>
     </target>
     <target if="is.server.weblogic" name="-library-inclusion-in-archive-weblogic">
         <basename file="${file.reference.jcoreee.jar}" property="manifest.file.reference.jcoreee.jar"/>
+        <basename file="${file.reference.jcore-logger-lib.jar}" property="manifest.file.reference.jcore-logger-lib.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="${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.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 "/>
+            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 "/>
             <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
-            <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
-            <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
-            <attribute name="jar-4-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
-            <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.cdi-api.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-2-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
+            <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
+            <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
+            <attribute name="jar-5-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
+            <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
         <copyfiles files="${file.reference.jcoreee.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jcore-logger-lib.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="${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.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"/>
         <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 a654e2b1bdddccd828f103d526dc1500f4d32e88..81f553f158273a97095a5e629e1f939458ef3006 100644 (file)
--- a/PizzaService-ejb/nbproject/genfiles.properties
+++ b/PizzaService-ejb/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ 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=1ab785af
-nbproject/build-impl.xml.script.CRC32=9e180a4c
+nbproject/build-impl.xml.data.CRC32=2efd3682
+nbproject/build-impl.xml.script.CRC32=d1bf7afb
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.51.1

diff --git a/PizzaService-ejb/nbproject/project.xml b/PizzaService-ejb/nbproject/project.xml
index d0d57015a4b7a194a66fe2d6cd9c3b258452d090..86e4affccabf097cd362dc1082e84443b2b40eac 100644 (file)
--- a/PizzaService-ejb/nbproject/project.xml
+++ b/PizzaService-ejb/nbproject/project.xml
@@ -1,37 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://www.netbeans.org/ns/project/1">
-       <type>org.netbeans.modules.j2ee.ejbjarproject</type>
-       <configuration>
-               <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">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">reference.PizzaService-lib.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>
-                       <source-roots>
-                               <root id="src.dir"/>
-                       </source-roots>
-                       <test-roots>
-                               <root id="test.src.dir"/>
-                       </test-roots>
-               </data>
-               <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
-                       <definitions>lib/nblibraries.properties</definitions>
-               </libraries>
-               <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-                       <reference>
-                               <foreign-project>PizzaService-lib</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>
+    <type>org.netbeans.modules.j2ee.ejbjarproject</type>
+    <configuration>
+        <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">file.reference.jcoreee.jar</included-library>
+            <included-library dirs="200">file.reference.jcore-logger-lib.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">reference.PizzaService-lib.jar</included-library>
+            <included-library dirs="200">file.reference.cdi-api.jar</included-library>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+            <definitions>lib/nblibraries.properties</definitions>
+        </libraries>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>PizzaService-lib</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>