From: Roland Haeder <roland@mxchange.org>
Date: Tue, 8 Mar 2016 21:08:00 +0000 (+0100)
Subject: jjobs-user-ejb has been merged into jjobs-ejb
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6ad5de06d2c2a27a3576d735f754b904dfe2784c;p=jjobs.git
jjobs-user-ejb has been merged into jjobs-ejb
---
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 674c2af..5de66ee 100644
--- 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 a9dbbd1..a6da377 100644
--- 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 bf0baba..5a55925 100644
--- 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 d3cc6e0..9d7baaf 100644
--- 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>