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 2f9622e5d4825986ea77057395ff634cb9b4a49e..961c79916db9b453984232885788f8a15174c323 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -878,6 +878,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>
@@ -886,6 +889,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>
@@ -1036,10 +1042,13 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
+        <copyfiles files="${reference.addressbook-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
-    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
+    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
+        <copyfiles files="${reference.addressbook-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+    </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>
     </target>
@@ -1452,6 +1461,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"/>
     </target>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index d3239fb7988b4bf53b4e90fe974b2e56e2973d36..ce3203167b48656a0e8a4a2852d848775074d5e0 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=be5f34f7
 build.xml.stylesheet.CRC32=651128d4@1.68.1.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=3cd401ae
-nbproject/build-impl.xml.script.CRC32=b5ddf432
+nbproject/build-impl.xml.data.CRC32=f07494a8
+nbproject/build-impl.xml.script.CRC32=8dc59c00
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 83f5d30cfb5c8994e300e8c5cea06982032dfb98..203ad966cfbb5ca44fd61ace6be57c1c317b8535 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -35,7 +35,6 @@ dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
 endorsed.classpath=
 excludes=
-file.reference.addressbook-core.jar=lib/addressbook-core.jar
 file.reference.cdi-api.jar=lib/cdi-api.jar
 file.reference.gf-client.jar=lib/gf-client.jar
 file.reference.jaddressbook-core.jar=lib/jaddressbook-core.jar
@@ -80,7 +79,7 @@ javac.classpath=\
     ${file.reference.juser-lib.jar}:\
     ${file.reference.jaddressbook-core.jar}:\
     ${file.reference.jaddressbook-lib.jar}:\
-    ${file.reference.addressbook-core.jar}:\
+    ${reference.addressbook-core.jar}:\
     ${reference.addressbook-lib.jar}:\
     ${reference.addressbook-mailer.jar}:\
     ${file.reference.cdi-api.jar}:\
@@ -118,9 +117,11 @@ javadoc.windowtitle=Addressbook Web Application
 lib.dir=${web.docbase.dir}/WEB-INF/lib
 persistence.xml.dir=${conf.dir}
 platform.active=default_platform
+project.addressbook-core=../../NetBeansProjects/addressbook-core
 project.addressbook-lib=../addressbook-lib
 project.addressbook-mailer=../../NetBeansProjects/addressbook-mailer
 project.license=agpl30
+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
@@ -131,7 +132,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.jaddressbook-core.jar=../jaddressbook-core/src/
 source.reference.jaddressbook-lib.jar=../jaddressbook-lib/src/
 source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index a19c4f59ffb50ebe7068eed02de276a3d54e8725..a7ea36a57d25b99391b696d830043bac438aa644 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -7,10 +7,10 @@
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <web-module-libraries>
                 <library dirs="200">
-                    <file>${file.reference.jcore-logger-lib.jar}</file>
+                    <file>${file.reference.jcoreee.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jcoreee.jar}</file>
+                    <file>${file.reference.jcore-logger-lib.jar}</file>
                 </library>
                 <library dirs="200">
                     <file>${file.reference.jcountry-core.jar}</file>
@@ -19,19 +19,19 @@
                     <file>${file.reference.jcountry-lib.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jphone-core.jar}</file>
+                    <file>${file.reference.jcontacts-core.jar}</file>
                 </library>
                 <library dirs="200">
                     <file>${file.reference.jcontacts-business-core.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jphone-lib.jar}</file>
+                    <file>${file.reference.jcontacts-lib.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jcontacts-core.jar}</file>
+                    <file>${file.reference.jphone-core.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jcontacts-lib.jar}</file>
+                    <file>${file.reference.jphone-lib.jar}</file>
                 </library>
                 <library dirs="200">
                     <file>${file.reference.juser-core.jar}</file>
@@ -39,18 +39,6 @@
                 <library dirs="200">
                     <file>${file.reference.juser-lib.jar}</file>
                 </library>
-                <library dirs="200">
-                    <file>${file.reference.jcustomer-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jcustomer-lib.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jshop-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jshop-ee-lib.jar}</file>
-                </library>
                 <library dirs="200">
                     <file>${file.reference.jaddressbook-core.jar}</file>
                 </library>
@@ -58,7 +46,8 @@
                     <file>${file.reference.jaddressbook-lib.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.addressbook-core.jar}</file>
+                    <file>${reference.addressbook-core.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
                     <file>${reference.addressbook-lib.jar}</file>
@@ -94,6 +83,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>