[jboss-svn-commits] JBL Code SVN: r5785 - in labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb: common helpers

[jboss-svn-commits at lists.jboss.org]

Author: estebanschifman
Date: 2006-08-11 14:09:14 -0400 (Fri, 11 Aug 2006)
New Revision: 5785

Modified:
   labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/SystemProperties.java
   labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/helpers/Email.java
Log:
added new property SMTP_FROM = "org.jboss.soa.esb.mail.smtp.from"
to SystemProperties and Email

Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/SystemProperties.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/SystemProperties.java	2006-08-11 18:05:55 UTC (rev 5784)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/SystemProperties.java	2006-08-11 18:09:14 UTC (rev 5785)
@@ -34,6 +34,8 @@
 
 	public static final String SMTP_PORT = "org.jboss.soa.esb.mail.smtp.port";
 
+	public static final String SMTP_FROM = "org.jboss.soa.esb.mail.smtp.from";
+
 	public static final String JNDI_SERVER_TYPE = "org.jboss.soa.esb.jndi.server.type";
 
 	public static final String JNDI_SERVER_URL = "org.jboss.soa.esb.jndi.server.url";
@@ -59,6 +61,7 @@
 			new KeyValuePair(SMTP_USERNAME, getSmtpUsername()),
 			new KeyValuePair(SMTP_PASSWORD, getSmtpPassword()),
 			new KeyValuePair(SMTP_PORT, getSmtpPort()),
+			new KeyValuePair(SMTP_FROM, getSmtpFrom()),
 			new KeyValuePair(JNDI_SERVER_TYPE, getJndiServerType()),
 			new KeyValuePair(JNDI_SERVER_URL, getJndiServerURL()),
 			new KeyValuePair(PARAMS_REPOS_IMPL_CLASS,
@@ -92,6 +95,10 @@
 		return System.getProperty(SMTP_PORT, SystemProperties.DEFAULT_PORT);
 	}
 
+	public static String getSmtpFrom() {
+		return System.getProperty(SMTP_FROM);
+	}
+
 	public static String getJndiServerType() {
 		return System.getProperty(JNDI_SERVER_TYPE,
 				SystemProperties.DEFAULT_SERVER_TYPE);

Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/helpers/Email.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/helpers/Email.java	2006-08-11 18:05:55 UTC (rev 5784)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/helpers/Email.java	2006-08-11 18:09:14 UTC (rev 5785)
@@ -32,6 +32,7 @@
 
 import org.jboss.soa.esb.common.SystemProperties;
 import org.jboss.soa.esb.util.*;
+import org.apache.log4j.*;
 
 /**
  * Simplifies sending of e-mails with attachments from java.
@@ -366,8 +367,15 @@
 			String sPort = SystemProperties.getSmtpPort();
 			Integer.parseInt(sPort);
 			oMailP.setProperty("mail.smtp.port", sPort);
-		} catch (Exception e) { /* OK just leave standard port */
-		}
+		} 
+		catch (Exception e) { /* OK just leave standard port */ }
+
+		String sFrom = SystemProperties.getSmtpFrom();
+		if (Util.isNullString(sFrom))
+			Logger.getLogger(Email.class).error("SMTP from not set");
+		else
+			oMailP.setProperty("mail.smtp.from", sFrom);
+
 		javax.mail.Session oMailSess = 
 			javax.mail.Session.getDefaultInstance(oMailP, oAuth);
 		return oMailSess;