introduced addressbook-mailer which is a mailer class for the addressbook project

diff --git a/lib/addressbook-mailer.jar b/lib/addressbook-mailer.jar
new file mode 100644 (file)
index 0000000..a3c369f
Binary files /dev/null and b/lib/addressbook-mailer.jar differ

diff --git a/lib/jmailer-ee.jar b/lib/jmailer-ee.jar
index ec343a7cc8b5b2bfa7d1581a51a80d6435b9a38e..6874cfe8851ca81ce3863a345d53a98a8a24b632 100644 (file)
Binary files a/lib/jmailer-ee.jar and b/lib/jmailer-ee.jar differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index ba62e202a2be6649b2aa4a0b13f86539c28410f5..42cd1337471369f3f73a11ca5a31903b79e62359 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -842,6 +842,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.juser-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.juser-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jmailer-ee.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}"/>
     </target>
@@ -856,10 +857,11 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.juser-core.jar}" property="manifest.file.reference.juser-core.jar"/>
         <basename file="${file.reference.juser-lib.jar}" property="manifest.file.reference.juser-lib.jar"/>
         <basename file="${file.reference.jmailer-ee.jar}" property="manifest.file.reference.jmailer-ee.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"/>
         <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 "/>
+            <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 "/>
             <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcore.jar}"/>
             <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
             <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
@@ -870,8 +872,9 @@ exists or setup the property manually. For example like this:
             <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/>
             <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/>
             <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
-            <attribute name="jar-11-Extension-Name" value="${manifest.reference.addressbook-lib.jar}"/>
-            <attribute name="jar-12-Extension-Name" value="${manifest.reference.juser-core.jar}"/>
+            <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.addressbook-mailer.jar}"/>
+            <attribute name="jar-12-Extension-Name" value="${manifest.reference.addressbook-lib.jar}"/>
+            <attribute name="jar-13-Extension-Name" value="${manifest.reference.juser-core.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -885,6 +888,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.juser-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jmailer-ee.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"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 566ff5d387fb7509d1ea6dd1ff154c06d5dad43c..0438788b5a0222082417fbb1f22f68b41c0fba17 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=4a04b58e
-nbproject/build-impl.xml.script.CRC32=5b2dfdcd
+nbproject/build-impl.xml.data.CRC32=bc3e0f41
+nbproject/build-impl.xml.script.CRC32=9c66876e
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index de73a6c52e5523fd76f7df7ac73058156bc11449..7a428466f4e6c69a8a08ae32b10928fb4e843694 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.addressbook-mailer.jar=lib/addressbook-mailer.jar
 file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar
 file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
 file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar
@@ -56,6 +57,7 @@ javac.classpath=\
     ${file.reference.juser-core.jar}:\
     ${file.reference.juser-lib.jar}:\
     ${file.reference.jmailer-ee.jar}:\
+    ${file.reference.addressbook-mailer.jar}:\
     ${reference.addressbook-lib.jar}:\
     ${reference.juser-core.jar}
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
@@ -97,6 +99,7 @@ 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-mailer.jar=../addressbook-mailer/src/
 source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/
 source.reference.jcontacts-core.jar=../jcontacts-core/src/
 source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 098497ac9caa9937697fa602a50cd44df0280b4b..7290bc76fb4d78ff9c5bc142f79e018eb652ce10 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -15,6 +15,7 @@
             <included-library dirs="200">file.reference.juser-core.jar</included-library>
             <included-library dirs="200">file.reference.juser-lib.jar</included-library>
             <included-library dirs="200">file.reference.jmailer-ee.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>
             <source-roots>

diff --git a/src/java/org/mxchange/jusercore/model/email_address/AddressbookEmailChangeSessionBean.java b/src/java/org/mxchange/jusercore/model/email_address/AddressbookEmailChangeSessionBean.java
index 88d2c6e22149007523ab2983f762089f0bf77fb6..09d1ec85874b8ec21b3406da90f85a353622c7fc 100644 (file)
--- a/src/java/org/mxchange/jusercore/model/email_address/AddressbookEmailChangeSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/email_address/AddressbookEmailChangeSessionBean.java
@@ -36,9 +36,9 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
+import org.mxchange.addressbook.mailer.model.delivery.AddressbookMailer;
+import org.mxchange.addressbook.mailer.model.delivery.DeliverableAddressbookEmail;
 import org.mxchange.jcoreee.database.BaseDatabaseBean;
-import org.mxchange.jmailee.model.delivery.DeliverableEmail;
-import org.mxchange.jmailee.model.delivery.Mailer;
 import org.mxchange.jusercore.model.user.UserSessionBeanRemote;
 import org.mxchange.jusercore.model.user.UserUtils;
 
@@ -146,9 +146,8 @@ public class AddressbookEmailChangeSessionBean extends BaseDatabaseBean implemen
 
                // Persist it
                //this.getEntityManager().persist(emailChange);
-
                // Get mailer instance
-               DeliverableEmail mailer = new Mailer();
+               DeliverableAddressbookEmail mailer = new AddressbookMailer();
 
                // Send out email change
                mailer.sendEmailChangeMail(this.messageProducer, this.message, emailChange);