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

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

Author: daniel.brum at jboss.com
Date: 2006-08-11 16:16:03 -0400 (Fri, 11 Aug 2006)
New Revision: 5801

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:


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 19:41:56 UTC (rev 5800)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/SystemProperties.java	2006-08-11 20:16:03 UTC (rev 5801)
@@ -35,6 +35,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 SMTP_AUTH = "org.jboss.soa.esb.mail.smtp.auth";
 
 	public static final String JNDI_SERVER_TYPE = "org.jboss.soa.esb.jndi.server.type";
 
@@ -62,6 +64,7 @@
 			new KeyValuePair(SMTP_PASSWORD, getSmtpPassword()),
 			new KeyValuePair(SMTP_PORT, getSmtpPort()),
 			new KeyValuePair(SMTP_FROM, getSmtpFrom()),
+			new KeyValuePair(SMTP_AUTH, getSmtpAuth()),
 			new KeyValuePair(JNDI_SERVER_TYPE, getJndiServerType()),
 			new KeyValuePair(JNDI_SERVER_URL, getJndiServerURL()),
 			new KeyValuePair(PARAMS_REPOS_IMPL_CLASS,
@@ -98,6 +101,10 @@
 	public static String getSmtpFrom() {
 		return System.getProperty(SMTP_FROM);
 	}
+	
+	public static String getSmtpAuth() {
+		return System.getProperty(SMTP_AUTH);
+	}
 
 	public static String getJndiServerType() {
 		return System.getProperty(JNDI_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 19:41:56 UTC (rev 5800)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/helpers/Email.java	2006-08-11 20:16:03 UTC (rev 5801)
@@ -357,15 +357,18 @@
 		String sSmtpUser = SystemProperties.getSmtpUsername();
 		
 		if (! Util.isNullString(sSmtpUser)) {
-			oAuth = new MyAuth(sSmtpUser, SystemProperties.getSmtpPassword());
+			oAuth = new MyAuth(sSmtpUser, SystemProperties.getSmtpPassword());			
 		}
 
 		Properties oMailP = new Properties();
-		oMailP.setProperty("mail.smtp.host", SystemProperties.getSmtpHost());
+		oMailP.setProperty("mail.smtp.host", SystemProperties.getSmtpHost());		
 		try {
 			String sPort = SystemProperties.getSmtpPort();
+			String sAuth = SystemProperties.getSmtpAuth();
+			this.from = SystemProperties.getSmtpFrom();
 			Integer.parseInt(sPort);
 			oMailP.setProperty("mail.smtp.port", sPort);
+			oMailP.setProperty("mail.smtp.auth", sAuth);			
 		} 
 		catch (Exception e) { /* OK just leave standard port */ }