From 4f2b59a2cc5b72cf7a32f49a92171dc96166f9fc Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 8 Sep 2015 23:37:28 +0200 Subject: [PATCH] =?utf8?q?Changed=20jcore-ee-logger=20to=20a=20EJB=20(not?= =?utf8?q?=20really,=20but=20maybe=20this=20way=20it=20works=3F=3F=3F)=20S?= =?utf8?q?igned-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- PizzaService-ejb/lib/jcore-ee-logger.jar | Bin 5508 -> 5402 bytes PizzaService-ejb/nbproject/build-impl.xml | 4 ---- PizzaService-ejb/nbproject/project.properties | 3 --- PizzaService-ejb/nbproject/project.xml | 9 --------- nbproject/genfiles.properties | 2 +- nbproject/project.properties | 7 ++++--- nbproject/project.xml | 14 +++++++++++--- 7 files changed, 16 insertions(+), 23 deletions(-) diff --git a/PizzaService-ejb/lib/jcore-ee-logger.jar b/PizzaService-ejb/lib/jcore-ee-logger.jar index 4869b92756a60045e244336477a35716a2b1553b..9dd81bee46a4d292b82751cb33c8e1788c8974ab 100644 GIT binary patch delta 425 zcmZqCo~6YT;LXg!#lXP9!0>waL>^7vSGzUbUkIfxNoQbSNT2A`z{kslQ1WW`WGhAm zCLk5Vs0pIl8O=e|0Y+O8^`FrhM7c0|0jbRsn7Ua&v@H8J4iJ5n-;#;x_3p_6LYAnu zOb!z=1?lS*k`X%sv^KveT|dB^kx7IZ;xM4pejypAXAG0?3Q2<${t}X56r7wOET@gC zOv4?h8x9oVECGhMj$T0Z2J#@^!G(bgbvOs4rW2?}WpV&J+vJ9qtxUC5pY1w7m;CF&NewwSb6dT5pY0qi^?#?^MgeK*u^Io Q2(nJj5EWyaAqcV*0G?57YybcN delta 551 zcmbQG)uPQ4;LXg!#lXP9z;J8EL>^7Sn=>@rbI+=YUSwck0AZ2I{{+P+#-`Rg=Oh*v z>jos2WLPQWWG3n7Kf@8>t!VtA&DmE7o}nmE>BJ3FfdHKF3ALR;U`TXIa!v`97KgN+JdO5jLsnH7NZxC+N{RZ z%>tq~vu)!5(b@c#Od#oHf|k4}o}2te(6s&*(7Rysp#%$@Bf#+1QIC;vngXC&sOr{dKr%`ka^5D!x|JGi467?v~&vI8|*P3{#D0y$uzhz#S&$@@gY*qDSs$^iadl5_w7 diff --git a/PizzaService-ejb/nbproject/build-impl.xml b/PizzaService-ejb/nbproject/build-impl.xml index c76424d..9d8bdfa 100644 --- 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: - @@ -834,7 +833,6 @@ exists or setup the property manually. For example like this: - @@ -842,7 +840,6 @@ exists or setup the property manually. For example like this: - @@ -851,7 +848,6 @@ exists or setup the property manually. For example like this: - diff --git a/PizzaService-ejb/nbproject/project.properties b/PizzaService-ejb/nbproject/project.properties index ef74043..0bcb243 100644 --- 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 1f9719f..7bd1c5c 100644 --- a/PizzaService-ejb/nbproject/project.xml +++ b/PizzaService-ejb/nbproject/project.xml @@ -5,7 +5,6 @@ PizzaService-ejb 1.6.5 - reference.jcore-ee-logger.jar file.reference.jcoreee.jar file.reference.jshop-core.jar file.reference.jshop-ee-lib.jar @@ -33,14 +32,6 @@ clean jar - - jcore-ee-logger - jar - - jar - clean - jar - diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index cd334b7..c1e734f 100644 --- 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 ad9af24..c8bd070 100644 --- 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 874f6db..a226e43 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -8,15 +8,15 @@ - ${file.reference.jcore-ee-logger.jar} + ${reference.jshop-ejb.dist-ear} / - ${reference.jshop-ejb.dist-ear} + ${reference.PizzaService-ejb.dist-ear} / - ${reference.PizzaService-ejb.dist-ear} + ${reference.jcore-ee-logger.dist-ear} / @@ -30,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