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 5c41e044ce80475012afb7bf55d0543c724632ad..dc60a73a6c8d2f322535ec73c07be9347f23a2e5 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>
     </target>
     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     <target depends="init" name="-check-automatic-build">
@@ -1412,6 +1420,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>
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 0a4dc2e4923e0e041b9b446759bb8daa5f5ce3d8..0e06c2ab89bbf90f452244cdf30580da120adcf7 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -30,7 +30,6 @@ dist.jar=${dist.dir}/addressbook-lib.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.addressbook-core.jar=lib/addressbook-core.jar
 file.reference.jaddressbook-core.jar=lib/jaddressbook-core.jar
 file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar
 file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
@@ -49,7 +48,7 @@ javac.classpath=\
     ${file.reference.jcontacts-business-core.jar}:\
     ${file.reference.juser-core.jar}:\
     ${file.reference.jaddressbook-core.jar}:\
-    ${file.reference.addressbook-core.jar}:\
+    ${reference.addressbook-core.jar}:\
     ${libs.javaee-api-7.0.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
@@ -92,7 +91,9 @@ 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.license=gpl30
+reference.addressbook-core.jar=${project.addressbook-core}/dist/addressbook-core.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
@@ -100,7 +101,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.jaddressbook-core.jar=../jaddressbook-core/src/
 source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/
 source.reference.jcontacts-core.jar=../jcontacts-core/src/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index b484b16345263c3a67f73657d0e1c8b2a3e06f63..c8ffc355b5faf27681207198e3ddae5cdefb6688 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -14,5 +14,15 @@
         <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
             <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>
+        </references>
     </configuration>
 </project>