From 48cd110fb489b94b8399f683fff451236885e827 Mon Sep 17 00:00:00 2001 From: Roland Haeder 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?= 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 zcmZ`-3wRV)75?ueyR+F$9^|n=LP#Klgb)Zcp@lqefPO|n@6w53H! zsn)8cl5`4aE2dRwZ2^m4N^8~9RuE7@ZMCI7Yl)S>LY%AzZDDYg~R#105ZNt9aO26xdNo%J}?LC+q!+kGi z3tTE-Fh{G&f{Rp{;7&D7@PwMdc%OE?RA*?_g4?xH!J}G*;AL$#V}Du9+Egj@`MNbJ zj2YRhq;NE2AXIp8RDZ0rEE%&hH0E%w)n(=-g<1~ep9~G|oX{L9oGE<8Ewc_xtyaT` zt8QSRZB;`iz`yIvhx2^qE^neas$^uf(!7|7N8&IZkH#Su-_h}yj>o-JJQxob4tlBQ z5LXX-@m)N@ZBml9BUCkeN_^cs^(dRC*gVbV`)r=!nLqI0hdO@b#j`jTkLU0__q@R7 z$83(XIl<;9Om>o|oZ{+fHb2$zGaWzo;EWgfIP1kP@Jk-{EAD*JgO_yt+S85Scrh6- z$Kw^8WAiGT-+J&n4}R~#A9%?>vUD=f;ZMBCYhL^ruXD$FF9z@z9dGFPt3vYT^_%=H z9V^yv+UyT@F0ZdqQ1cWLW(PYrZ)xe=vZAHq=JhUMT3~Bs;Rc1cb-~Up{mrFintHr{ z&-D+)CO6|#1}>n{z*00S6q!}tF%;`~v!i^{f-m4M18cF)z@2E<@uq>d&~9Kmn>x%j zP|s!_oB3=Ou$hBe0}Hv-z-AGfxABhoM){QTcMbdvf7kJzfr|(jSj?SE*ev5&Oymg}Jz5U3xPv>$qazKJ>9M4J@ag(-rfnC!pgW2L6c;4g8DEzwx12 zP+33r7Tjv!Kg_lkAL;n7f&byEfqnRB-aJWdqE0-Ao(gt?g~=81<7+k@?^3UC<=lU2tkSfkUWBe zK=ndO0@^f^xZ1opE35d^)Ru@CvfHWW4#Z;z)=Uj=;1gb zEBHdA!YbXIm%`i`QeyU0`|__51J5|}21C5&+3MjEn-I%!VmT3og_D5&+vw=;u%Z3} zXB}y~9Ng_De}~!qJx5AjjiQ9pkd^17pv&0!_x`Ppd^F?ffV-;Kh|iO zQa`vIv>QIVk{P6=EQ%6-@v#y*CdjTf7u7~QfvU!lxI08_?yQ|8*(Yx_)c~JbgiN(K zf@xIvSs%q`i!j~c=yR6c=ar7sJHkGPTsEiIB@R9TY8`ocQv|;|%iuq`J%x@(nTcar9Lxp2bCpIfFdy^w$9(f`RzHPsVyJc+E z+=#cHx`$YHMq%M2i&?(p_?%_i{oU>8@0Y{R*#(Do z!Q<@yyhZ-J9ib%hS>js``$M-nva3zk{3h{1?kVa$WT^L%r9MERx`Z3lWz?w9ff70m zYAv6#Fah^tH?6?8lNhKBD(=BvUefk>79FC7!Al9$Rl9Qr4N&+RU5HrFh4~9a&}h0c zfj&fhS^_e)B;;wSDAIf=(MF<7%ZPBVJp8IC#{+nfRkFv&RS@qFYJ=?11SanJZ5ir)O=UVk~R(%=W6=cA8t0CX27g+TPR=v=wPehT7 zpG2Rgoc6`C1yhD>L4U)tz47v~{^pt@4;Regt<%H*iZGj6L;qyBzqMF8Pqt1MRQ{QQ z)&6;cyZmzm&-v>GbK7bKJKB~CzR*@9=xJXd*wo%Ac(}buQ14hFcwe@L!jS(wn6(=lbGT(l&QV0J{q5het-+kt z<}-V|Y3AJ9vuB`*&<_l))EQWSDchQiO9=SEe>%O}P2du1xow 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^VqSKl2Q}%it#8^1}T(KFnDF z*36{h8oUPRDiC&tx-6ExIYb_(Q1W-Vl-ILK8WHv4>oA>jyGlC<`lg|R4(k6HES%C$Q@#%x(O3`C2#mR3{L*0e zoD+~{JOC8~raB#bCh4G<#KAOqA)6@BsO17G3h3EJ14U^NOz8wBF)iF)MAb9{rYTxb zfq?noNLm*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*%kRIHixndGXUIiI>mQh6o)5w&>l0;MkK?=ccImILg z_PKuR-aaE{1_luJgj=8?X1uwRnUjgpd2*w$Fj#|znC|5N0U 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 zw&#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: - - - @@ -843,20 +840,14 @@ exists or setup the property manually. For example like this: - - - - + - - - @@ -866,9 +857,6 @@ exists or setup the property manually. For example like this: - - - 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 @@ 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 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: + + + + @@ -223,6 +227,7 @@ exists or setup the property manually. For example like this: + @@ -300,6 +305,7 @@ exists or setup the property manually. For example like this: + @@ -629,6 +635,10 @@ exists or setup the property manually. For example like this: + + + + 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 @@ ${reference.jshop-ejb.dist-ear} / + + ${reference.jcore-ee-logger.dist-ear} + / + @@ -26,6 +30,14 @@ clean-ear dist-ear + + jcore-ee-logger + j2ee_ear_archive + + dist-ear + clean-ear + dist-ear + jshop-ejb j2ee_ear_archive -- 2.39.5