Author: thomas.heute(a)jboss.com Date: 2010-03-13 12:58:30 -0500 (Sat, 13 Mar 2010) New Revision: 2233 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 14:30:25 UTC (rev 2232) +++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-03-13 17:58:30 UTC (rev 2233) @@ -44,3 +44,11 @@ gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm_${name} gatein.idm.datasource.username=sa gatein.idm.datasource.password= + +# EMail +gatein.email.smtp.username= +gatein.email.smtp.password= +gatein.email.smtp.host=smtp.gmail.com +gatein.email.smtp.port=465 +gatein.email.smtp.starttls.enable=true + 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 14:30:25 UTC (rev 2232) +++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-03-13 17:58:30 UTC (rev 2233) @@ -42,7 +42,14 @@ gatein.idm.datasource.driver=org.hsqldb.jdbcDriver gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm_${name} gatein.idm.datasource.username=sa -gatein.idm.datasource.password +gatein.idm.datasource.password= # Arjuna configuration com.arjuna.ats.arjuna.objectstore.objectStoreDir=${gatein.data.dir}/jta + +# EMail +gatein.email.smtp.username= +gatein.email.smtp.password= +gatein.email.smtp.host=smtp.gmail.com +gatein.email.smtp.port=465 +gatein.email.smtp.starttls.enable=true 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 14:30:25 UTC (rev 2232) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/mail/portal-mail-configuration.xml 2010-03-13 17:58:30 UTC (rev 2233) @@ -33,11 +33,11 @@ <init-params> <properties-param> <name>config</name> - <property name="mail.smtp.auth.username" value=&quot;exoservice(a)gmail.com&quot; /> - <property name="mail.smtp.auth.password" value="exoadmin" /> - <property name="mail.smtp.host" value="smtp.gmail.com" /> - <property name="mail.smtp.port" value="465" /> - <property name="mail.smtp.starttls.enable" value="true" /> + <property name="mail.smtp.auth.username" value="${gatein.email.smtp.username}" /> + <property name="mail.smtp.auth.password" value="${gatein.email.smtp.password}" /> + <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.debug" value="false" /> <property name="mail.smtp.socketFactory.port" value="465" /> @@ -46,4 +46,4 @@ </properties-param> </init-params> </component> -</configuration> \ No newline at end of file +</configuration>