From 2184f0478f7f9d86e576ceb548c739f9dc0f3342 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 1 Apr 2016 20:28:05 +0200 Subject: [PATCH] introduced addressbook-mailer which is a mailer class for the addressbook project --- lib/addressbook-mailer.jar | Bin 0 -> 3900 bytes lib/jmailer-ee.jar | Bin 8085 -> 9433 bytes nbproject/build-impl.xml | 10 +++++++--- nbproject/genfiles.properties | 4 ++-- nbproject/project.properties | 3 +++ nbproject/project.xml | 1 + .../AddressbookEmailChangeSessionBean.java | 7 +++---- 7 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 lib/addressbook-mailer.jar diff --git a/lib/addressbook-mailer.jar b/lib/addressbook-mailer.jar new file mode 100644 index 0000000000000000000000000000000000000000..a3c369f830d77df8e31c4280e2d72366eb532cd2 GIT binary patch literal 3900 zcmd5;J!~9B6n=BR_Tj@OF+oYgB?YpH?#>Ag1c-n;+b8^U&LLk+6(w_bL%f&uuGw8j zq;!)G(I83+2o<8BLZSdFibzy+NHla5Nt86Hh-<9Xnwu-J}6@xQcz!NR*K8(wesUT0FD0E4cuD!^1E9*xSi%S&i>YVWqrA} zw9zcpYjtiJ9|_khZVJaWZ0oJUnbKT7SFx0p$_{UDi2|68wz(CykScfb!_>}A~sRZMq4XknZ=SUAFR3iYFtSARa00H9gZQPlYL z90)AwgH>dN>wct4ZIiq1oyR}^gkZ11OF2lw(JV}7;l(T*V=(0k$KYl!@h>eeGGHqV z@(Z@*dff6hxw$LS@b1T7-23*MUm0XB7?$C^!yq{`yU8H6fT3hCxn@{meRsPhoF;FX zxN>C8ZX+y5aD4AAro1h~Wl&uUCGZn?^)`dthP~^wMGe!D!LdQVyZi>9fE+x>;Jw4D zV^9h~bbazgStGy7T@kR(U?n7Qu#1a9A`@APFH58dPC^2shGgSB0cptKJ&WN?U^&Ea zk&}3xz?HK94v>EJ2Vmd(Tc}=;0HEmec%AT{(=Z8B_{QJ`ye8mCxZup*t&Tm!4>TJ% zpPn;XK8|N0lZ9*+#l@k{#<9e7a(EYsxrAd1?pEmDZxn-`Qi?`(l_Wsp_TFi{_C=K*v#}}>^j?E%L@-GC zZ}>mduXSio*A#G?B9#=%gRDQ)~P4rb8dsIF6j zeSR=lq^D6`=)RG+_x{jP)qLp%T069qenu_7DlMc_?>VH-t7(nhgLNurouXbjFIDYP zC$iN3OGeYK##VDxQA@RSh`y*pOzQgwTf3pTr0J6dJLm!$t7)_ru(_Lrzp$z-VzC4G E7icgAwEzGB literal 0 HcmV?d00001 diff --git a/lib/jmailer-ee.jar b/lib/jmailer-ee.jar index ec343a7cc8b5b2bfa7d1581a51a80d6435b9a38e..6874cfe8851ca81ce3863a345d53a98a8a24b632 100644 GIT binary patch delta 2789 zcmZuzYjhLG75+wAYuBrlv1Jt_+p;B0BH@?7JZdoD*nn#nI}ppI2$Ghyym4e?$FmV`ls!W{%hLaS;@Ab)}EO= z_s*UBp3yzs`KLbDo?UiH1r*@c=ci7(LiPg$+RxZMXQobmTyKGYhXmk3w#I_{*+#*{ zIqR$-*xRFBalP*b#8}UtW5H~6{Rp$B4rdz$~dgzD>&kW14m_iRlzY86*#WoE(Ir?$l`7V zQ%>B2uPL}!#n+MjhKz42xKBk5j*E@^6+Ga?gLp{6!wMb|XC77Y7*2}mTMD?0QwmP2 z2;#VmZwq4{SJ8+k#Pnn-p2BxjJdI}r`dt}kRIEi@AkT{FITg?21sT&aUSudY4Ss{v z!2K>YppK1G6voCf3LAPdnab!HB8LYJGc}ox z866B#QXe-MoR+AtC5wk#d)Yd^)z!w|b3JBT)6Y-Js{)Hbr&F#-MvomD&?koU;e=t? zHgW#hvQDysDlNlqOG&13V__#4ZNA*$R zl)Cds%$N|anljE39FjjiG^`aMzUkGoBh7KB3WrTMU?j(2}`sn5n*2_0l?a1~KtqwBH zowU;pjks#iN3a5JrdChW!@g168phwZ;~l*t$r zQ$*M^gfGzC3$VYD9*N+V#vC-a%kd`4vQc|eBq}vWq9rYni&!>`avNCFS-9p<5p}y~ zPE7$;IaI5sp2o`T9BQKOT8T`F+Vi5U zbHbJx_zKczQMV|nzE~8|XW?Jm3@o)-P!_awt-MB8R!Fua6lrW=$YE6uH#{l4BKvL> zrpzH2b%$oK`Z5LDPALNRV>!*cDdK}@pg^}!sN3*GY{5Qs(e5rBAnI-S5`76A#9`>T zA2E7wM@Yl%^qOTyaTRfVf-(FH3FgH(3n9hYkhZekn9o-s!<0GfCGnJXTJ1xWDom{Q zlN!5~e+_C&S(&?PZB=c@3OY;AcRu$B6BN}_(s%*#E3~j#9%Myb0>>4XsVmMTB!$uCS%$37E1P$lF5E$ioG`QKkwIkJ$iQcRpmh znJLtg^#->D&hZoWTZs0dyy9(b;798^RSbWd;b}!M|ed^n=rRcxeYVG#yVm6OG-#}Vsl9m1Bz8K=!ng2~s z{nf+o^!fN2kC%7Xx&8CzZ=}vsjBWFr1gEDST5d5PEb;M|3(Uf=Pe`g5;sKlgO;6R; W7nn=Azq*EJ>oxU|9oQETEdK-al&+ls delta 1570 zcmZuxZA@EL7=BJ~>Ak(Z<)ef0RVcJ<#RB7Fz&buG!-)(iE0%2*H%7q@*}4t+^4r2T zb@OxVFcYHDXqIJv6$2uh;IAddfBU5o6BGS|fBa)ij6vUXDJf3x&3T{mKIgped(L^1 z_q)S4{MKNnWK;nKSerdJYb}-T68Jun?ht(M)ZwpE0o=o?bnIjGI&$V$h;QFG`u;8c zXJ&xaF0^NLGoAb4m*^({(B4DbZ+4%OA@=<``N#ZqDxTt-MnuY#j0%s8gtxQr)Mgwbb#2~Wy6 zq2Q#7bo47YrC`8<2nH1lS@0C13QnsS#?vxJ6r53UAP@aw;jDs~1?O;H!371QBIX$t zV;C1^LcyerDFx4}*n@r<&&hb6w`7;{GD+pPrCuJE9EN>eoGI13(s+%P^EKn{f~~7H zGFU?sk)gAJ$Y^h5Fc#IrLkp%9KPyy27beGsqHXjB43@-OoQX_DG%TDJWS}Pkq*P(6v||@2y@UvJ6iDw*?NF&P#q&-llODTHqCSw z)_7Pd3x$p4p>Rq?=nJGSBh3I-b_>=Oq=#)8OR%l7@@;pQ?pAEOnZm7DMi#@pM1Va> zEh9V0=RCkKB3GUJ0Iv87^1`-!BON6yZKcxV#95Z$NMv6|K{8e0&Q!!N!+l^iX(T^U)5W*CBS8)utahxiIv4(gb?&Ad3aT34d6wAc`E5#tI zK~z`WyQNn`VNwo+Sfsx0iDSPD4NvZ zxA!a8DTf%`=j@;ccFFk@lc+iJ;bNcYj{K8izuo|UF0Rzk?(*r_<7&}y&ef*ly6cGE z_(X&3qI_aB@Md=%_h#AohFeRv%1yW35R>?)t^z)tQ^12Iwxa*EOgirNcXMXblGtqa u?d+n#PG-oIw)**l*AZ{9{oS1TF?TxwA8_W|gPkcRv1p-xSORh!!utmU?p=KV diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index ba62e20..42cd133 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -842,6 +842,7 @@ exists or setup the property manually. For example like this: + @@ -856,10 +857,11 @@ exists or setup the property manually. For example like this: + - + @@ -870,8 +872,9 @@ exists or setup the property manually. For example like this: - - + + + @@ -885,6 +888,7 @@ exists or setup the property manually. For example like this: + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 566ff5d..0438788 100644 --- 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 de73a6c..7a42846 100644 --- 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 098497a..7290bc7 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -15,6 +15,7 @@ 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 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 88d2c6e..09d1ec8 100644 --- 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); -- 2.39.5