Continued:

- updated jcore.jar, jcoreee.jar, jshop-core.jar, jshop-ee-lib.jar
- added jcore-ee-logger.jar
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
new file mode 100644 (file)
index 0000000..4869b92
Binary files /dev/null and b/PizzaService-ejb/lib/jcore-ee-logger.jar differ

diff --git a/PizzaService-ejb/lib/jcore.jar b/PizzaService-ejb/lib/jcore.jar
index 7318d475bd60750789a5af0d8c58471ad7d4f1d8..217c364fc77db0e54d31c837de5517fdce382fb0 100644 (file)
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 f479cd85f681296c81d035819d67d492850194ec..9f0039fef5c5783f9feefb340c1781b104232d23 100644 (file)
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 9965f385e61d36baf52fba5fce71f241d62a54ea..3772ba4f64521091bb8321d30622e5475449b72d 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-ee-lib.jar b/PizzaService-ejb/lib/jshop-ee-lib.jar
index 54ab89b53838c3734cca1275258252fce03841f1..7b5364022b09a7af86a6f90ceecc825c6c3a74dd 100644 (file)
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/nbproject/build-impl.xml b/PizzaService-ejb/nbproject/build-impl.xml
index ecaef8cf6890b94b0c594f638bba658a425ca4b7..c76424d46c19c743b35107ce61d59f97500255b1 100644 (file)
--- a/PizzaService-ejb/nbproject/build-impl.xml
+++ b/PizzaService-ejb/nbproject/build-impl.xml
@@ -826,36 +826,36 @@ 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.PizzaService-lib.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.jcore.jar}" todir="${build.classes.dir}"/>
+        <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}"/>
+        <copyfiles files="${reference.PizzaService-lib.jar}" todir="${build.classes.dir}"/>
         <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.PizzaService-lib.jar}" property="manifest.reference.PizzaService-lib.jar"/>
-        <basename file="${file.reference.jcore.jar}" property="manifest.file.reference.jcore.jar"/>
+        <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"/>
+        <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"/>
         <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.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-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}"/>
+            <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="${reference.PizzaService-lib.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jcore.jar}" todir="${dist.ear.dir}/lib"/>
+        <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"/>
+        <copyfiles files="${reference.PizzaService-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>

diff --git a/PizzaService-ejb/nbproject/genfiles.properties b/PizzaService-ejb/nbproject/genfiles.properties
index 69ff75f4067f52292120796086d52a2ce18e6a54..bc528c3215b36749709e40c33bd82eecfbad7426 100644 (file)
--- a/PizzaService-ejb/nbproject/genfiles.properties
+++ b/PizzaService-ejb/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=669ce18d
+build.xml.data.CRC32=ee74bfea
 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=669ce18d
-nbproject/build-impl.xml.script.CRC32=64ac5c69
+nbproject/build-impl.xml.data.CRC32=4737abf6
+nbproject/build-impl.xml.script.CRC32=09b65c61
 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 3dcedccfc2d90977d9c78be0ca03cd1cd6a8bd81..ef740433da9390aa90751f95af7e876f4205661c 100644 (file)
--- a/PizzaService-ejb/nbproject/project.properties
+++ b/PizzaService-ejb/nbproject/project.properties
@@ -22,14 +22,16 @@ endorsed.classpath=
 excludes=
 file.reference.cdi-api.jar=lib/cdi-api.jar
 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.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
 includes=**
 j2ee.compile.on.save=true
 j2ee.deploy.on.save=true
 j2ee.platform=1.7
