added jcountry-ejb

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index b9ad2a4817076758c2164d0ed5396d500eb0c370..d4c096dae22607dbf71320c0658ce95858ca0661 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -213,6 +213,10 @@ exists or setup the property manually. For example like this:
             <property location="${build.dir}" name="dist.ear.dir"/>
             <property name="deploy.on.save" value="${build.deploy.on.save}"/>
         </ant>
+        <ant antfile="${project.jcountry-ejb}/build.xml" inheritall="false" target="dist-ear">
+            <property location="${build.dir}" name="dist.ear.dir"/>
+            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
+        </ant>
         <ant antfile="${project.jjobs-ejb}/build.xml" inheritall="false" target="dist-ear">
             <property location="${build.dir}" name="dist.ear.dir"/>
             <property name="deploy.on.save" value="${build.deploy.on.save}"/>
@@ -243,6 +247,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${reference.juser-ejb.dist-ear}" todir="${build.dir}//"/>
         <copyfiles files="${reference.jletter-ejb.dist-ear}" todir="${build.dir}//"/>
         <copyfiles files="${reference.jjobs-ejb.dist-ear}" todir="${build.dir}//"/>
+        <copyfiles files="${reference.jcountry-ejb.dist-ear}" todir="${build.dir}//"/>
     </target>
     <target name="post-compile">
         <!-- Empty placeholder for easier customization. -->
@@ -322,6 +327,7 @@ exists or setup the property manually. For example like this:
         <ant antfile="${project.addressbook-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
         <ant antfile="${project.jcontacts-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
         <ant antfile="${project.jcore-logger-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
+        <ant antfile="${project.jcountry-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
         <ant antfile="${project.jjobs-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
         <ant antfile="${project.jletter-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
         <ant antfile="${project.juser-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
@@ -661,6 +667,10 @@ exists or setup the property manually. For example like this:
             <property location="${build.dir}" name="dist.ear.dir"/>
             <property name="deploy.on.save" value="${build.deploy.on.save}"/>
         </ant>
+        <ant antfile="${project.jcountry-ejb}/build.xml" inheritall="false" target="clean-ear">
+            <property location="${build.dir}" name="dist.ear.dir"/>
+            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
+        </ant>
         <ant antfile="${project.jjobs-ejb}/build.xml" inheritall="false" target="clean-ear">
             <property location="${build.dir}" name="dist.ear.dir"/>
             <property name="deploy.on.save" value="${build.deploy.on.save}"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 2fa6391ee772919c8d09a55ce45ba4ba45de5c38..47cc934446c323590896278c82d9b7a5c5d12395 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=fa82fa00
+build.xml.data.CRC32=92cc9fa7
 build.xml.script.CRC32=9e6eddae
 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.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=fa82fa00
-nbproject/build-impl.xml.script.CRC32=fd328f42
+nbproject/build-impl.xml.data.CRC32=92cc9fa7
+nbproject/build-impl.xml.script.CRC32=8056caef
 nbproject/build-impl.xml.stylesheet.CRC32=5eea63a6@1.49.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 71ec1a4689ff4d8923cdd1f9af3ba44da5a8063f..7806bc675bceb668dbe875d02e55ba7e960e4e64 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -26,7 +26,8 @@ jar.content.additional=\
     ${reference.jcore-logger-ejb.dist-ear}:\
     ${reference.juser-ejb.dist-ear}:\
     ${reference.jletter-ejb.dist-ear}:\
-    ${reference.jjobs-ejb.dist-ear}
+    ${reference.jjobs-ejb.dist-ear}:\
+    ${reference.jcountry-ejb.dist-ear}
 jar.name=jjobs.ear
 javac.debug=true
 javac.deprecation=false
@@ -38,12 +39,14 @@ platform.active=default_platform
 project.addressbook-ejb=../../MyProjects/addressbook-ejb
 project.jcontacts-ejb=../../MyProjects/jcontacts-ejb
 project.jcore-logger-ejb=../../MyProjects/jcore-logger-ejb
+project.jcountry-ejb=../jcountry-ejb
 project.jjobs-ejb=../jjobs-ejb
 project.jletter-ejb=../jletter-ejb
 project.juser-ejb=../../MyProjects/juser-ejb
 reference.addressbook-ejb.dist-ear=${project.addressbook-ejb}/dist/addressbook-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.jjobs-ejb.dist-ear=${project.jjobs-ejb}/dist/jjobs-ejb.jar
 reference.jletter-ejb.dist-ear=${project.jletter-ejb}/dist/jletter-ejb.jar
 reference.juser-ejb.dist-ear=${project.juser-ejb}/dist/juser-ejb.jar

diff --git a/nbproject/project.xml b/nbproject/project.xml
index bbb954561b34025f47293537003bee381ebd1416..72312c1dd3bfb6f8699f662fa3d47cd42b3b5abf 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -31,6 +31,10 @@
                     <file>${reference.jjobs-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
+                <library>
+                    <file>${reference.jcountry-ejb.dist-ear}</file>
+                    <path-in-war>/</path-in-war>
+                </library>
             </web-module-additional-libraries>
         </data>
         <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
@@ -58,6 +62,14 @@
                 <clean-target>clean-ear</clean-target>
                 <id>dist-ear</id>
             </reference>
+            <reference>
+                <foreign-project>jcountry-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>jjobs-ejb</foreign-project>
                 <artifact-type>j2ee_ear_archive</artifact-type>