[gatein-commits] gatein SVN: r2242 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/conf/mail and 1 other directory.

[do-not-reply at jboss.org]

Author: thomas.heute at jboss.com
Date: 2010-03-13 18:41:02 -0500 (Sat, 13 Mar 2010)
New Revision: 2242

Modified:
   portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
   portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
   portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/mail/portal-mail-configuration.xml
Log:
GTNPORTAL-883: Extract email information (and remove default GMail account)


Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties	2010-03-13 23:15:18 UTC (rev 2241)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties	2010-03-13 23:41:02 UTC (rev 2242)
@@ -51,4 +51,7 @@
 gatein.email.smtp.host=smtp.gmail.com
 gatein.email.smtp.port=465
 gatein.email.smtp.starttls.enable=true
+gatein.email.smtp.auth=true
+gatein.email.smtp.socketFactory.port=465
+gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
 

Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties	2010-03-13 23:15:18 UTC (rev 2241)
+++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties	2010-03-13 23:41:02 UTC (rev 2242)
@@ -53,3 +53,6 @@
 gatein.email.smtp.host=smtp.gmail.com
 gatein.email.smtp.port=465
 gatein.email.smtp.starttls.enable=true
+gatein.email.smtp.auth=true
+gatein.email.smtp.socketFactory.port=465
+gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
\ No newline at end of file

Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/mail/portal-mail-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/mail/portal-mail-configuration.xml	2010-03-13 23:15:18 UTC (rev 2241)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/mail/portal-mail-configuration.xml	2010-03-13 23:41:02 UTC (rev 2242)
@@ -38,10 +38,10 @@
           <property name="mail.smtp.host" value="${gatein.email.smtp.host}" />
           <property name="mail.smtp.port" value="${gatein.email.smtp.port}" />
           <property name="mail.smtp.starttls.enable" value="${gatein.email.smtp.starttls.enable}" />
-          <property name="mail.smtp.auth" value="true" />
+          <property name="mail.smtp.auth" value="${gatein.email.smtp.auth}" />
           <property name="mail.smtp.debug" value="false" />
-          <property name="mail.smtp.socketFactory.port" value="465" />
-          <property name="mail.smtp.socketFactory.class" value="javax.net.ssl.SSLSocketFactory" />
+          <property name="mail.smtp.socketFactory.port" value="${gatein.email.smtp.socketFactory.port}" />
+          <property name="mail.smtp.socketFactory.class" value="${gatein.email.smtp.socketFactory.class}" />
           <property name="mail.smtp.socketFactory.fallback" value="false" />
         </properties-param>
       </init-params>