juser-ejb was no longer possible, else all projects needs to use same jbbc resource...

diff --git a/nbproject/project.properties b/nbproject/project.properties
index ed84f360d3d8fe9c0813f20a6140718c048e2f63..12de9e917591d3be0b4fdaa0965a40f1b2c7d429 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -23,8 +23,8 @@ jar.content.additional=\
     ${reference.jcore-logger-ejb.dist-ear}:\
     ${reference.addressbook-ejb.dist-ear}:\
     ${reference.jcontacts-ejb.dist-ear}:\
-    ${reference.juser-ejb.dist-ear}:\
-    ${reference.jcountry-ejb.dist-ear}
+    ${reference.jcountry-ejb.dist-ear}:\
+    ${reference.addressbook-user-ejb.dist-ear}
 jar.name=addressbook.ear
 javac.debug=true
 javac.deprecation=false
@@ -34,15 +34,15 @@ meta.inf=src/conf
 no.dependencies=false
 platform.active=default_platform
 project.addressbook-ejb=../addressbook-ejb
+project.addressbook-user-ejb=../../NetBeansProjects/addressbook-user-ejb
 project.jcontacts-ejb=../jcontacts-ejb
 project.jcore-logger-ejb=../jcore-logger-ejb
 project.jcountry-ejb=../../NetBeansProjects/jcountry-ejb
-project.juser-ejb=../juser-ejb
 reference.addressbook-ejb.dist-ear=${project.addressbook-ejb}/dist/addressbook-ejb.jar
+reference.addressbook-user-ejb.dist-ear=${project.addressbook-user-ejb}/dist/addressbook-user-ejb.jar
 reference.jcontacts-ejb.dist-ear=${project.jcontacts-ejb}/dist/jcontacts-ejb.jar
 reference.jcore-logger-ejb.dist-ear=${project.jcore-logger-ejb}/dist/jcore-logger-ejb.jar
 reference.jcountry-ejb.dist-ear=${project.jcountry-ejb}/dist/jcountry-ejb.jar
-reference.juser-ejb.dist-ear=${project.juser-ejb}/dist/juser-ejb.jar
 resource.dir=setup
 run.classpath=
 source.root=.

diff --git a/nbproject/project.xml b/nbproject/project.xml
index b15cda268ed6d2c122354e729319e186fdbdcd67..2806aa60d1252e9ef41361afbf03ddbe595f50e5 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -20,11 +20,11 @@
                     <path-in-war>/</path-in-war>
                 </library>
                 <library>
-                    <file>${reference.juser-ejb.dist-ear}</file>
+                    <file>${reference.jcountry-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
                 <library>
-                    <file>${reference.jcountry-ejb.dist-ear}</file>
+                    <file>${reference.addressbook-user-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
             </web-module-additional-libraries>
@@ -39,7 +39,7 @@
                 <id>dist-ear</id>
             </reference>
             <reference>
-                <foreign-project>jcontacts-ejb</foreign-project>
+                <foreign-project>addressbook-user-ejb</foreign-project>
                 <artifact-type>j2ee_ear_archive</artifact-type>
                 <script>build.xml</script>
                 <target>dist-ear</target>
@@ -47,7 +47,7 @@
                 <id>dist-ear</id>
             </reference>
             <reference>
-                <foreign-project>jcore-logger-ejb</foreign-project>
+                <foreign-project>jcontacts-ejb</foreign-project>
                 <artifact-type>j2ee_ear_archive</artifact-type>
                 <script>build.xml</script>
                 <target>dist-ear</target>
@@ -55,7 +55,7 @@
                 <id>dist-ear</id>
             </reference>
             <reference>
-                <foreign-project>jcountry-ejb</foreign-project>
+                <foreign-project>jcore-logger-ejb</foreign-project>
                 <artifact-type>j2ee_ear_archive</artifact-type>
                 <script>build.xml</script>
                 <target>dist-ear</target>
@@ -63,7 +63,7 @@
                 <id>dist-ear</id>
             </reference>
             <reference>
-                <foreign-project>juser-ejb</foreign-project>
+                <foreign-project>jcountry-ejb</foreign-project>
                 <artifact-type>j2ee_ear_archive</artifact-type>
                 <script>build.xml</script>
                 <target>dist-ear</target>