switched to project-based mailer dependency

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

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index e81d315b9cc0373af106207916f2954872668841..b135e2a90f4e61493a929d8f0cace93d9c115785 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -809,11 +809,17 @@ exists or setup the property manually. For example like this:
         <ant antfile="${project.PizzaService-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
+        <ant antfile="${project.pizzaservice-mailer}/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.PizzaService-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
+        <ant antfile="${project.pizzaservice-mailer}/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">
@@ -843,6 +849,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jmailer-ee.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.pizzaservice-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.PizzaService-lib.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${reference.pizzaservice-mailer.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"/>
@@ -862,8 +869,9 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.jmailer-ee.jar}" property="manifest.file.reference.jmailer-ee.jar"/>
         <basename file="${file.reference.pizzaservice-core.jar}" property="manifest.file.reference.pizzaservice-core.jar"/>
         <basename file="${reference.PizzaService-lib.jar}" property="manifest.reference.PizzaService-lib.jar"/>
+        <basename file="${reference.pizzaservice-mailer.jar}" property="manifest.reference.pizzaservice-mailer.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 "/>
+            <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}"/>
             <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcountry-core.jar}"/>
             <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcountry-lib.jar}"/>
@@ -881,6 +889,7 @@ exists or setup the property manually. For example like this:
             <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
             <attribute name="jar-16-Extension-Name" value="${manifest.file.reference.pizzaservice-core.jar}"/>
             <attribute name="jar-17-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
+            <attribute name="jar-18-Extension-Name" value="${manifest.reference.pizzaservice-mailer.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -901,6 +910,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jmailer-ee.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.pizzaservice-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.PizzaService-lib.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${reference.pizzaservice-mailer.jar}" todir="${dist.ear.dir}/lib"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target name="-copy-meta-inf">
@@ -1285,6 +1295,7 @@ exists or setup the property manually. For example like this:
             -->
     <target depends="init" name="deps-clean" unless="no.deps">
         <ant antfile="${project.PizzaService-lib}/build.xml" inheritall="false" target="clean"/>
+        <ant antfile="${project.pizzaservice-mailer}/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 fa7f097a28df982769d529203da954486b3668a3..25ad5d768375cd326beb06da31f0fae111a5655a 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ 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=36b9a6ad
-nbproject/build-impl.xml.script.CRC32=9b14e713
+nbproject/build-impl.xml.data.CRC32=cc2225c1
+nbproject/build-impl.xml.script.CRC32=03599020
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index e12fad6262b0040058b190988295e4ab2733244d..4bdffbfc64715b822be4e1646fa30f1e3757f259 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -71,6 +71,7 @@ javac.classpath=\
     ${file.reference.jmailer-ee.jar}:\
     ${file.reference.pizzaservice-core.jar}:\
     ${reference.PizzaService-lib.jar}:\
+    ${reference.pizzaservice-mailer.jar}:\
     ${file.reference.cdi-api.jar}
 javac.debug=true
 javac.deprecation=true
@@ -99,7 +100,9 @@ meta.inf.excludes=sun-cmp-mappings.xml
 platform.active=default_platform
 project.license=agpl30
 project.pizzaservice-lib=../pizzaservice-lib
+project.pizzaservice-mailer=../../NetBeansProjects/pizzaservice-mailer
 reference.PizzaService-lib.jar=${project.PizzaService-lib}/dist/PizzaService-lib.jar
+reference.pizzaservice-mailer.jar=${project.pizzaservice-mailer}/dist/pizzaservice-mailer.jar
 resource.dir=setup
 run.test.classpath=\
     ${javac.test.classpath}:\

diff --git a/nbproject/project.xml b/nbproject/project.xml
index f6e7a33ffed306f26ee10f3b017b8e313ccd8110..1c3dfb203a9fb0351ae6fc2fac6d0cc612828f1d 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -22,6 +22,7 @@
             <included-library dirs="200">file.reference.jmailer-ee.jar</included-library>
             <included-library dirs="200">file.reference.pizzaservice-core.jar</included-library>
             <included-library dirs="200">reference.PizzaService-lib.jar</included-library>
+            <included-library dirs="200">reference.pizzaservice-mailer.jar</included-library>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>
@@ -41,6 +42,14 @@
                 <clean-target>clean</clean-target>
                 <id>jar</id>
             </reference>
+            <reference>
+                <foreign-project>pizzaservice-mailer</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>${project.pizzaservice-mailer}/build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
         </references>
     </configuration>
 </project>