Continued:

[jmailer-ee.git] / src / org / mxchange / jmailee / model / delivery / BaseMailerBean.java

diff --git a/src/org/mxchange/jmailee/model/delivery/BaseMailerBean.java b/src/org/mxchange/jmailee/model/delivery/BaseMailerBean.java
index 737b7af73b065b2a0b10dcdaa5ba29c355ac666c..7d16adb84202f3f9eb551c3ce267d9fa4d4531db 100644 (file)
--- a/src/org/mxchange/jmailee/model/delivery/BaseMailerBean.java
+++ b/src/org/mxchange/jmailee/model/delivery/BaseMailerBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2022 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,11 +28,11 @@ import javax.mail.Transport;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.context.Context;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
-import org.mxchange.jcoreee.database.BaseDatabaseBean;
+import org.mxchange.jcoreee.bean.ejb.BaseEnterpriseBean;
 import org.mxchange.jmailee.model.delivery.wrapper.WrapableEmailDelivery;
 
 /**
@@ -40,7 +40,7 @@ import org.mxchange.jmailee.model.delivery.wrapper.WrapableEmailDelivery;
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-public abstract class BaseMailerBean extends BaseDatabaseBean implements DeliverableEmailRemote {
+public abstract class BaseMailerBean extends BaseEnterpriseBean implements DeliverableEmailRemote {
 
        /**
         * Serial number
@@ -133,10 +133,10 @@ public abstract class BaseMailerBean extends BaseDatabaseBean implements Deliver
                }
 
                // Parse from address
-               Address senderAddress = new InternetAddress(this.properties.getProperty("mailer.from"));
+               final Address senderAddress = new InternetAddress(this.properties.getProperty("mailer.from"));
 
                // Get MIME message instance
-               MimeMessage message = new MimeMessage(mailSession);
+               final MimeMessage message = new MimeMessage(mailSession);
 
                // Set subject, recipients and body
                message.setFrom(senderAddress);
@@ -183,7 +183,7 @@ public abstract class BaseMailerBean extends BaseDatabaseBean implements Deliver
         * <p>
         * @throws MessagingException If something happened on message delivery
         */
-       protected void deliverMailWithTemplate (final Template template, final VelocityContext context, final WrapableEmailDelivery emailWrapper, final Session mailSession) throws MessagingException {
+       protected void deliverMailWithTemplate (final Template template, final Context context, final WrapableEmailDelivery emailWrapper, final Session mailSession) throws MessagingException {
                // Log trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("deliverMailWithTemplate: template={0},emailWrapper={1},mailSession={2} - CALLED!", template, emailWrapper, mailSession)); //NOI18N