You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/02/28 17:25:50 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/util/mail Email.java
henning 2003/02/28 08:25:49
Modified: src/java/org/apache/turbine TurbineConstants.java
src/java/org/apache/turbine/util/velocity VelocityEmail.java
VelocityHtmlEmail.java
src/java/org/apache/turbine/util/mail Email.java
Log:
Remove TurbineResources from the mail code. Put constants for default
mail server and mail.smtp.from into TurbineConstants
Revision Changes Path
1.16 +7 -1 jakarta-turbine-2/src/java/org/apache/turbine/TurbineConstants.java
Index: TurbineConstants.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/TurbineConstants.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TurbineConstants.java 28 Feb 2003 16:05:45 -0000 1.15
+++ TurbineConstants.java 28 Feb 2003 16:25:49 -0000 1.16
@@ -91,6 +91,12 @@
/** The SMTP server Turbine uses to send mail. */
String MAIL_SERVER_KEY = "mail.server";
+ /** Default Value for he SMTP server that Turbine uses to send mail. */
+ String MAIL_SERVER_DEFAULT = "localhost";
+
+ /** The Smtp sender address property */
+ String MAIL_SMTP_FROM = "mail.smtp.from";
+
/** Property that controls whether Turbine modules are cached or not. */
String MODULE_CACHE_KEY = "module.cache";
1.7 +15 -6 jakarta-turbine-2/src/java/org/apache/turbine/util/velocity/VelocityEmail.java
Index: VelocityEmail.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/velocity/VelocityEmail.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VelocityEmail.java 18 Feb 2003 20:23:17 -0000 1.6
+++ VelocityEmail.java 28 Feb 2003 16:25:49 -0000 1.7
@@ -56,12 +56,19 @@
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
+
+import org.apache.commons.lang.StringUtils;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.commons.mail.SimpleEmail;
+
+import org.apache.turbine.Turbine;
+import org.apache.turbine.TurbineConstants;
+
import org.apache.turbine.services.velocity.TurbineVelocity;
-import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.commons.lang.StringUtils;
+
import org.apache.velocity.context.Context;
/**
@@ -127,6 +134,7 @@
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:gcoladonato@yahoo.com">Greg Coladonato</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
+ * @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
*/
public class VelocityEmail
@@ -297,9 +305,10 @@
*/
public String getMailServer()
{
- return (StringUtils.isEmpty(mailServer) ?
- TurbineResources.getString("mail.server", "localhost")
- : this.mailServer );
+ return StringUtils.isNotEmpty(mailServer) ? mailServer
+ : Turbine.getConfiguration().getString(
+ TurbineConstants.MAIL_SERVER_KEY,
+ TurbineConstants.MAIL_SERVER_DEFAULT);
}
/**
1.9 +17 -6 jakarta-turbine-2/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
Index: VelocityHtmlEmail.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VelocityHtmlEmail.java 18 Feb 2003 20:15:18 -0000 1.8
+++ VelocityHtmlEmail.java 28 Feb 2003 16:25:49 -0000 1.9
@@ -55,18 +55,27 @@
*/
import java.net.URL;
+
import java.util.Hashtable;
+
import javax.activation.DataSource;
import javax.activation.URLDataSource;
+import org.apache.commons.lang.StringUtils;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.commons.mail.EmailAttachment;
import org.apache.commons.mail.HtmlEmail;
-import org.apache.commons.lang.StringUtils;
+
+import org.apache.turbine.Turbine;
+import org.apache.turbine.TurbineConstants;
+
import org.apache.turbine.services.velocity.TurbineVelocity;
-import org.apache.turbine.services.resources.TurbineResources;
+
import org.apache.turbine.util.RunData;
+
import org.apache.velocity.context.Context;
/**
@@ -107,6 +116,7 @@
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @author <a href="mailto:A.Schild@aarboard.ch">Andre Schild</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
+ * @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
*/
public class VelocityHtmlEmail
@@ -286,9 +296,10 @@
*/
public String getMailServer()
{
- return (StringUtils.isEmpty(mailServer) ?
- TurbineResources.getString("mail.server", "localhost")
- : this.mailServer);
+ return StringUtils.isNotEmpty(mailServer) ? mailServer
+ : Turbine.getConfiguration().getString(
+ TurbineConstants.MAIL_SERVER_KEY,
+ TurbineConstants.MAIL_SERVER_DEFAULT);
}
/**
1.7 +29 -8 jakarta-turbine-2/src/java/org/apache/turbine/util/mail/Email.java
Index: Email.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/mail/Email.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Email.java 12 Feb 2003 17:24:29 -0000 1.6
+++ Email.java 28 Feb 2003 16:25:49 -0000 1.7
@@ -57,15 +57,23 @@
import java.util.Date;
import java.util.Properties;
import java.util.Vector;
+
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.Transport;
+
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
+import org.apache.commons.configuration.Configuration;
+
+import org.apache.commons.lang.StringUtils;
+
import org.apache.torque.util.Criteria;
-import org.apache.turbine.services.resources.TurbineResources;
+
+import org.apache.turbine.Turbine;
+import org.apache.turbine.TurbineConstants;
/**
* The base class for all email messages. This class sets the
@@ -78,6 +86,7 @@
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
* @author <a href="mailto:greg@shwoop.com">Greg Ritter</a>
* @author <a href="mailto:unknown">Regis Koenig</a>
+ * @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
* @deprecated Use org.apache.commons.mail.Email instead.
*/
@@ -92,9 +101,15 @@
public static final String EMAIL_BODY = "email.body";
public static final String CONTENT_TYPE = "content.type";
- public static final String MAIL_SERVER = "mail.server";
+ /** @deprecated Use TurbineConstants.MAIL_SERVER_KEY */
+ public static final String MAIL_SERVER = TurbineConstants.MAIL_SERVER_KEY;
+
+ /** @deprecated Use TurbineConstants.MAIL_SMTP_FROM */
+ public static final String MAIL_SMTP_FROM = TurbineConstants.MAIL_SMTP_FROM;
+
+ /** Mail Host, for javax.mail */
public static final String MAIL_HOST = "mail.host";
- public static final String MAIL_SMTP_FROM = "mail.smtp.from";
+
public static final String MAIL_TRANSPORT_PROTOCOL = "mail.transport.protocol";
public static final String SMTP = "SMTP";
public static final String TEXT_HTML = "text/html";
@@ -135,13 +150,19 @@
*/
private Session getMailSession()
{
+ Configuration conf = Turbine.getConfiguration();
Properties properties = System.getProperties();
+
properties.put(MAIL_TRANSPORT_PROTOCOL, SMTP);
- properties.put(MAIL_HOST, TurbineResources.getString(MAIL_SERVER));
- String mailSMTPFrom = TurbineResources.getString(MAIL_SMTP_FROM);
- if (mailSMTPFrom != null && !mailSMTPFrom.equals(""))
+ properties.put(MAIL_HOST, conf.getString(TurbineConstants.MAIL_SERVER_KEY,
+ TurbineConstants.MAIL_SERVER_DEFAULT));
+
+
+ String mailSMTPFrom = conf.getString(TurbineConstants.MAIL_SMTP_FROM);
+
+ if (StringUtils.isNotEmpty(mailSMTPFrom))
{
- properties.put(MAIL_SMTP_FROM, mailSMTPFrom);
+ properties.put(TurbineConstants.MAIL_SMTP_FROM, mailSMTPFrom);
}
return Session.getDefaultInstance(properties, null);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org