From: Roland Haeder <roland@mxchange.org>
Date: Wed, 2 Mar 2016 20:04:41 +0000 (+0100)
Subject: juser-ejb was no longer possible, else all projects needs to use same jbbc resource...
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c418535ab575bc0ba6f8649db9bcc55c154f2db8;p=jjobs.git
juser-ejb was no longer possible, else all projects needs to use same jbbc resource for persisting. And we need separation for making differences (still implementing all from juser-lib)
---
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index d4c096d..674c2af 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -201,14 +201,6 @@ exists or setup the property manually. For example like this:
<isset property="build.deploy.on.save"/>
</not>
</condition>
- <ant antfile="${project.addressbook-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.jcontacts-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.jcore-logger-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}"/>
@@ -221,11 +213,11 @@ 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.jletter-ejb}/build.xml" inheritall="false" target="dist-ear">
+ <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.juser-ejb}/build.xml" inheritall="false" target="dist-ear">
+ <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>
@@ -241,13 +233,11 @@ exists or setup the property manually. For example like this:
</copy>
</target>
<target depends="init,deps-jar,pre-pre-compile,pre-compile" name="-do-compile-deps">
- <copyfiles files="${reference.addressbook-ejb.dist-ear}" todir="${build.dir}//"/>
- <copyfiles files="${reference.jcontacts-ejb.dist-ear}" todir="${build.dir}//"/>
<copyfiles files="${reference.jcore-logger-ejb.dist-ear}" todir="${build.dir}//"/>
- <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}//"/>
+ <copyfiles files="${reference.jjobs-user-ejb.dist-ear}" todir="${build.dir}//"/>
</target>
<target name="post-compile">
<!-- Empty placeholder for easier customization. -->
@@ -324,13 +314,11 @@ exists or setup the property manually. For example like this:
</target>
<target name="-run-deploy-am" unless="no.deps">
<!-- Task to deploy to the Access Manager runtime. -->
- <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.jjobs-user-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"/>
</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">
@@ -655,14 +643,6 @@ exists or setup the property manually. For example like this:
<isset property="build.deploy.on.save"/>
</not>
</condition>
- <ant antfile="${project.addressbook-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.jcontacts-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.jcore-logger-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}"/>
@@ -675,11 +655,11 @@ 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.jletter-ejb}/build.xml" inheritall="false" target="clean-ear">
+ <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.juser-ejb}/build.xml" inheritall="false" target="clean-ear">
+ <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>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 47cc934..a9dbbd1 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=92cc9fa7
+build.xml.data.CRC32=5c2fd69f
build.xml.script.CRC32=9e6eddae
-build.xml.stylesheet.CRC32=a5d15b16@1.49.1
+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=92cc9fa7
-nbproject/build-impl.xml.script.CRC32=8056caef
-nbproject/build-impl.xml.stylesheet.CRC32=5eea63a6@1.49.1
+nbproject/build-impl.xml.data.CRC32=5c2fd69f
+nbproject/build-impl.xml.script.CRC32=799b8d2f
+nbproject/build-impl.xml.stylesheet.CRC32=5eea63a6@1.53.1
diff --git a/nbproject/project.properties b/nbproject/project.properties
index f0dc801..bf0baba 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -21,13 +21,11 @@ j2ee.platform.wsit.classpath=
j2ee.server.type=gfv3ee6
jar.compress=false
jar.content.additional=\
- ${reference.addressbook-ejb.dist-ear}:\
- ${reference.jcontacts-ejb.dist-ear}:\
${reference.jcore-logger-ejb.dist-ear}:\
- ${reference.juser-ejb.dist-ear}:\
${reference.jletter-ejb.dist-ear}:\
${reference.jjobs-ejb.dist-ear}:\
- ${reference.jcountry-ejb.dist-ear}
+ ${reference.jcountry-ejb.dist-ear}:\
+ ${reference.jjobs-user-ejb.dist-ear}
jar.name=jjobs.ear
javac.debug=true
javac.deprecation=false
@@ -36,20 +34,16 @@ javac.target=1.8
meta.inf=src/conf
no.dependencies=false
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.jjobs-user-ejb=../jjobs-user-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.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
-reference.juser-ejb.dist-ear=${project.juser-ejb}/dist/juser-ejb.jar
resource.dir=setup
run.classpath=
source.root=.
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 72312c1..d3cc6e0 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -7,22 +7,10 @@
<minimum-ant-version>1.6.5</minimum-ant-version>
<web-module-libraries/>
<web-module-additional-libraries>
- <library>
- <file>${reference.addressbook-ejb.dist-ear}</file>
- <path-in-war>/</path-in-war>
- </library>
- <library>
- <file>${reference.jcontacts-ejb.dist-ear}</file>
- <path-in-war>/</path-in-war>
- </library>
<library>
<file>${reference.jcore-logger-ejb.dist-ear}</file>
<path-in-war>/</path-in-war>
</library>
- <library>
- <file>${reference.juser-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>
@@ -35,25 +23,13 @@
<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">
- <reference>
- <foreign-project>addressbook-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>jcontacts-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>j2ee_ear_archive</artifact-type>
@@ -79,7 +55,7 @@
<id>dist-ear</id>
</reference>
<reference>
- <foreign-project>jletter-ejb</foreign-project>
+ <foreign-project>jjobs-user-ejb</foreign-project>
<artifact-type>j2ee_ear_archive</artifact-type>
<script>build.xml</script>
<target>dist-ear</target>
@@ -87,7 +63,7 @@
<id>dist-ear</id>
</reference>
<reference>
- <foreign-project>juser-ejb</foreign-project>
+ <foreign-project>jletter-ejb</foreign-project>
<artifact-type>j2ee_ear_archive</artifact-type>
<script>build.xml</script>
<target>dist-ear</target>