From 888af59909d3d25e5fa5867afb8cb38dae106bd4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 8 Jul 2017 19:15:04 +0200 Subject: [PATCH] Please cherry-pick: - this message-driven bean has been moved to new project - also the mailer's initialization and config properties MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/build-impl.xml | 16 +- nbproject/project.properties | 11 +- nbproject/project.xml | 4 +- .../PizzaEmailDeliveryMessageBean.java | 203 ------------------ .../org/mxchange/jmailer/config.properties | 21 -- 5 files changed, 15 insertions(+), 240 deletions(-) delete mode 100644 src/java/org/mxchange/jmailee/model/delivery/PizzaEmailDeliveryMessageBean.java delete mode 100644 src/java/org/mxchange/jmailer/config.properties diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 2a4528f..68097ec 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -812,7 +812,7 @@ exists or setup the property manually. For example like this: - + @@ -826,7 +826,7 @@ exists or setup the property manually. For example like this: - + @@ -866,7 +866,7 @@ exists or setup the property manually. For example like this: - + @@ -892,7 +892,7 @@ exists or setup the property manually. For example like this: - + @@ -918,8 +918,8 @@ exists or setup the property manually. For example like this: - - + + @@ -945,7 +945,7 @@ exists or setup the property manually. For example like this: - + @@ -1332,7 +1332,7 @@ exists or setup the property manually. For example like this: - + diff --git a/nbproject/project.properties b/nbproject/project.properties index 478e55f..61e07f8 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -41,7 +41,7 @@ file.reference.juser-core.jar=lib/juser-core.jar file.reference.juser-lib.jar=lib/juser-lib.jar file.reference.juser-activity-core.jar=lib/juser-activity-core.jar file.reference.juser-activity-lib.jar=lib/juser-activity-lib.jar -file.reference.pizzaservice-mailer.jar=lib/pizzaservice-mailer.jar +file.reference.pizzaservice-mailer-lib.jar=lib/pizzaservice-mailer-lib.jar includes=** j2ee.compile.on.save=true j2ee.deploy.on.save=true @@ -79,7 +79,7 @@ javac.classpath=\ ${libs.GNU_JPDF_1.7.0.classpath}:\ ${reference.pizzaservice-core.jar}:\ ${reference.pizzaservice-lib.jar}:\ - ${reference.pizzaservice-mailer.jar}:\ + ${reference.pizzaservice-mailer-lib.jar}:\ ${file.reference.cdi-api.jar} javac.compilerargs=-Xlint:unchecked -Xlint:deprecation javac.debug=true @@ -111,12 +111,11 @@ platform.active=default_platform project.license=agpl30 project.pizzaservice-core=../pizzaservice-core project.pizzaservice-lib=../pizzaservice-lib -project.pizzaservice-mailer=../pizzaservice-mailer -project.serviceLocator.class=org.mxchange.pizzaapplication.mailer.model.delivery.PizzaMailer +project.pizzaservice-mailer-lib=../pizzaservice-mailer-lib project.juser-core=../juser-core reference.pizzaservice-core.jar=${project.pizzaservice-core}/dist/pizzaservice-core.jar reference.pizzaservice-lib.jar=${project.pizzaservice-lib}/dist/pizzaservice-lib.jar -reference.pizzaservice-mailer.jar=${project.pizzaservice-mailer}/dist/pizzaservice-mailer.jar +reference.pizzaservice-mailer-lib.jar=${project.pizzaservice-mailer-lib}/dist/pizzaservice-mailer-lib.jar resource.dir=setup run.test.classpath=\ ${javac.test.classpath}:\ @@ -144,7 +143,7 @@ source.reference.juser-core.jar=../juser-core/src/ source.reference.juser-lib.jar=../juser-lib/src/ source.reference.juser-activity-core.jar=../juser-activity-core/src/ source.reference.juser-activity-lib.jar=../juser-activity-lib/src/ -source.reference.pizzaservice-mailer.jar=../pizzaservice-mailer/src/ +source.reference.pizzaservice-mailer-lib.jar=../pizzaservice-mailer-lib/src/ source.root=src src.dir=${source.root}/java test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml index 06b9cc4..682fb3a 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -27,7 +27,7 @@ libs.GNU_JPDF_1.7.0.classpath reference.pizzaservice-core.jar reference.pizzaservice-lib.jar - reference.pizzaservice-mailer.jar + reference.pizzaservice-mailer-lib.jar file.reference.cdi-api.jar @@ -57,7 +57,7 @@ jar - pizzaservice-mailer + pizzaservice-mailer-lib jar jar diff --git a/src/java/org/mxchange/jmailee/model/delivery/PizzaEmailDeliveryMessageBean.java b/src/java/org/mxchange/jmailee/model/delivery/PizzaEmailDeliveryMessageBean.java deleted file mode 100644 index 6a56ec5..0000000 --- a/src/java/org/mxchange/jmailee/model/delivery/PizzaEmailDeliveryMessageBean.java +++ /dev/null @@ -1,203 +0,0 @@ -/* - * Copyright (C) 2016, 2017 Roland Häder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.mxchange.jmailee.model.delivery; - -import java.io.Serializable; -import java.text.MessageFormat; -import java.util.Properties; -import java.util.ResourceBundle; -import javax.annotation.PostConstruct; -import javax.ejb.ActivationConfigProperty; -import javax.ejb.MessageDriven; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.ObjectMessage; -import javax.mail.MessagingException; -import javax.naming.NamingException; -import org.mxchange.jmailee.model.delivery.wrapper.WrapableEmailDelivery; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; -import org.mxchange.pizzaapplication.mailer.model.delivery.DeliverablePizzaEmail; -import org.mxchange.pizzaapplication.mailer.model.delivery.PizzaMailer; - -/** - * A message queue for sending out emails - *

