no need for these EJBs anymore as they are now included in the main EJB project

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 5de66eeaee8087ceda3348e87232c64fbd09b59d..82df07a312f190224234e7627649f7140e9673f4 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -205,18 +205,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}"/>
         </ant>
-        <ant antfile="${project.jletter-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>
     </target>
     <target depends="init,deps-jar,deps-j2ee-archive" name="pre-pre-compile"/>
     <target name="pre-compile">
@@ -230,9 +222,7 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,deps-jar,pre-pre-compile,pre-compile" name="-do-compile-deps">
         <copyfiles files="${reference.jcore-logger-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. -->
@@ -310,9 +300,7 @@ exists or setup the property manually. For example like this:
     <target name="-run-deploy-am" unless="no.deps">
         <!-- Task to deploy to the Access Manager runtime. -->
         <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"/>
     </target>
     <target depends="-init-cos,dist-directory-deploy,pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,post-run-deploy" name="run-deploy"/>
     <target if="netbeans.home" name="-run-deploy-nb">
@@ -641,18 +629,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}"/>
         </ant>
-        <ant antfile="${project.jletter-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>
     </target>
     <target depends="init" name="do-clean">
         <delete dir="${build.dir}"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index a6da3770fe52d36e541d4312b67c4a0737a0d2b1..808bbfa37b80726bedf46a564882798239fa5f55 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=d5a5fbc0
+build.xml.data.CRC32=3a17848b
 build.xml.script.CRC32=9e6eddae
 build.xml.stylesheet.CRC32=a5d15b16@1.53.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=d5a5fbc0
-nbproject/build-impl.xml.script.CRC32=1a0070ba
+nbproject/build-impl.xml.data.CRC32=3a17848b
+nbproject/build-impl.xml.script.CRC32=914a2891
 nbproject/build-impl.xml.stylesheet.CRC32=5eea63a6@1.53.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 5a55925267aec12384cd1890e18f40a4e9973452..4a26e06217995054b1f6e2a2f2db7391e85006df 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -22,9 +22,7 @@ j2ee.server.type=gfv3ee6
 jar.compress=false
 jar.content.additional=\
     ${reference.jcore-logger-ejb.dist-ear}:\
-    ${reference.jletter-ejb.dist-ear}:\
-    ${reference.jjobs-ejb.dist-ear}:\
-    ${reference.jcountry-ejb.dist-ear}
+    ${reference.jjobs-ejb.dist-ear}
 jar.name=jjobs.ear
 javac.debug=true
 javac.deprecation=false
@@ -34,13 +32,9 @@ meta.inf=src/conf
 no.dependencies=false
 platform.active=default_platform
 project.jcore-logger-ejb=../../MyProjects/jcore-logger-ejb
-project.jcountry-ejb=../jcountry-ejb
 project.jjobs-ejb=../jjobs-ejb
-project.jletter-ejb=../jletter-ejb
 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
 resource.dir=setup
 run.classpath=
 source.root=.

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 9d7baaf4e1ca6fa0868c970036d774b88de5acd0..e92fac7175cf785cc08ab0df17915bf4756eb6a6 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -11,18 +11,10 @@
                     <file>${reference.jcore-logger-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
-                <library>
-                    <file>${reference.jletter-ejb.dist-ear}</file>
-                    <path-in-war>/</path-in-war>
-                </library>
                 <library>
                     <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">
@@ -34,14 +26,6 @@
                 <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>
@@ -50,14 +34,6 @@
                 <clean-target>clean-ear</clean-target>
                 <id>dist-ear</id>
             </reference>
-            <reference>
-                <foreign-project>jletter-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>