Skip to content
Snippets Groups Projects
Commit ef1d91b6 authored by Daniel Gerhardt's avatar Daniel Gerhardt Committed by Daniel Gerhardt
Browse files

Fix property file loading order, move property file to classpath

parent 80729c17
No related merge requests found
......@@ -13,7 +13,8 @@
<!-- ARSnova Servlet Context -->
<context:component-scan base-package="de.thm.arsnova.controller,de.thm.arsnova.web" />
<context:property-placeholder location="file:///etc/arsnova/arsnova.properties" file-encoding="UTF-8" />
<context:property-placeholder location="classpath:arsnova.properties.example" file-encoding="UTF-8" order="2" ignore-resource-not-found="true" />
<context:property-placeholder location="file:///etc/arsnova/arsnova.properties" file-encoding="UTF-8" order="1" ignore-resource-not-found="true" />
<mvc:annotation-driven
content-negotiation-manager="mvcContentNegotiationManager" />
......
......@@ -16,7 +16,7 @@
p:ignoreUnresolvablePlaceholders="false" p:ignoreResourceNotFound="true">
<property name="locations">
<list>
<value>arsnova.properties.example</value>
<value>classpath:arsnova.properties.example</value>
<value>file:///etc/arsnova/arsnova.properties</value>
</list>
</property>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment