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 (file)
index 36c8f87..0000000
Binary files a/lib/addressbook-core.jar and /dev/null differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 68971d4ad4300b2ceb9f3e4707541c22390075d3..0f8fd25aa5da6becc17f01e851bbc620f1ee961d 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -927,6 +927,14 @@ is divided into following sections:
         <propertyfile file="${built-jar.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-jar.properties}"/>
+            <param location="${project.addressbook-core}" name="call.subproject"/>
+            <param location="${project.addressbook-core}/build.xml" name="call.script"/>
+            <param name="call.target" value="jar"/>
+            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
         <antcall target="-maybe-call-dep">
             <param name="call.built.properties" value="${built-jar.properties}"/>
             <param location="${project.addressbook-lib}" name="call.subproject"/>
@@ -1420,6 +1428,14 @@ is divided into following sections:
         <propertyfile file="${built-clean.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-clean.properties}"/>
+            <param location="${project.addressbook-core}" name="call.subproject"/>
+            <param location="${project.addressbook-core}/build.xml" name="call.script"/>
+            <param name="call.target" value="clean"/>
+            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
         <antcall target="-maybe-call-dep">
             <param name="call.built.properties" value="${built-clean.properties}"/>
             <param location="${project.addressbook-lib}" name="call.subproject"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 68ef8a360acf50cb4ee210bd15715dd0f06202c7..50110289069d991bed0fc6d43a7eeaf2b96c0a3d 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=9bef99a6
 build.xml.stylesheet.CRC32=8064a381@1.75.2.48
 # 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=a2ef3a71
-nbproject/build-impl.xml.script.CRC32=73834a8e
+nbproject/build-impl.xml.data.CRC32=383c2e73
+nbproject/build-impl.xml.script.CRC32=eb30b78c
 nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48

diff --git a/nbproject/project.properties b/nbproject/project.properties
index b7645e2d9bfe10b5f892c01cc31cf66e43d4f670..1341457578b62c43121f1f45466cb948782a4b3d 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -30,7 +30,6 @@ dist.jar=${dist.dir}/addressbook-swing.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.addressbook-core.jar=lib/addressbook-core.jar
 file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar
 file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
 file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar
@@ -50,7 +49,7 @@ javac.classpath=\
     ${file.reference.jphone-core.jar}:\
     ${file.reference.jcontacts-core.jar}:\
     ${file.reference.jcontacts-business-core.jar}:\
-    ${file.reference.addressbook-core.jar}:\
+    ${reference.addressbook-core.jar}:\
     ${reference.addressbook-lib.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:deprecation -Xlint:unchecked
@@ -94,8 +93,10 @@ manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=true
 platform.active=default_platform
+project.addressbook-core=../../NetBeansProjects/addressbook-core
 project.addressbook-lib=../addressbook-lib
 project.license=gpl30
+reference.addressbook-core.jar=${project.addressbook-core}/dist/addressbook-core.jar
 reference.addressbook-lib.jar=${project.addressbook-lib}/dist/addressbook-lib.jar
 run.classpath=\
     ${javac.classpath}:\
@@ -108,7 +109,6 @@ run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
 source.encoding=UTF-8
-source.reference.addressbook-core.jar=../addressbook-core/src
 source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/
 source.reference.jcontacts-core.jar=../jcontacts-core/src/
 source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 96837cd2bbcc58c93f6d28ca4e6d7b1ce9ace553..68226b4b0df510fbbdb7fd9470c65b434fa5156b 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -15,6 +15,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>