Author: sviluppatorefico
Date: 2009-04-07 15:49:57 -0400 (Tue, 07 Apr 2009)
New Revision: 13173
Modified:
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/impl/mail/MailModuleImpl.java
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
see
https://jira.jboss.org/jira/browse/JBPORTAL-2353
Modified:
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/impl/mail/MailModuleImpl.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/impl/mail/MailModuleImpl.java 2009-04-07
14:27:15 UTC (rev 13172)
+++
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/impl/mail/MailModuleImpl.java 2009-04-07
19:49:57 UTC (rev 13173)
@@ -93,6 +93,9 @@
/** SMTP timeout. */
private int SMTPTimeout = 10000;
+
+ /** SMTP Start TLS enable. */
+ private boolean SMTPStarttlsEnable = false;
/** The PrintStream java mail debug output is sent to. */
private LoggerStream logs;
@@ -158,6 +161,16 @@
this.smtpPassword = smtpPassword;
}
+ public boolean getSMTPStarttlsEnable()
+ {
+ return SMTPStarttlsEnable;
+ }
+
+ public void setSMTPStarttlsEnable(boolean SMTPStarttlsEnable)
+ {
+ this.SMTPStarttlsEnable = SMTPStarttlsEnable;
+ }
+
public int getQueueSize()
{
if (queue == null)
@@ -290,6 +303,7 @@
// Set timeouts, default is infinite, we want to avoid it
properties.setProperty("mail.smtp.connectiontimeout", "" +
SMTPConnectionTimeout);
properties.setProperty("mail.smtp.timeout", "" + SMTPTimeout);
+ properties.setProperty("mail.smtp.starttls.enable", "" +
SMTPStarttlsEnable);
//
super.startService();
Modified:
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2009-04-07
14:27:15 UTC (rev 13172)
+++
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2009-04-07
19:49:57 UTC (rev 13173)
@@ -582,6 +582,7 @@
<attribute name="JavaMailDebugEnabled">false</attribute>
<attribute name="SMTPConnectionTimeout">100000</attribute>
<attribute name="SMTPTimeout">10000</attribute>
+ <attribute name="SMTPStarttlsEnable">false</attribute>
<attribute
name="JNDIName">java:portal/MailModule</attribute>
</mbean>