Merge pull request #109 from diging/hotfix/CCP-158

added email from
diging · Jul 13, 2016 · f7cbec1 · f7cbec1
2 parents 026e1b4 + 572793f
commit f7cbec1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Conceptpower+Spring/pom.xml b/Conceptpower+Spring/pom.xml
@@ -19,8 +19,9 @@
 		<db.files.path>/Users/jdamerow/Software/Conceptpower/db_files</db.files.path>
 		<email.username></email.username>
 		<email.password></email.password>
-		<email.server.port>25</email.server.port>
-		<email.server.host>http://example.net/</email.server.host>
+		<email.server.port></email.server.port>
+		<email.server.host></email.server.host>
+		<email.from></email.from>
 		<admin.username>admin</admin.username>
 		<admin.password>admin</admin.password>
 		<wordnet.path>/usr/local/WordNet-3.0</wordnet.path>

diff --git a/Conceptpower+Spring/src/main/webapp/WEB-INF/spring/root-context.xml b/Conceptpower+Spring/src/main/webapp/WEB-INF/spring/root-context.xml
@@ -40,7 +40,7 @@
 	<!-- You can have some pre-configured messagess also which are ready to 
 		send -->
 	<bean id="preConfiguredMessage" class="org.springframework.mail.SimpleMailMessage">
-		<property name="from" value="email"></property>
+		<property name="from" value="${email.from}"></property>
 	</bean>
 
 	<util:properties id="messages"