Fix mail server configuration.

This commit is contained in:
Paulo Veiga 2011-10-31 23:54:02 -03:00
parent cfda92195a
commit 537bc5d0b9
5 changed files with 26 additions and 53 deletions

View File

@ -1,3 +1,7 @@
##################################################################################
# Database Configuration
##################################################################################
# MySQL 5.X configuration properties # MySQL 5.X configuration properties
#database.url=jdbc:mysql://localhost/wisemapping #database.url=jdbc:mysql://localhost/wisemapping
@ -13,14 +17,21 @@ database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
database.username=sa database.username=sa
database.password= database.password=
# Enable/Disable user confirmation by e-mail. If it's enabled, mail must be configured. # Enable/Disable user confirmation by e-mail. If it's enabled, mail must be configured.
user.confirm.registration=false user.confirm.registration=false
##################################################################################
# Mail configuration. Must be configured to enable user registration confirmation. # Mail configuration. Must be configured to enable user registration confirmation.
mail.smtp.socketFactory.port=465 ##################################################################################
# SSL configuration
# mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
mail.smtp.socketFactory.class=javax.net.DefaultSocketFactory
mail.smtp.socketFactory.port=25
mail.smtp.auth = false
mail.host=localhost mail.host=localhost
mail.user=user mail.user=
mail.password=password mail.password=
mail.registrationEmail=root@localhost mail.registrationEmail=root@localhost
mail.siteEmail=root@localhost mail.siteEmail=root@localhost

View File

@ -66,11 +66,13 @@
<bean id="mailSession" class="javax.mail.Session" factory-method="getInstance"> <bean id="mailSession" class="javax.mail.Session" factory-method="getInstance">
<constructor-arg> <constructor-arg>
<props> <props>
<prop key="mail.smtp.auth">true</prop> <prop key="mail.smtp.auth">${mail.smtp.auth}</prop>
<prop key="mail.smtp.socketFactory.port">${mail.smtp.socketFactory.port}</prop> <prop key="mail.smtp.socketFactory.port">${mail.smtp.socketFactory.port}</prop>
<prop key="mail.smtp.socketFactory.class">javax.net.ssl.SSLSocketFactory</prop> <prop key="mail.smtp.socketFactory.class">${mail.smtp.socketFactory.class}</prop>
<prop key="mail.smtp.socketFactory.fallback">false</prop> <prop key="mail.smtp.socketFactory.fallback">false</prop>
<prop key="mail.smtp.quitwait">false</prop> <prop key="mail.smtp.quitwait">false</prop>
<prop key="mail.smtp.debug">true</prop>
</props> </props>
</constructor-arg> </constructor-arg>
<constructor-arg ref="smtpAuthenticator"/> <constructor-arg ref="smtpAuthenticator"/>
@ -86,7 +88,7 @@
<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl"> <bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
<property name="host" value="${mail.host}"/> <property name="host" value="${mail.host}"/>
<!-- <property name="session" ref="mailSession"/> --> <property name="session" ref="mailSession"/>
</bean> </bean>
<bean id="velocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean"> <bean id="velocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">

View File

@ -21,6 +21,7 @@
<value>/c/keyboard.htm</value> <value>/c/keyboard.htm</value>
<value>/c/renameMap.htm</value> <value>/c/renameMap.htm</value>
<value>/c/embeddedView.htm</value> <value>/c/embeddedView.htm</value>
<value>/c/forgotPassword.htm</value>
</list> </list>
</property> </property>
</bean> </bean>
@ -343,44 +344,4 @@
</bean> </bean>
<!--<bean id="publicViewTarget" class="com.wisemapping.controller.PublicViewController">-->
<!--<property name="methodNameResolver" ref="paramResolverByAction"/>-->
<!--<property name="mindmapService">-->
<!--<ref bean="mindmapService"/>-->
<!--</property>-->
<!--</bean>-->
<!--<bean id="publicView"-->
<!--class="org.springframework.aop.framework.ProxyFactoryBean">-->
<!--<property name="proxyInterfaces">-->
<!--<value>com.wisemapping.controller.BaseMultiActionController</value>-->
<!--</property>-->
<!--<property name="interceptorNames">-->
<!--<list>-->
<!--<value>viewsAdvisor</value>-->
<!--</list>-->
<!--</property>-->
<!--<property name="target">-->
<!--<ref bean="publicViewTarget"/>-->
<!--</property>-->
<!--</bean>-->
<!--<bean id="viewAdvice" class="com.wisemapping.aop.ViewsAdvise">-->
<!--<property name="mindmapService">-->
<!--<ref bean="mindmapService"/>-->
<!--</property>-->
<!--</bean>-->
<!--<bean id="viewsAdvisor"-->
<!--class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">-->
<!--<property name="advice">-->
<!--<ref bean="viewAdvice"/>-->
<!--</property>-->
<!--<property name="mappedNames">-->
<!--<list>-->
<!--<value>handleNoSuchRequestHandlingMethod</value>-->
<!--</list>-->
<!--</property>-->
<!--</bean>-->
</beans> </beans>

View File

@ -25,8 +25,7 @@
<tbody> <tbody>
<tr> <tr>
<td> <td>
<spring:message code="EMAIL"/> <spring:message code="EMAIL"/>:
:
</td> </td>
<td> <td>
<form:input path="email" id="email" tabindex="1"/> <form:input path="email" id="email" tabindex="1"/>
@ -38,7 +37,7 @@
<td> <td>
<input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary" <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary"
id="submitButton"> id="submitButton">
<input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary" <input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary"
onclick="window.location='<c:url value="mymaps.htm"/>'"> onclick="window.location='<c:url value="mymaps.htm"/>'">
</td> </td>
</tr> </tr>

View File

@ -129,7 +129,7 @@
<td>&nbsp;</td> <td>&nbsp;</td>
<td><input type="submit" value="<spring:message code="REGISTER"/>" id="submitButton" class="btn-primary"> <td><input type="submit" value="<spring:message code="REGISTER"/>" id="submitButton" class="btn-primary">
<input type="button" value="<spring:message code="CANCEL"/>" <input type="button" value="<spring:message code="CANCEL"/>"
onclick="window.location='<c:url value="mymaps.htm"/>'" class="btn-primary"> onclick="window.location='<c:url value="mymaps.htm"/>'" class="btn-secondary">
</td> </td>
</tr> </tr>
</tbody> </tbody>