- * @author Roland Häder - */ -@MessageDriven ( - name = "pizzaEmailDelivery", - description = "A message bean for email delivery", - activationConfig = { - @ActivationConfigProperty (propertyName = "destinationLookup", propertyValue = "jms/pizzaservice-email-queue"), - @ActivationConfigProperty (propertyName = "destinationType", propertyValue = "javax.jms.Queue") - } -) -public class PizzaEmailDeliveryMessageBean extends BasePizzaDatabaseBean implements MessageListener { - - /** - * Serial number - */ - private static final long serialVersionUID = 190_586_572_658_143L; - - /** - * Configuration file - */ - private final String configFile = "org.mxchange.jmailer.config"; //NOI18N - - /** - * Mailer instance - */ - private final DeliverablePizzaEmail mailer; - - /** - * Default constructor - *

- * @throws javax.naming.NamingException If a JNDI name could not be found - */ - public PizzaEmailDeliveryMessageBean () throws NamingException { - // Call super constructor - super(); - - // Init mailer instance - this.mailer = new PizzaMailer(); - } - - /** - * Post-construction - */ - @PostConstruct - public void init () { - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.init: CALLED!", this.getClass().getSimpleName())); //NOI18N - - // Try to load bundle - ResourceBundle bundle = ResourceBundle.getBundle(this.configFile); - - // Debug message - this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.init: bundle={1}", this.getClass().getSimpleName(), bundle)); //NOI18N - - // The bunble should be valid - if (null == bundle) { - // Throw NPE - throw new NullPointerException(MessageFormat.format("bundle is null, maybe file {0} does not exist?", this.configFile)); //NOI18N - } - - // Init Properties - Properties properties = new Properties(); - - // Is the bundle not empty? - if (!bundle.keySet().isEmpty()) { - // Loop through all - for (final String key : bundle.keySet()) { - // Log debug message - this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.init: key={1}", this.getClass().getSimpleName(), key)); //NOI18N - - // Get string from bundle and set it in properties - properties.put(key, bundle.getString(key)); - } - } - - // Handle it over to the mailer - this.mailer.init(properties); - - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.init: EXIT!", this.getClass().getSimpleName())); //NOI18N - } - - @Override - public void onMessage (final Message message) { - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.onMessage: message={1} - CALLED!", this.getClass().getSimpleName(), message)); //NOI18N - - // The parameter should be valid - if (null == message) { - // Throw NPE - throw new NullPointerException("message is null"); //NOI18N - } else if (!(message instanceof ObjectMessage)) { - // Not implementing right interface - throw new IllegalArgumentException(MessageFormat.format("message={0} does not implemented ObjectMessage", message)); //NOI18N - } - - // Securely cast it - ObjectMessage objectMessage = (ObjectMessage) message; - - // Init variable - Serializable serializable; - - try { - // Get object from message - serializable = objectMessage.getObject(); - } catch (final JMSException ex) { - // Log it and don't continue any further - this.getLoggerBeanLocal().logException(ex); - return; - } - - // Debug message - this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.onMessage: serializable={1}", this.getClass().getSimpleName(), serializable)); //NOI18N - - // Okay, is it the right interface? - if (null == serializable) { - // Throw NPE - throw new NullPointerException("serializable is null"); //NOI18N - } else if (!(serializable instanceof WrapableEmailDelivery)) { - // Not correct object send - throw new IllegalArgumentException(MessageFormat.format("serializable={0} does not implement WrapableEmailDelivery", serializable)); //NOI18N - } - - // Securely cast it - WrapableEmailDelivery wrapper = (WrapableEmailDelivery) serializable; - - // Is all required set? - if (wrapper.getLocale() == null) { - // Throw NPE - throw new NullPointerException("wrapper.locale is null"); //NOI18N - } else if (wrapper.getRecipientAddress()== null) { - // Throw again ... - throw new NullPointerException("wrapper.recipientAddress is null"); //NOI18N - } else if (wrapper.getSubjectLine() == null) { - // ... and again - throw new NullPointerException("wrapper.subjectLine is null"); //NOI18N - } else if (wrapper.getSubjectLine().isEmpty()) { - // Is empty - throw new IllegalArgumentException("wrapper.subjectLine is empty"); //NOI18N - } else if (wrapper.getTemplateName() == null) { - // Throw NPE again - throw new NullPointerException("wrapper.templateName is null"); //NOI18N - } else if (wrapper.getTemplateName().isEmpty()) { - // Is empty - throw new IllegalArgumentException("wrapper.templateName is empty"); //NOI18N - } else if (wrapper.getTemplateVariables() == null) { - // No template variables set, should not happen - throw new NullPointerException("wrapper.templateVariables is null"); //NOI18N - } - - try { - // Send email out - this.mailer.sendDeliverableMail(wrapper); - } catch (final MessagingException ex) { - // Opps, something went wrong - this.getLoggerBeanLocal().logException(ex); - return; - } - - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.onMessage - EXIT!", this.getClass().getSimpleName())); //NOI18N - } - -} diff --git a/src/java/org/mxchange/jmailer/config.properties b/src/java/org/mxchange/jmailer/config.properties deleted file mode 100644 index 5a02e31..0000000 --- a/src/java/org/mxchange/jmailer/config.properties +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2016, 2017 Roland H\u00e4der -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -# Email address for "Errors-To" header -mailer.errorsto=you@foo.example -# Email address for "Bounces-To" header -mailer.bouncesto=you@foo.example -# Email address for "X-Loop" header -mailer.xloop=you@foo.example -- 2.39.5