jjobs-user-ejb has been merged into jjobs-ejb

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 674c2af3bf8db71a2793bff00ddc12119e938419..5de66eeaee8087ceda3348e87232c64fbd09b59d 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -213,10 +213,6 @@ 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.jjobs-user-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}"/>
@@ -237,7 +233,6 @@ exists or setup the property manually. For example like this:
         <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}//"/>
-        <copyfiles files="${reference.jjobs-user-ejb.dist-ear}" todir="${build.dir}//"/>
     </target>
     <target name="post-compile">
         <!-- Empty placeholder for easier customization. -->
@@ -317,7 +312,6 @@ exists or setup the property manually. For example like this:
         <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.jjobs-user-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"/>
@@ -655,10 +649,6 @@ 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.jjobs-user-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}"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index a9dbbd1c13bc704e112cb26982f3f18a64718a13..a6da3770fe52d36e541d4312b67c4a0737a0d2b1 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=5c2fd69f
+build.xml.data.CRC32=d5a5fbc0
 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=5c2fd69f
-nbproject/build-impl.xml.script.CRC32=799b8d2f
+nbproject/build-impl.xml.data.CRC32=d5a5fbc0
+nbproject/build-impl.xml.script.CRC32=1a0070ba
 nbproject/build-impl.xml.stylesheet.CRC32=5eea63a6@1.53.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index bf0baba35d18008c53defebeb4fa744bd785db8b..5a55925267aec12384cd1890e18f40a4e9973452 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -24,8 +24,7 @@ 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-user-ejb.dist-ear}
+    ${reference.jcountry-ejb.dist-ear}
 jar.name=jjobs.ear
 javac.debug=true
 javac.deprecation=false
@@ -37,12 +36,10 @@ platform.active=default_platform
 project.jcore-logger-ejb=../../MyProjects/jcore-logger-ejb
 project.jcountry-ejb=../jcountry-ejb
 project.jjobs-ejb=../jjobs-ejb
-project.jjobs-user-ejb=../jjobs-user-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.jjobs-user-ejb.dist-ear=${project.jjobs-user-ejb}/dist/jjobs-user-ejb.jar
 reference.jletter-ejb.dist-ear=${project.jletter-ejb}/dist/jletter-ejb.jar
 resource.dir=setup
 run.classpath=

diff --git a/nbproject/project.xml b/nbproject/project.xml
index d3cc6e0e9928dad02bc79ef3c58fd177627fc8fd..9d7baaf4e1ca6fa0868c970036d774b88de5acd0 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -23,10 +23,6 @@
                     <file>${reference.jcountry-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
-                <library>
-                    <file>${reference.jjobs-user-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">
@@ -54,14 +50,6 @@
                 <clean-target>clean-ear</clean-target>
                 <id>dist-ear</id>
             </reference>
-            <reference>
-                <foreign-project>jjobs-user-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>jletter-ejb</foreign-project>
                 <artifact-type>j2ee_ear_archive</artifact-type>