vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-21 21:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix mail server configuration.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wise-webapp/src/main/webapp/WEB-INF/app.properties
View File

@ -1,3 +1,7 @@
##################################################################################
# Database Configuration
##################################################################################
# MySQL 5.X configuration properties
#database.url=jdbc:mysql://localhost/wisemapping
@ -13,14 +17,21 @@ database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
database.username=sa
database.password=
# Enable/Disable user confirmation by e-mail. If it's enabled, mail must be configured.
user.confirm.registration=false
##################################################################################
# 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.user=user
mail.password=password
mail.user=
mail.password=
mail.registrationEmail=root@localhost
mail.siteEmail=root@localhost

12
wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml
View File

@ -66,19 +66,21 @@
<bean id="mailSession" class="javax.mail.Session" factory-method="getInstance">
<constructor-arg>
<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.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.quitwait">false</prop>
<prop key="mail.smtp.debug">true</prop>
</props>
</constructor-arg>
<constructor-arg ref="smtpAuthenticator"/>
</bean>
<bean id="mailer" class="com.wisemapping.mail.Mailer" singleton="true">
<constructor-arg index="0" value="${mail.registrationEmail}" />
<constructor-arg index="1" value="${mail.siteEmail}" />
<constructor-arg index="0" value="${mail.registrationEmail}"/>
<constructor-arg index="1" value="${mail.siteEmail}"/>
<property name="mailSender" ref="mailSender"/>
<property name="velocityEngine" ref="velocityEngine"/>
@ -86,7 +88,7 @@
<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
<property name="host" value="${mail.host}"/>
<!-- <property name="session" ref="mailSession"/> -->
<property name="session" ref="mailSession"/>
</bean>
<bean id="velocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">

41
wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
View File

@ -21,6 +21,7 @@
<value>/c/keyboard.htm</value>
<value>/c/renameMap.htm</value>
<value>/c/embeddedView.htm</value>
<value>/c/forgotPassword.htm</value>
</list>
</property>
</bean>
@ -343,44 +344,4 @@
</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>

5
wise-webapp/src/main/webapp/jsp/forgotPassword.jsp
View File

@ -25,8 +25,7 @@
<tbody>
<tr>
<td>
<spring:message code="EMAIL"/>
:
<spring:message code="EMAIL"/>:
</td>
<td>
<form:input path="email" id="email" tabindex="1"/>
@ -38,7 +37,7 @@
<td>
<input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary"
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"/>'">
</td>
</tr>

2
wise-webapp/src/main/webapp/jsp/userRegistration.jsp
View File

@ -129,7 +129,7 @@
<td>&nbsp;</td>
<td><input type="submit" value="<spring:message code="REGISTER"/>" id="submitButton" class="btn-primary">
<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>
</tr>
</tbody>