-j2ee.platform.classpath=${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar
+j2ee.platform.classpath=${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.persistence.jar
 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
 j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
@@ -40,12 +42,15 @@ jar.compress=false
 jar.name=PizzaService-ejb.jar
 jars.in.ejbjar=true
 javac.classpath=\
-    ${reference.PizzaService-lib.jar}:\
-    ${file.reference.jcore.jar}:\
+    ${reference.jcore-ee-logger.jar}:\
     ${file.reference.jcoreee.jar}:\
     ${file.reference.jshop-core.jar}:\
     ${file.reference.jshop-ee-lib.jar}:\
-    ${file.reference.cdi-api.jar}
+    ${reference.PizzaService-lib.jar}:\
+    ${file.reference.cdi-api.jar}:\
+    ${file.reference.log4j-api-2.3.jar}:\
+    ${file.reference.log4j-core-2.3.jar}:\
+    ${file.reference.log4j-web-2.3.jar}
 javac.debug=true
 javac.deprecation=true
 javac.processorpath=\
@@ -71,8 +76,10 @@ 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=\
@@ -82,7 +89,6 @@ 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.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/

diff --git a/PizzaService-ejb/nbproject/project.xml b/PizzaService-ejb/nbproject/project.xml
index ed392fc85d525d15d5d7227112b7e353f8c5021b..1f9719fb752f33ec738b318e6e047aa6e2ef162d 100644 (file)
--- a/PizzaService-ejb/nbproject/project.xml
+++ b/PizzaService-ejb/nbproject/project.xml
@@ -5,12 +5,15 @@
         <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.PizzaService-lib.jar</included-library>
-            <included-library dirs="200">file.reference.jcore.jar</included-library>
+            <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>
+            <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>
@@ -30,6 +33,14 @@
                 <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/build-impl.xml b/nbproject/build-impl.xml
index 9115fac4a87cb2dfcdab333e7e1919e45275d9ed..f15258b582b7b439dfe7a1b5e52ca82e0d3fbad7 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -205,10 +205,6 @@ exists or setup the property manually. For example like this:
             <property location="${build.dir}" name="dist.ear.dir"/>
             <property name="deploy.on.save" value="${build.deploy.on.save}"/>
         </ant>
-        <ant antfile="${project.jcore-ee-logger}/build.xml" inheritall="false" target="dist-ear">
-            <property location="${build.dir}" name="dist.ear.dir"/>
-            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
-        </ant>
         <ant antfile="${project.jshop-ejb}/build.xml" inheritall="false" target="dist-ear">
             <property location="${build.dir}" name="dist.ear.dir"/>
             <property name="deploy.on.save" value="${build.deploy.on.save}"/>
@@ -227,7 +223,6 @@ exists or setup the property manually. For example like this:
     <target depends="init,deps-jar,pre-pre-compile,pre-compile" name="-do-compile-deps">
         <copyfiles files="${reference.PizzaService-ejb.dist-ear}" todir="${build.dir}//"/>
         <copyfiles files="${reference.jshop-ejb.dist-ear}" todir="${build.dir}//"/>
-        <copyfiles files="${reference.jcore-ee-logger.dist-ear}" todir="${build.dir}//"/>
     </target>
     <target name="post-compile">
         <!-- Empty placeholder for easier customization. -->
@@ -305,7 +300,6 @@ exists or setup the property manually. For example like this:
     <target name="-run-deploy-am" unless="no.deps">
         <!-- Task to deploy to the Access Manager runtime. -->
         <ant antfile="${project.PizzaService-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
-        <ant antfile="${project.jcore-ee-logger}/build.xml" inheritall="false" target="-run-deploy-am"/>
         <ant antfile="${project.jshop-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
     </target>
     <target depends="-init-cos,dist-directory-deploy,pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,post-run-deploy" name="run-deploy"/>
@@ -635,10 +629,6 @@ exists or setup the property manually. For example like this:
             <property location="${build.dir}" name="dist.ear.dir"/>
             <property name="deploy.on.save" value="${build.deploy.on.save}"/>
         </ant>
-        <ant antfile="${project.jcore-ee-logger}/build.xml" inheritall="false" target="clean-ear">
-            <property location="${build.dir}" name="dist.ear.dir"/>
-            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
-        </ant>
         <ant antfile="${project.jshop-ejb}/build.xml" inheritall="false" target="clean-ear">
             <property location="${build.dir}" name="dist.ear.dir"/>
             <property name="deploy.on.save" value="${build.deploy.on.save}"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 1d9adae72f6329f55127fd80bf9ad7c38dbb96f7..cd334b77cf79da31f9964fd43977e1e637c5207a 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,4 +1,4 @@
-build.xml.data.CRC32=6fa7b0ea
+build.xml.data.CRC32=e3137455
 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 e4902b6a5e12ac99fcd705cb0ca016ffc6466eb9..ad9af24f8055e4a92acec61aa06cbb2c8322b638 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -6,11 +6,13 @@ debug.classpath=${javac.classpath}::${jar.content.additional}:${run.classpath}
 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
 j2ee.platform=1.7
-j2ee.platform.classpath=${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar
+j2ee.platform.classpath=${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.persistence.jar
 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
 j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
@@ -19,9 +21,9 @@ j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 jar.content.additional=\
-    ${reference.PizzaService-ejb.dist-ear}:\
+    ${file.reference.jcore-ee-logger.jar}:\
     ${reference.jshop-ejb.dist-ear}:\
-    ${reference.jcore-ee-logger.dist-ear}
+    ${reference.PizzaService-ejb.dist-ear}
 jar.name=PizzaService.ear
 javac.debug=true
 javac.deprecation=false
@@ -30,10 +32,8 @@ 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=../../MyProjects/jshop-ejb
+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 f41940906ef89e7b9337a14a09412756548297d5..874f6db699d40899509b15dbcda507624ba27d9c 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -8,7 +8,7 @@
             <web-module-libraries/>
             <web-module-additional-libraries>
                 <library>
-                    <file>${reference.PizzaService-ejb.dist-ear}</file>
+                    <file>${file.reference.jcore-ee-logger.jar}</file>
                     <path-in-war>/</path-in-war>
                 </library>
                 <library>
@@ -16,7 +16,7 @@
                     <path-in-war>/</path-in-war>
                 </library>
                 <library>
-                    <file>${reference.jcore-ee-logger.dist-ear}</file>
+                    <file>${reference.PizzaService-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
             </web-module-additional-libraries>
@@ -30,14 +30,6 @@
                 <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>