Removed jcountry-ejb + fixed jcore-logger-ejb

diff --git a/nbproject/project.properties b/nbproject/project.properties
index b459f230d46a51642596f5bf867193ccf4fac1c0..5829baae1389108868b1b3b87fae495205ea695f 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -21,9 +21,8 @@ j2ee.server.type=gfv3ee6
 jar.compress=false
 jar.content.additional=\
     ${reference.jcontacts-ejb.dist-ear}:\
-    ${reference.jcore-logger-ejb.dist-ear}:\
-    ${reference.jcountry-ejb.dist-ear}:\
     ${reference.jshop-ejb.dist-ear}:\
+    ${reference.jcore-logger-ejb.dist}:\
     ${reference.jshop-receipt-ejb.dist-ear}:\
     ${reference.PizzaService-ejb.dist-ear}
 jar.name=PizzaService.ear
@@ -35,12 +34,12 @@ meta.inf=src/conf
 no.dependencies=false
 platform.active=default_platform
 project.jcontacts-ejb=../jcontacts-ejb
-project.jcountry-ejb=../jcountry-ejb
+project.jcore-logger-ejb=../../NetBeansProjects/jcore-logger-ejb
 project.jshop-ejb=../jshop-ejb
 project.jshop-receipt-ejb=../jshop-receipt-ejb
 project.PizzaService-ejb=../pizzaservice-ejb
 reference.jcontacts-ejb.dist-ear=${project.jcontacts-ejb}/dist/jcontacts-ejb.jar
-reference.jcountry-ejb.dist-ear=${project.jcountry-ejb}/dist/jcountry-ejb.jar
+reference.jcore-logger-ejb.dist=${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 f3f37fe86ff17646e105e8e3ba3f6ca42751cfaa..df95918d43f84b9b2ac4565bda87be0c6618cf51 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -12,15 +12,11 @@
                     <path-in-war>/</path-in-war>
                 </library>
                 <library>
-                    <file>${reference.jcore-logger-ejb.dist-ear}</file>
-                    <path-in-war>/</path-in-war>
-                </library>
-                <library>
-                    <file>${reference.jcountry-ejb.dist-ear}</file>
+                    <file>${reference.jshop-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
                 <library>
-                    <file>${reference.jshop-ejb.dist-ear}</file>
+                    <file>${reference.jcore-logger-ejb.dist}</file>
                     <path-in-war>/</path-in-war>
                 </library>
                 <library>
@@ -54,12 +50,12 @@
                 <id>dist-ear</id>
             </reference>
             <reference>
-                <foreign-project>jcountry-ejb</foreign-project>
-                <artifact-type>j2ee_ear_archive</artifact-type>
+                <foreign-project>jcore-logger-ejb</foreign-project>
+                <artifact-type>jar</artifact-type>
                 <script>build.xml</script>
-                <target>dist-ear</target>
-                <clean-target>clean-ear</clean-target>
-                <id>dist-ear</id>
+                <target>dist</target>
+                <clean-target>clean</clean-target>
+                <id>dist</id>
             </reference>
             <reference>
                 <foreign-project>jshop-ejb</foreign-project>