Mercurial Mercurial > renkan / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
server/src/main/webapp/WEB-INF/applicationContext.xml
changeset 87 6c810f746837
parent 45 37c9a17c3284
child 106 d34e253f5c32 
--- a/server/src/main/webapp/WEB-INF/applicationContext.xml	Fri Mar 15 17:11:44 2013 +0100
+++ b/server/src/main/webapp/WEB-INF/applicationContext.xml	Fri Mar 15 23:19:50 2013 +0100
@@ -9,6 +9,8 @@
 	
 	<!-- Activates various annotations to be detected in bean classes -->
 	<context:annotation-config />
+	<context:property-placeholder  order="1000" ignore-unresolvable="true" ignore-resource-not-found="false" location="WEB-INF/renkan.properties"/>
+	<context:property-placeholder  order="1" ignore-unresolvable="true" ignore-resource-not-found="true" location="classpath:renkan_run.properties"/>
 	
 	<!-- Configures the annotation-driven Spring MVC Controller programming model.
 	Note that, with Spring 3.0, this tag works in Servlet MVC only!  -->
renkan