Please cherry-pick:

- fixed project dependency with ../../ in relative path which makes it
  lesser portable/usable on other systems

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/nbproject/project.properties b/nbproject/project.properties
index a56052c2c81c9486696db693dc9dcd849014d769..62f8f9324af5bf0c3aaa81fc0ac5badd82750a74 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -20,8 +20,9 @@ j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 jar.content.additional=\
-    ${reference.jcore-logger-ejb.dist}:\
-    ${reference.pizzaservice-ejb.dist-ear}
+    ${reference.jcore-logger-ejb-1.dist-ear}:\
+    ${reference.pizzaservice-ejb.dist-ear}:\
+    ${reference.pizzaservice-mailer-ejb.dist-ear}
 jar.name=pizzaservice.ear
 javac.debug=true
 javac.deprecation=false
@@ -31,11 +32,12 @@ meta.inf=src/conf
 no.dependencies=false
 platform.active=default_platform
 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-logger-ejb.dist=${project.jcore-logger-ejb}/dist/jcore-logger-ejb.jar
+project.jcore-logger-ejb-1=../../NetBeansProjects/jcore-logger-ejb
+project.pizzaservice-ejb=../../NetBeansProjects/pizzaservice-ejb
+project.pizzaservice-mailer-ejb=../../NetBeansProjects/pizzaservice-mailer-ejb
+reference.jcore-logger-ejb-1.dist-ear=${project.jcore-logger-ejb-1}/dist/jcore-logger-ejb.jar
 reference.pizzaservice-ejb.dist-ear=${project.pizzaservice-ejb}/dist/pizzaservice-ejb.jar
+reference.pizzaservice-mailer-ejb.dist-ear=${project.pizzaservice-mailer-ejb}/dist/pizzaservice-mailer-ejb.jar
 resource.dir=setup
 run.classpath=
 source.root=.

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 056b35f5867b050ff2611764e56657c1c5f65f0b..7329cd8c8a6735278eb63f25c6e36922c5965a6c 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -8,27 +8,23 @@
             <web-module-libraries/>
             <web-module-additional-libraries>
                 <library>
-                    <file>${reference.jcore-logger-ejb.dist}</file>
+                    <file>${reference.jcore-logger-ejb-1.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
                 <library>
                     <file>${reference.pizzaservice-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
+                <library>
+                    <file>${reference.pizzaservice-mailer-ejb.dist-ear}</file>
+                    <path-in-war>/</path-in-war>
+                </library>
             </web-module-additional-libraries>
         </data>
         <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
             <definitions>./lib/nblibraries.properties</definitions>
         </libraries>
         <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-            <reference>
-                <foreign-project>pizzaservice-ejb</foreign-project>
-                <artifact-type>j2ee_ear_archive</artifact-type>
-                <script>build.xml</script>
-                <target>dist-ear</target>
-                <clean-target>clean-ear</clean-target>
-                <id>dist-ear</id>
-            </reference>
             <reference>
                 <foreign-project>jcore-logger-ejb</foreign-project>
                 <artifact-type>jar</artifact-type>
@@ -37,6 +33,14 @@
                 <clean-target>clean</clean-target>
                 <id>dist</id>
             </reference>
+            <reference>
+                <foreign-project>jcore-logger-ejb-1</foreign-project>
+                <artifact-type>j2ee_ear_archive</artifact-type>
+                <script>build.xml</script>
+                <target>dist-ear</target>
+                <clean-target>clean-ear</clean-target>
+                <id>dist-ear</id>
+            </reference>
             <reference>
                 <foreign-project>jshop-ejb</foreign-project>
                 <artifact-type>j2ee_ear_archive</artifact-type>
@@ -53,6 +57,22 @@
                 <clean-target>clean-ear</clean-target>
                 <id>dist-ear</id>
             </reference>
+            <reference>
+                <foreign-project>pizzaservice-ejb</foreign-project>
+                <artifact-type>j2ee_ear_archive</artifact-type>
+                <script>build.xml</script>
+                <target>dist-ear</target>
+                <clean-target>clean-ear</clean-target>
+                <id>dist-ear</id>
+            </reference>
+            <reference>
+                <foreign-project>pizzaservice-mailer-ejb</foreign-project>
+                <artifact-type>j2ee_ear_archive</artifact-type>
+                <script>build.xml</script>
+                <target>dist-ear</target>
+                <clean-target>clean-ear</clean-target>
+                <id>dist-ear</id>
+            </reference>
         </references>
     </configuration>
 </project>