From: Roland Haeder <roland@mxchange.org>
Date: Tue, 8 Mar 2016 21:03:31 +0000 (+0100)
Subject: addressbook-user-ejb has been merged into addressbook-ejb
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2e7926746be7119f07c13e2aacfef06319f10ec1;p=addressbook.git

addressbook-user-ejb has been merged into addressbook-ejb
---

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index f79d5ec..a5aeccf 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -213,10 +213,6 @@ is divided into following sections:
 			<property location="${build.dir}" name="dist.ear.dir"/>
 			<property name="deploy.on.save" value="${build.deploy.on.save}"/>
 		</ant>
-		<ant antfile="${project.addressbook-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>
 	</target>
 	<target depends="init,deps-jar,deps-j2ee-archive" name="pre-pre-compile"/>
 	<target name="pre-compile">
@@ -231,7 +227,6 @@ is divided into following sections:
 	<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.addressbook-ejb.dist-ear}" todir="${build.dir}//"/>
-		<copyfiles files="${reference.addressbook-user-ejb.dist-ear}" todir="${build.dir}//"/>
 		<copyfiles files="${reference.jcontacts-ejb.dist-ear}" todir="${build.dir}//"/>
 	</target>
 	<target name="post-compile">
@@ -312,7 +307,6 @@ is divided into following sections:
 		<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.addressbook-user-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">
@@ -649,10 +643,6 @@ is divided into following sections:
 			<property location="${build.dir}" name="dist.ear.dir"/>
 			<property name="deploy.on.save" value="${build.deploy.on.save}"/>
 		</ant>
-		<ant antfile="${project.addressbook-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>
 	</target>
 	<target depends="init" name="do-clean">
 		<delete dir="${build.dir}"/>
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 12de9e9..1c57d7d 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -23,8 +23,7 @@ jar.content.additional=\
     ${reference.jcore-logger-ejb.dist-ear}:\
     ${reference.addressbook-ejb.dist-ear}:\
     ${reference.jcontacts-ejb.dist-ear}:\
-    ${reference.jcountry-ejb.dist-ear}:\
-    ${reference.addressbook-user-ejb.dist-ear}
+    ${reference.jcountry-ejb.dist-ear}
 jar.name=addressbook.ear
 javac.debug=true
 javac.deprecation=false
@@ -34,12 +33,10 @@ meta.inf=src/conf
 no.dependencies=false
 platform.active=default_platform
 project.addressbook-ejb=../addressbook-ejb
-project.addressbook-user-ejb=../../NetBeansProjects/addressbook-user-ejb
 project.jcontacts-ejb=../jcontacts-ejb
 project.jcore-logger-ejb=../jcore-logger-ejb
 project.jcountry-ejb=../../NetBeansProjects/jcountry-ejb
 reference.addressbook-ejb.dist-ear=${project.addressbook-ejb}/dist/addressbook-ejb.jar
-reference.addressbook-user-ejb.dist-ear=${project.addressbook-user-ejb}/dist/addressbook-user-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
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 2806aa6..3000d2b 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.addressbook-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">
@@ -38,14 +34,6 @@
                 <clean-target>clean-ear</clean-target>
                 <id>dist-ear</id>
             </reference>
-            <reference>
-                <foreign-project>addressbook-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>jcontacts-ejb</foreign-project>
                 <artifact-type>j2ee_ear_archive</artifact-type>