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 5a4560a25a42f6a04bba6f394616d39c55f4c19a..1517d28fb3d1fed6e662fbb32f4c1ff88abb68a7 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -809,11 +809,23 @@ exists or setup the property manually. For example like this:
         <ant antfile="${project.jjobs-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
+        <ant antfile="${project.jjobs-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>
     </target>
     <target depends="init" if="dist.ear.dir" name="-deps-ear-jar" unless="no.deps">
         <ant antfile="${project.jjobs-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
+        <ant antfile="${project.jjobs-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>
     </target>
     <target depends="init, -deps-module-jar, -deps-ear-jar" name="deps-jar"/>
     <target depends="init,deps-jar" name="-pre-pre-compile">
@@ -841,9 +853,10 @@ 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.jjobs-mailer.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jjobs-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.jjobs-lib.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${reference.jjobs-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"/>
@@ -861,11 +874,12 @@ 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.jjobs-mailer.jar}" property="manifest.file.reference.jjobs-mailer.jar"/>
         <basename file="${file.reference.jjobs-core.jar}" property="manifest.file.reference.jjobs-core.jar"/>
         <basename file="${reference.jjobs-lib.jar}" property="manifest.reference.jjobs-lib.jar"/>
+        <basename file="${reference.jjobs-mailer.jar}" property="manifest.reference.jjobs-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="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 jar-19 "/>
             <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
             <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
             <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcontacts-core.jar}"/>
@@ -881,9 +895,10 @@ exists or setup the property manually. For example like this:
             <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jaddressbook-core.jar}"/>
             <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.jaddressbook-lib.jar}"/>
             <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
-            <attribute name="jar-16-Extension-Name" value="${manifest.file.reference.jjobs-mailer.jar}"/>
-            <attribute name="jar-17-Extension-Name" value="${manifest.file.reference.jjobs-core.jar}"/>
-            <attribute name="jar-18-Extension-Name" value="${manifest.reference.jjobs-lib.jar}"/>
+            <attribute name="jar-16-Extension-Name" value="${manifest.file.reference.jjobs-core.jar}"/>
+            <attribute name="jar-17-Extension-Name" value="${manifest.reference.jjobs-lib.jar}"/>
+            <attribute name="jar-18-Extension-Name" value="${manifest.reference.jjobs-mailer.jar}"/>
+            <attribute name="jar-19-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -902,9 +917,10 @@ 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.jjobs-mailer.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jjobs-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.jjobs-lib.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${reference.jjobs-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">
@@ -1289,6 +1305,8 @@ exists or setup the property manually. For example like this:
             -->
     <target depends="init" name="deps-clean" unless="no.deps">
         <ant antfile="${project.jjobs-lib}/build.xml" inheritall="false" target="clean"/>
+        <ant antfile="${project.jjobs-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">
         <delete dir="${build.dir}"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index f73937b5ec955f43315cd835a3e3f7d2ffdccc57..c90f31ad313ef329a53696d9cea8cc8d11829cc1 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=5fb6c6cd
+build.xml.data.CRC32=69fcbf33
 build.xml.script.CRC32=9c0f08a9
 build.xml.stylesheet.CRC32=5910fda3@1.55.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=5fb6c6cd
-nbproject/build-impl.xml.script.CRC32=b5ddce5f
+nbproject/build-impl.xml.data.CRC32=69fcbf33
+nbproject/build-impl.xml.script.CRC32=fda42d8a
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 4e1a48c2d9d3e76c231c23325c96401df9ef16ed..3332822f3c0685c9dcac973e1fccfd943bb0424a 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -21,6 +21,7 @@ dist.jar=${dist.dir}/${jar.name}
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
+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
@@ -68,10 +69,10 @@ javac.classpath=\
     ${file.reference.jaddressbook-core.jar}:\
     ${file.reference.jaddressbook-lib.jar}:\
     ${file.reference.jmailer-ee.jar}:\
-    ${file.reference.jjobs-mailer.jar}:\
     ${file.reference.jjobs-core.jar}:\
-    ${reference.jjobs-lib.jar}
-javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
+    ${reference.jjobs-lib.jar}:\
+    ${reference.jjobs-mailer.jar}:\
+    ${file.reference.cdi-api.jar}
 javac.debug=true
 javac.deprecation=true
 javac.processorpath=\
@@ -98,8 +99,11 @@ meta.inf=${source.root}/conf
 meta.inf.excludes=sun-cmp-mappings.xml
 platform.active=default_platform
 project.jjobs-lib=../jjobs-lib
+project.jjobs-mailer=../jjobs-mailer
+project.juser-core=../juser-core
 project.license=agpl30
 reference.jjobs-lib.jar=${project.jjobs-lib}/dist/jjobs-lib.jar
+reference.jjobs-mailer.jar=${project.jjobs-mailer}/dist/jjobs-mailer.jar
 resource.dir=setup
 run.test.classpath=\
     ${javac.test.classpath}:\

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 23a90111f1c0018a17bd1aca389060cc1e459491..9014f651713d6ceb1af25b0ac6daf832d481c97d 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -20,9 +20,10 @@
             <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.jjobs-mailer.jar</included-library>
             <included-library dirs="200">file.reference.jjobs-core.jar</included-library>
             <included-library dirs="200">reference.jjobs-lib.jar</included-library>
+            <included-library dirs="200">reference.jjobs-mailer.jar</included-library>
+            <included-library dirs="200">file.reference.cdi-api.jar</included-library>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>
@@ -42,6 +43,22 @@
                 <clean-target>clean</clean-target>
                 <id>jar</id>
             </reference>
+            <reference>
+                <foreign-project>jjobs-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>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
         </references>
     </configuration>
 </project>