From 24672179d1ed97095e2ba9d6d0134036a054aa7c Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Fri, 8 Aug 2014 00:02:53 +0200
Subject: [PATCH] Fix properties file configuration for servlet context

---
 src/main/webapp/WEB-INF/spring/arsnova-servlet.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/spring/arsnova-servlet.xml b/src/main/webapp/WEB-INF/spring/arsnova-servlet.xml
index 1c3c4a18..b035306a 100644
--- a/src/main/webapp/WEB-INF/spring/arsnova-servlet.xml
+++ b/src/main/webapp/WEB-INF/spring/arsnova-servlet.xml
@@ -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="arsnova.properties.example" file-encoding="UTF-8" />
+	<context:property-placeholder location="file:///etc/arsnova/arsnova.properties" file-encoding="UTF-8" ignore-resource-not-found="true" />
 	<mvc:annotation-driven
 		content-negotiation-manager="contentNegotiationManager" />
 
-- 
GitLab