From 48cd110fb489b94b8399f683fff451236885e827 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Tue, 8 Sep 2015 15:40:21 +0200
Subject: [PATCH] =?utf8?q?More=20cleanup=20Signed-off-by:Roland=20H=C3=A4d?=
=?utf8?q?er=20<roland@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
PizzaService-ejb/lib/jcore.jar | Bin 29128 -> 28933 bytes
PizzaService-ejb/lib/jcoreee.jar | Bin 19148 -> 20298 bytes
PizzaService-ejb/lib/jshop-core.jar | Bin 27111 -> 27473 bytes
PizzaService-ejb/lib/jshop-ee-lib.jar | Bin 4954 -> 6200 bytes
PizzaService-ejb/nbproject/build-impl.xml | 14 +-------------
.../nbproject/genfiles.properties | 6 +++---
PizzaService-ejb/nbproject/project.properties | 12 +++---------
PizzaService-ejb/nbproject/project.xml | 3 ---
nbproject/build-impl.xml | 10 ++++++++++
nbproject/genfiles.properties | 6 +++---
nbproject/project.properties | 7 +++++--
nbproject/project.xml | 12 ++++++++++++
12 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/PizzaService-ejb/lib/jcore.jar b/PizzaService-ejb/lib/jcore.jar
index 1e4a78b02a1d9abd48a4b7cb5e7a53a763af1d77..7318d475bd60750789a5af0d8c58471ad7d4f1d8 100644
GIT binary patch
delta 4593
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
H4Ls>%1`)(l
delta 4620
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
diff --git a/PizzaService-ejb/lib/jcoreee.jar b/PizzaService-ejb/lib/jcoreee.jar
index 8ca2e654a8157faafa7d25129213826ad0fb455e..f479cd85f681296c81d035819d67d492850194ec 100644
GIT binary patch
delta 5351
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
delta 4433
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
Xe^*4uHE+-xgs(XIk4u2NQat?!Co&z}
diff --git a/PizzaService-ejb/lib/jshop-core.jar b/PizzaService-ejb/lib/jshop-core.jar
index 9ee0879fac0a644866093a69ea4df2b803b3e93c..9965f385e61d36baf52fba5fce71f241d62a54ea 100644
GIT binary patch
literal 27473
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
HYkc>=wJVTD
literal 27111
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
diff --git a/PizzaService-ejb/lib/jshop-ee-lib.jar b/PizzaService-ejb/lib/jshop-ee-lib.jar
index a39d20b33853c0a6d41fe183a9470adc7cba7c79..54ab89b53838c3734cca1275258252fce03841f1 100644
GIT binary patch
delta 1334
zcmcbmw!?roz?+$ci-CcIfq}0^V<N8x2XBpr`(csvxf5+OS<Q8m3=Ai(R%QmtU6cn?
zpEU%5Ja+~pAU63SqnKP)l0J%IC`x2NN>qSKl2Q}%it#8^1}T(<D=bRQ%`ZtsRX=$n
zlL}+jWCdoi$pTDVAV*EU%m@;3VN$|yn+C`{pxgu|Ih=AgaLE~<yQ3tvxCGTP?o-Nb
zdJUKv7(mz^V%cT|W*a6($H@yBg~9IBoxFhcJ=k`yNy0NY7=ghJ#NJSsRkIsTejvy;
z`2$-CqbpQTHG3ymz23ytS!aQ2LD&KA6OqX~g(QILIX5SBC^IrzK{ZWa0!au>KFnDF
z*36{h8oUPRDiC&tx-6E<n2FIAsv(w3bMpnB97ai`B;fulh;Q}^pbijr1nCmT8VJ6X
zlg|r^gB>xIYb_(Q1W-Vl-ILK8WHv4>oA>jyGlC<`lg|R4(k6HES%C$Q@#%x<AAA-V
zaV0j{kzYj*=#&6&MkWzvc#=g;W$;8P!0^`5b@D@gF%!7!@o7{>(O3`C2#mR3{L*0e
zoD+~{JOC8~raB#bCh4G<#KAOqA)6@BsO17G3h3EJ14U^NOz8wBF)iF)MAb9{rYTxb
zfq?n<z)BtA!2!)#&=ieoAxfHtyOM!nNuvrg)I$o)#@guNfRegVwC$WMC<F>oNLm*H
zI~65uqo~&6fLa1c(U6csNzEwAL%E>JW4ZJ(;szx-qi9Rw18KvRRDr2mQiPQaq(cx0
Mcd{}tWD0?J01Ma^761SM
delta 1066
zcmdmCa7&Fhz?+$ci-CcIfuUlN`b1t0j`Bt7?k|K=mrS(HWHr@IGB%pHTA3LrIPs!9
znEI?C2vWj;1SBRWFp4Rp=42-6BaA~=BnMKY23C}mnwVFNN2w}EDKk*%<c*AyAWJ8U
zGO3s#X)Q|4%`ZvSPf9G#PA$P>kRIHixndGXUIiI>mQh6o)5w&>l0;MkK?=ccImILg
z_PKuR-aaE{1_luJgj=8?X1uwRnUjgpd2*w$Fj#|znC|5N0<M!K*;auyJ`7Nv&c(>U
z0K&d-jdR7!Co8d+FuKF_%@s2Q>eHGm$;CTam_re)SMJ^WJ?DY?K-dYUcXJF!1S6vj
zTw@G}+T{0~1z-)b^G-9Z1G*4|U11s~pXbrsyn&00iP0XWY4drWsf?4eg}9i3@jtmj
z$O4`KChrik0tfzAA$>5dE^Gld8Y$)(BqkRKs~CdAF~FOVNrV}amM|h8u1A33t)n~R
z<U~eMbEMG6r&kq4Z!=i0B9dNcVn8!u@=OtFrek2m;K(QuQBpv6l^%-80!$!RffWN&
z3qQJfjzIHb5K7cU6~KW45?+E3t`SuLTZ58F;MOoOENOg$P^=+l4_1tlFi;e?vLU(2
z8LSv3C7>w&#ST{-!=W=dT8sy*0VO4%Xwc+>YXByU$s4%X!~(oo*+6Refsl)pfx(Io
G!~*~vJomN$
diff --git a/PizzaService-ejb/nbproject/build-impl.xml b/PizzaService-ejb/nbproject/build-impl.xml
index 5d9b661..ecaef8c 100644
--- a/PizzaService-ejb/nbproject/build-impl.xml
+++ b/PizzaService-ejb/nbproject/build-impl.xml
@@ -832,9 +832,6 @@ exists or setup the property manually. For example like this:
<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="${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="${reference.PizzaService-lib.jar}" property="manifest.reference.PizzaService-lib.jar"/>
@@ -843,20 +840,14 @@ exists or setup the property manually. For example like this:
<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="${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 jar-9 "/>
+ <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-6-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
- <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.log4j-api-2.3.jar}"/>
- <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.log4j-core-2.3.jar}"/>
- <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.log4j-web-2.3.jar}"/>
</manifest>
</target>
<target depends="compile" name="library-inclusion-in-manifest">
@@ -866,9 +857,6 @@ exists or setup the property manually. For example like this:
<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="${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 3f1e3e5..69ff75f 100644
--- a/PizzaService-ejb/nbproject/genfiles.properties
+++ b/PizzaService-ejb/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=3acb4892
+build.xml.data.CRC32=669ce18d
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=3acb4892
-nbproject/build-impl.xml.script.CRC32=eedbb4d3
+nbproject/build-impl.xml.data.CRC32=669ce18d
+nbproject/build-impl.xml.script.CRC32=64ac5c69
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 c1ae070..3dcedcc 100644
--- a/PizzaService-ejb/nbproject/project.properties
+++ b/PizzaService-ejb/nbproject/project.properties
@@ -25,14 +25,11 @@ 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/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.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.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
@@ -41,17 +38,14 @@ j2ee.platform.wsit.classpath=
j2ee.server.type=gfv3ee6
jar.compress=false
jar.name=PizzaService-ejb.jar
-jars.in.ejbjar=false
+jars.in.ejbjar=true
javac.classpath=\
${reference.PizzaService-lib.jar}:\
${file.reference.jcore.jar}:\
${file.reference.jcoreee.jar}:\
${file.reference.jshop-core.jar}:\
${file.reference.jshop-ee-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}
+ ${file.reference.cdi-api.jar}
javac.debug=true
javac.deprecation=true
javac.processorpath=\
diff --git a/PizzaService-ejb/nbproject/project.xml b/PizzaService-ejb/nbproject/project.xml
index bb88ff9..ed392fc 100644
--- a/PizzaService-ejb/nbproject/project.xml
+++ b/PizzaService-ejb/nbproject/project.xml
@@ -11,9 +11,6 @@
<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">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>
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index f15258b..9115fac 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -205,6 +205,10 @@ 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}"/>
@@ -223,6 +227,7 @@ 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. -->
@@ -300,6 +305,7 @@ 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"/>
@@ -629,6 +635,10 @@ 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 16a6e78..1d9adae 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=df8eee8a
+build.xml.data.CRC32=6fa7b0ea
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.
# 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=df8eee8a
-nbproject/build-impl.xml.script.CRC32=249f8ab6
+nbproject/build-impl.xml.data.CRC32=6fa7b0ea
+nbproject/build-impl.xml.script.CRC32=82732cff
nbproject/build-impl.xml.stylesheet.CRC32=5eea63a6@1.49.1
diff --git a/nbproject/project.properties b/nbproject/project.properties
index ca14a32..e4902b6 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -10,7 +10,7 @@ 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/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.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.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
@@ -20,7 +20,8 @@ j2ee.server.type=gfv3ee6
jar.compress=false
jar.content.additional=\
${reference.PizzaService-ejb.dist-ear}:\
- ${reference.jshop-ejb.dist-ear}
+ ${reference.jshop-ejb.dist-ear}:\
+ ${reference.jcore-ee-logger.dist-ear}
jar.name=PizzaService.ear
javac.debug=true
javac.deprecation=false
@@ -29,8 +30,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=../../MyProjects/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 6639f51..f419409 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -15,6 +15,10 @@
<file>${reference.jshop-ejb.dist-ear}</file>
<path-in-war>/</path-in-war>
</library>
+ <library>
+ <file>${reference.jcore-ee-logger.dist-ear}</file>
+ <path-in-war>/</path-in-war>
+ </library>
</web-module-additional-libraries>
</data>
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
@@ -26,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>
--
2.39.5