renamed project to fit with naming convention + removed no longer used 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
deleted file mode 100644 (file)
index a8f5163..0000000
Binary files a/PizzaService-ejb/lib/jcore-ee-logger.jar and /dev/null differ

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index abedd0bcb89f4592d281c84499f2c3e812f37f7d..a23d1f84e35bc28287ee890ae53ca5b8e148751a 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,4 +1,4 @@
-build.xml.data.CRC32=73b4e1c5
+build.xml.data.CRC32=fdc75897
 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 9c3c6c3a652641455a2bec8e159c05fc0f8e22a7..ded5b232cf16f318e76cf3b520427659cbd72eea 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -20,10 +20,11 @@ j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 jar.content.additional=\
-    ${reference.PizzaService-ejb.dist-ear}:\
-    ${reference.jshop-ejb.dist-ear}:\
     ${reference.jcore-ee-logger.dist-ear}:\
-    ${reference.jshop-receipt-ejb.dist-ear}
+    ${reference.PizzaService-ejb.dist-ear}:\
+    ${reference.jshop-receipt-ejb.dist-ear}:\
+    ${reference.jcore-logger-ejb.dist-ear}:\
+    ${reference.jshop-ejb.dist-ear}
 jar.name=PizzaService.ear
 javac.debug=true
 javac.deprecation=false
@@ -33,10 +34,12 @@ meta.inf=src/conf
 no.dependencies=false
 platform.active=default_platform
 project.jcore-ee-logger=../jcore-ee-logger
+project.jcore-logger-ejb=../jcore-logger-ejb
 project.jshop-ejb=../jshop-ejb
 project.jshop-receipt-ejb=../jshop-receipt-ejb
 project.PizzaService-ejb=PizzaService-ejb
 reference.jcore-ee-logger.dist-ear=${project.jcore-ee-logger}/dist/jcore-ee-logger.jar
+reference.jcore-logger-ejb.dist-ear=${project.jcore-logger-ejb}/dist/jcore-logger-ejb.jar
 reference.jshop-ejb.dist-ear=${project.jshop-ejb}/dist/jshop-ejb.jar
 reference.jshop-receipt-ejb.dist-ear=${project.jshop-receipt-ejb}/dist/jshop-receipt-ejb.jar
 reference.PizzaService-ejb.dist-ear=${project.PizzaService-ejb}/dist/PizzaService-ejb.jar

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 5c94ecfdff7c951838fff3e8d28633a7bb2e5412..92a00afaa52a5a03032319de28c58bd671d6e5ca 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -7,20 +7,23 @@
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <web-module-libraries/>
             <web-module-additional-libraries>
+                <library>
+                    <file>${reference.jcore-ee-logger.dist-ear}</file>
+                </library>
                 <library>
                     <file>${reference.PizzaService-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
                 <library>
-                    <file>${reference.jshop-ejb.dist-ear}</file>
+                    <file>${reference.jshop-receipt-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
                 <library>
-                    <file>${reference.jcore-ee-logger.dist-ear}</file>
+                    <file>${reference.jcore-logger-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
                 <library>
-                    <file>${reference.jshop-receipt-ejb.dist-ear}</file>
+                    <file>${reference.jshop-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
             </web-module-additional-libraries>
@@ -38,7 +41,7 @@
                 <id>dist-ear</id>
             </reference>
             <reference>
-                <foreign-project>jcore-ee-logger</foreign-project>
+                <foreign-project>jcore-logger-ejb</foreign-project>
                 <artifact-type>j2ee_ear_archive</artifact-type>
                 <script>build.xml</script>
                 <target>dist-ear</target>