switched to project-based mailer dependency

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/lib/cdi-api.jar b/lib/cdi-api.jar
new file mode 100644 (file)
index 0000000..1fa239e
Binary files /dev/null and b/lib/cdi-api.jar differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 5fe6d599b49f1b75a024059bf877b00079cb4397..394e5d156922043b827f8c2653a860e38697c6f3 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -36,7 +36,7 @@ is divided into following sections:
         <property file="nbproject/private/private.properties"/>
     </target>
     <target name="-pre-init-libraries">
-        <property location=".\lib\nblibraries.properties" name="libraries.path"/>
+        <property location="./lib/nblibraries.properties" name="libraries.path"/>
         <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>
         <pathconvert dirsep="/" property="libraries.dir">
             <path path="${libraries.dir.nativedirsep}"/>
@@ -809,6 +809,9 @@ exists or setup the property manually. For example like this:
         <ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
+        <ant antfile="${project.addressbook-mailer}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
         <ant antfile="${project.juser-core}/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 antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
+        <ant antfile="${project.addressbook-mailer}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
         <ant antfile="${project.juser-core}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
@@ -847,9 +853,9 @@ exists or setup the property manually. For example like this:
         <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="${file.reference.addressbook-mailer.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.addressbook-lib.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${reference.juser-core.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}"/>
     </target>
     <target if="is.server.weblogic" name="-library-inclusion-in-archive-weblogic">
         <basename file="${file.reference.jcoreee.jar}" property="manifest.file.reference.jcoreee.jar"/>
@@ -867,9 +873,9 @@ exists or setup the property manually. For example like this:
         <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="${file.reference.addressbook-mailer.jar}" property="manifest.file.reference.addressbook-mailer.jar"/>
         <basename file="${reference.addressbook-lib.jar}" property="manifest.reference.addressbook-lib.jar"/>
-        <basename file="${reference.juser-core.jar}" property="manifest.reference.juser-core.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"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update">
             <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 jar-16 jar-17 jar-18 "/>
             <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
@@ -887,9 +893,9 @@ exists or setup the property manually. For example like this:
             <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-16-Extension-Name" value="${manifest.file.reference.addressbook-mailer.jar}"/>
-            <attribute name="jar-17-Extension-Name" value="${manifest.reference.addressbook-lib.jar}"/>
-            <attribute name="jar-18-Extension-Name" value="${manifest.reference.juser-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}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -908,9 +914,9 @@ exists or setup the property manually. For example like this:
         <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="${file.reference.addressbook-mailer.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.addressbook-lib.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${reference.juser-core.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"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target name="-copy-meta-inf">
@@ -1295,6 +1301,7 @@ exists or setup the property manually. For example like this:
             -->
     <target depends="init" name="deps-clean" unless="no.deps">
         <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"/>
     </target>
     <target depends="init" name="-do-clean">

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index a4e4ecc958fbebbde9bfd6fe7f2c4e2a45d0c63d..765a88650d3b5dbf87ac78e55fece0c57e210da6 100644 (file)
--- 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=6de8b194
-nbproject/build-impl.xml.script.CRC32=5fbd1cf3
+nbproject/build-impl.xml.data.CRC32=a1065659
+nbproject/build-impl.xml.script.CRC32=a95e8592
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index f78ea60a6240eed3c5e2b2190a3c3088f8ba4230..eb3efefc74f979777ecc79a815bb4753ee786a78 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -23,6 +23,7 @@ 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
 file.reference.jaddressbook-lib.jar=lib/jaddressbook-lib.jar
 file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar
@@ -67,10 +68,9 @@ javac.classpath=\
     ${file.reference.jaddressbook-lib.jar}:\
     ${file.reference.jmailer-ee.jar}:\
     ${file.reference.addressbook-core.jar}:\
-    ${file.reference.addressbook-mailer.jar}:\
     ${reference.addressbook-lib.jar}:\
-    ${reference.juser-core.jar}
-javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
+    ${reference.addressbook-mailer.jar}:\
+    ${file.reference.cdi-api.jar}
 javac.debug=true
 javac.deprecation=true
 javac.processorpath=\
@@ -97,10 +97,11 @@ meta.inf=${source.root}/conf
 meta.inf.excludes=sun-cmp-mappings.xml
 platform.active=default_platform
 project.addressbook-lib=../addressbook-lib
+project.addressbook-mailer=../../NetBeansProjects/addressbook-mailer
 project.juser-core=../juser-core
 project.license=agpl30
 reference.addressbook-lib.jar=${project.addressbook-lib}/dist/addressbook-lib.jar
-reference.juser-core.jar=${project.juser-core}/dist/juser-core.jar
+reference.addressbook-mailer.jar=${project.addressbook-mailer}/dist/addressbook-mailer.jar
 resource.dir=setup
 run.test.classpath=\
     ${javac.test.classpath}:\

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 0763f70bd17247a964c102d5fcd132b652cf316d..adca2054e18a774ead927647f428047622f47a65 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -20,9 +20,9 @@
             <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">file.reference.addressbook-mailer.jar</included-library>
             <included-library dirs="200">reference.addressbook-lib.jar</included-library>
-            <included-library dirs="200">reference.juser-core.jar</included-library>
+            <included-library dirs="200">reference.addressbook-mailer.jar</included-library>
+            <included-library dirs="200">file.reference.cdi-api.jar</included-library>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>
@@ -31,7 +31,7 @@
             </test-roots>
         </data>
         <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
-            <definitions>.\lib\nblibraries.properties</definitions>
+            <definitions>./lib/nblibraries.properties</definitions>
         </libraries>
         <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
             <reference>
@@ -42,6 +42,14 @@
                 <clean-target>clean</clean-target>
                 <id>jar</id>
             </reference>
+            <reference>
+                <foreign-project>addressbook-mailer</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>juser-core</foreign-project>
                 <artifact-type>jar</artifact-type>