From: Roland Häder <roland@mxchange.org>
Date: Sat, 15 Apr 2017 18:54:38 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f2d8b30b09b6be6a7b6d5c60ed50b4790a463d76;p=addressbook-ejb.git
Continued:
- addressbook-core/mailer are now referenced as projects as they are
application-specific projects and not libraries (like e.g. juser-core is)
Signed-off-by: Roland Häder <roland@mxchange.org>
---
diff --git a/lib/addressbook-core.jar b/lib/addressbook-core.jar
deleted file mode 100644
index 36c8f87..0000000
Binary files a/lib/addressbook-core.jar and /dev/null differ
diff --git a/lib/addressbook-mailer.jar b/lib/addressbook-mailer.jar
deleted file mode 100644
index 4c2cc0e..0000000
Binary files a/lib/addressbook-mailer.jar and /dev/null differ
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 394e5d1..376c8cc 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -806,6 +806,9 @@ exists or setup the property manually. For example like this:
COMPILATION SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="-deps-module-jar" unless="no.deps">
+ <ant antfile="${project.addressbook-core}/build.xml" inheritall="false" target="jar">
+ <property name="deploy.on.save" value="false"/>
+ </ant>
<ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="jar">
<property name="deploy.on.save" value="false"/>
</ant>
@@ -817,6 +820,9 @@ exists or setup the property manually. For example like this:
</ant>
</target>
<target depends="init" if="dist.ear.dir" name="-deps-ear-jar" unless="no.deps">
+ <ant antfile="${project.addressbook-core}/build.xml" inheritall="false" target="jar">
+ <property name="deploy.on.save" value="false"/>
+ </ant>
<ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="jar">
<property name="deploy.on.save" value="false"/>
</ant>
@@ -852,7 +858,7 @@ exists or setup the property manually. For example like this:
<copyfiles files="${file.reference.jaddressbook-core.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.jaddressbook-lib.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.jmailer-ee.jar}" todir="${build.classes.dir}"/>
- <copyfiles files="${file.reference.addressbook-core.jar}" todir="${build.classes.dir}"/>
+ <copyfiles files="${reference.addressbook-core.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${reference.addressbook-lib.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${reference.addressbook-mailer.jar}" todir="${build.classes.dir}"/>
<copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
@@ -872,7 +878,7 @@ exists or setup the property manually. For example like this:
<basename file="${file.reference.jaddressbook-core.jar}" property="manifest.file.reference.jaddressbook-core.jar"/>
<basename file="${file.reference.jaddressbook-lib.jar}" property="manifest.file.reference.jaddressbook-lib.jar"/>
<basename file="${file.reference.jmailer-ee.jar}" property="manifest.file.reference.jmailer-ee.jar"/>
- <basename file="${file.reference.addressbook-core.jar}" property="manifest.file.reference.addressbook-core.jar"/>
+ <basename file="${reference.addressbook-core.jar}" property="manifest.reference.addressbook-core.jar"/>
<basename file="${reference.addressbook-lib.jar}" property="manifest.reference.addressbook-lib.jar"/>
<basename file="${reference.addressbook-mailer.jar}" property="manifest.reference.addressbook-mailer.jar"/>
<basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/>
@@ -892,7 +898,7 @@ exists or setup the property manually. For example like this:
<attribute name="jar-12-Extension-Name" value="${manifest.file.reference.jaddressbook-core.jar}"/>
<attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jaddressbook-lib.jar}"/>
<attribute name="jar-14-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
- <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.addressbook-core.jar}"/>
+ <attribute name="jar-15-Extension-Name" value="${manifest.reference.addressbook-core.jar}"/>
<attribute name="jar-16-Extension-Name" value="${manifest.reference.addressbook-lib.jar}"/>
<attribute name="jar-17-Extension-Name" value="${manifest.reference.addressbook-mailer.jar}"/>
<attribute name="jar-18-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
@@ -913,7 +919,7 @@ exists or setup the property manually. For example like this:
<copyfiles files="${file.reference.jaddressbook-core.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.jaddressbook-lib.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.jmailer-ee.jar}" todir="${dist.ear.dir}/lib"/>
- <copyfiles files="${file.reference.addressbook-core.jar}" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${reference.addressbook-core.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${reference.addressbook-lib.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${reference.addressbook-mailer.jar}" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
@@ -1300,6 +1306,7 @@ exists or setup the property manually. For example like this:
CLEANUP SECTION
-->
<target depends="init" name="deps-clean" unless="no.deps">
+ <ant antfile="${project.addressbook-core}/build.xml" inheritall="false" target="clean"/>
<ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="clean"/>
<ant antfile="${project.addressbook-mailer}/build.xml" inheritall="false" target="clean"/>
<ant antfile="${project.juser-core}/build.xml" inheritall="false" target="clean"/>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 765a886..db5f447 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=7d41e0fd
build.xml.stylesheet.CRC32=5910fda3@1.51.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=a1065659
-nbproject/build-impl.xml.script.CRC32=a95e8592
+nbproject/build-impl.xml.data.CRC32=85adc17b
+nbproject/build-impl.xml.script.CRC32=2401f53a
nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1
diff --git a/nbproject/project.properties b/nbproject/project.properties
index eb872f2..f874234 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -21,7 +21,6 @@ dist.jar=${dist.dir}/${jar.name}
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
-file.reference.addressbook-core.jar=lib/addressbook-core.jar
file.reference.addressbook-mailer.jar=lib/addressbook-mailer.jar
file.reference.cdi-api.jar=lib/cdi-api.jar
file.reference.jaddressbook-core.jar=lib/jaddressbook-core.jar
@@ -67,7 +66,7 @@ javac.classpath=\
${file.reference.jaddressbook-core.jar}:\
${file.reference.jaddressbook-lib.jar}:\
${file.reference.jmailer-ee.jar}:\
- ${file.reference.addressbook-core.jar}:\
+ ${reference.addressbook-core.jar}:\
${reference.addressbook-lib.jar}:\
${reference.addressbook-mailer.jar}:\
${file.reference.cdi-api.jar}
@@ -97,11 +96,13 @@ javadoc.windowtitle=Addressbook EJBs
meta.inf=${source.root}/conf
meta.inf.excludes=sun-cmp-mappings.xml
platform.active=default_platform
+project.addressbook-core=../../NetBeansProjects/addressbook-core
project.juser-core=../juser-core
project.license=agpl30
project.addressbook-lib=../addressbook-lib
project.addressbook-mailer=../../NetBeansProjects/addressbook-mailer
project.serviceLocator.class=org.mxchange.addressbook.mailer.model.delivery.AddressbookMailer
+reference.addressbook-core.jar=${project.addressbook-core}/dist/addressbook-core.jar
reference.addressbook-lib.jar=${project.addressbook-lib}/dist/addressbook-lib.jar
reference.addressbook-mailer.jar=${project.addressbook-mailer}/dist/addressbook-mailer.jar
resource.dir=setup
@@ -112,7 +113,6 @@ run.test.classpath=\
# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
runmain.jvmargs=
source.encoding=UTF-8
-source.reference.addressbook-core.jar=../addressbook-core/src/
source.reference.addressbook-mailer.jar=../addressbook-mailer/src/
source.reference.jaddressbook-core.jar=../jaddressbook-core/src/
source.reference.jaddressbook-lib.jar=../jaddressbook-lib/src/
diff --git a/nbproject/project.xml b/nbproject/project.xml
index adca205..8818717 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -19,7 +19,7 @@
<included-library dirs="200">file.reference.jaddressbook-core.jar</included-library>
<included-library dirs="200">file.reference.jaddressbook-lib.jar</included-library>
<included-library dirs="200">file.reference.jmailer-ee.jar</included-library>
- <included-library dirs="200">file.reference.addressbook-core.jar</included-library>
+ <included-library dirs="200">reference.addressbook-core.jar</included-library>
<included-library dirs="200">reference.addressbook-lib.jar</included-library>
<included-library dirs="200">reference.addressbook-mailer.jar</included-library>
<included-library dirs="200">file.reference.cdi-api.jar</included-library>
@@ -34,6 +34,14 @@
<definitions>./lib/nblibraries.properties</definitions>
</libraries>
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+ <reference>
+ <foreign-project>addressbook-core</foreign-project>
+ <artifact-type>jar</artifact-type>
+ <script>build.xml</script>
+ <target>jar</target>
+ <clean-target>clean</clean-target>
+ <id>jar</id>
+ </reference>
<reference>
<foreign-project>addressbook-lib</foreign-project>
<artifact-type>jar</artifact-type>