Changed jcore-ee-logger to a EJB (not really, but maybe this way it works???)

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

diff --git a/PizzaService-ejb/lib/jcore-ee-logger.jar b/PizzaService-ejb/lib/jcore-ee-logger.jar
index 4869b92756a60045e244336477a35716a2b1553b..9dd81bee46a4d292b82751cb33c8e1788c8974ab 100644 (file)
Binary files a/PizzaService-ejb/lib/jcore-ee-logger.jar and b/PizzaService-ejb/lib/jcore-ee-logger.jar differ

diff --git a/PizzaService-ejb/nbproject/build-impl.xml b/PizzaService-ejb/nbproject/build-impl.xml
index c76424d46c19c743b35107ce61d59f97500255b1..9d8bdfad84cb746b9da2970b705ff2760ec32dd4 100644 (file)
--- a/PizzaService-ejb/nbproject/build-impl.xml
+++ b/PizzaService-ejb/nbproject/build-impl.xml
@@ -826,7 +826,6 @@ exists or setup the property manually. For example like this:
     </target>
     <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="${reference.jcore-ee-logger.jar}" todir="${build.classes.dir}"/>
         <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}"/>
@@ -834,7 +833,6 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
     </target>
     <target if="is.server.weblogic" name="-library-inclusion-in-archive-weblogic">
-        <basename file="${reference.jcore-ee-logger.jar}" property="manifest.reference.jcore-ee-logger.jar"/>
         <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"/>
@@ -842,7 +840,6 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.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 "/>
-            <attribute name="jar-1-Extension-Name" value="${manifest.reference.jcore-ee-logger.jar}"/>
             <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcoreee.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}"/>
@@ -851,7 +848,6 @@ exists or setup the property manually. For example like this:
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
-        <copyfiles files="${reference.jcore-ee-logger.jar}" todir="${dist.ear.dir}/lib"/>
         <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"/>

diff --git a/PizzaService-ejb/nbproject/project.properties b/PizzaService-ejb/nbproject/project.properties
index ef740433da9390aa90751f95af7e876f4205661c..0bcb243d31436420611fbab3a7755b79c63ec165 100644 (file)
--- a/PizzaService-ejb/nbproject/project.properties
+++ b/PizzaService-ejb/nbproject/project.properties
@@ -42,7 +42,6 @@ jar.compress=false
 jar.name=PizzaService-ejb.jar
 jars.in.ejbjar=true
 javac.classpath=\
-    ${reference.jcore-ee-logger.jar}:\
     ${file.reference.jcoreee.jar}:\
     ${file.reference.jshop-core.jar}:\
     ${file.reference.jshop-ee-lib.jar}:\
@@ -76,10 +75,8 @@ javadoc.windowtitle=Pizza-Service EJBs
 meta.inf=${source.root}/conf
 meta.inf.excludes=sun-cmp-mappings.xml
 platform.active=default_platform
-project.jcore-ee-logger=../../jcore-ee-logger
 project.license=gpl30
 project.PizzaService-lib=../../PizzaService-lib
-reference.jcore-ee-logger.jar=${project.jcore-ee-logger}/dist/jcore-ee-logger.jar
 reference.PizzaService-lib.jar=${project.PizzaService-lib}/dist/PizzaService-lib.jar
 resource.dir=setup
 run.test.classpath=\

diff --git a/PizzaService-ejb/nbproject/project.xml b/PizzaService-ejb/nbproject/project.xml
index 1f9719fb752f33ec738b318e6e047aa6e2ef162d..7bd1c5c01a5ae93dcaef39b7533760d0a78643f5 100644 (file)
--- a/PizzaService-ejb/nbproject/project.xml
+++ b/PizzaService-ejb/nbproject/project.xml
@@ -5,7 +5,6 @@
         <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">reference.jcore-ee-logger.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>
@@ -33,14 +32,6 @@
                 <clean-target>clean</clean-target>
                 <id>jar</id>
             </reference>
-            <reference>
-                <foreign-project>jcore-ee-logger</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>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index cd334b77cf79da31f9964fd43977e1e637c5207a..c1e734f40d5a11e9b622a2b27d08c471486e478a 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,4 +1,4 @@
-build.xml.data.CRC32=e3137455
+build.xml.data.CRC32=810404e7
 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.

diff --git a/nbproject/project.properties b/nbproject/project.properties
index ad9af24f8055e4a92acec61aa06cbb2c8322b638..c8bd0706a0174a42a27e718cf37a208c735c2f22 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -7,7 +7,6 @@ display.browser=true
 dist.dir=dist
 dist.jar=${dist.dir}/${jar.name}
 endorsed.classpath=
-file.reference.jcore-ee-logger.jar=../jcore-ee-logger/dist/jcore-ee-logger.jar
 j2ee.appclient.mainclass.args=${j2ee.appclient.tool.args}
 j2ee.compile.on.save=true
 j2ee.deploy.on.save=true
@@ -21,9 +20,9 @@ j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 jar.content.additional=\
-    ${file.reference.jcore-ee-logger.jar}:\
     ${reference.jshop-ejb.dist-ear}:\
-    ${reference.PizzaService-ejb.dist-ear}
+    ${reference.PizzaService-ejb.dist-ear}:\
+    ${reference.jcore-ee-logger.dist-ear}
 jar.name=PizzaService.ear
 javac.debug=true
 javac.deprecation=false
@@ -32,8 +31,10 @@ javac.target=1.6
 meta.inf=src/conf
 no.dependencies=false
 platform.active=default_platform
+project.jcore-ee-logger=../jcore-ee-logger
 project.jshop-ejb=../jshop-ejb
 project.PizzaService-ejb=PizzaService-ejb
+reference.jcore-ee-logger.dist-ear=${project.jcore-ee-logger}/dist/jcore-ee-logger.jar
 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

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 874f6db699d40899509b15dbcda507624ba27d9c..a226e43ab135df871046b4e253d05af0c448f78a 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -8,15 +8,15 @@
             <web-module-libraries/>
             <web-module-additional-libraries>
                 <library>
-                    <file>${file.reference.jcore-ee-logger.jar}</file>
+                    <file>${reference.jshop-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
                 <library>
-                    <file>${reference.jshop-ejb.dist-ear}</file>
+                    <file>${reference.PizzaService-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
                 <library>
-                    <file>${reference.PizzaService-ejb.dist-ear}</file>
+                    <file>${reference.jcore-ee-logger.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
             </web-module-additional-libraries>
@@ -30,6 +30,14 @@
                 <clean-target>clean-ear</clean-target>
                 <id>dist-ear</id>
             </reference>
+            <reference>
+                <foreign-project>jcore-ee-logger</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>
             <reference>
                 <foreign-project>jshop-ejb</foreign-project>
                 <artifact-type>j2ee_ear_archive</artifact-type>