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.EJB;
import javax.ejb.MessageDriven;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.ObjectMessage;
import javax.mail.MessagingException;
import javax.naming.NamingException;
-import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean;
+import org.mxchange.jcoreee.database.BaseDatabaseBean;
import org.mxchange.jmailee.model.delivery.wrapper.WrapableEmailDelivery;
/**
- * A message-driven bean for sending out emails
+ * A message-driven bean for sending out mails
* <p>
* @author Roland Häder<roland@mxchange.org>
*/
@ActivationConfigProperty (propertyName = "destinationLookup", propertyValue = "jms/addressbook-email-queue"),
@ActivationConfigProperty (propertyName = "destinationType", propertyValue = "javax.jms.Queue")
})
-public class AddressbookEmailDeliveryMessageBean extends BaseAddressbookDatabaseBean implements MessageListener {
+public class AddressbookEmailDeliveryMessageBean extends BaseDatabaseBean implements MessageListener {
/**
* Serial number
*/
private static final long serialVersionUID = 75_638_176_619_024L;
- /**
- * Configuration file
- */
- private final String configFile = "org.mxchange.jmailer.config"; //NOI18N//NOI18N
-
/**
* Mailer instance
*/
- private final DeliverableAddressbookEmail mailer;
+ @EJB
+ private DeliverableAddressbookEmailLocal mailerBean;
/**
* Default constructor
public AddressbookEmailDeliveryMessageBean () throws NamingException {
// Call super constructor
super();
-
- // Init mailer instance
- this.mailer = new AddressbookMailer();
- }
-
- /**
- * 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
if (wrapper.getLocale() == null) {
// Throw NPE
throw new NullPointerException("wrapper.locale is null"); //NOI18N
- } else if (wrapper.getRecipientAddress()== null) {
+ } else if (wrapper.getRecipientAddress() == null) {
// Throw again ...
throw new NullPointerException("wrapper.recipientAddress is null"); //NOI18N
} else if (wrapper.getSubjectLine() == null) {
try {
// Send email out
- this.mailer.sendDeliverableMail(wrapper);
+ this.mailerBean.sendDeliverableMail(wrapper);
} catch (final MessagingException ex) {
// Opps, something went wrong
this.getLoggerBeanLocal().logException(ex);