From a3dcfba30c2b5e39b08a4b1ab593abd76943592e Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice@asqatasun.org>
Date: Wed, 12 Apr 2017 23:03:01 +0200
Subject: [PATCH] fixed #43 - the contrast-finder.conf file is not required

---
 .../contrastFinder/webapp/controller/IndexController.java   | 6 +++++-
 .../src/main/webapp/WEB-INF/contrast-finder-servlet.xml     | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/contrast-finder-webapp/src/main/java/org/asqatasun/contrastFinder/webapp/controller/IndexController.java b/contrast-finder-webapp/src/main/java/org/asqatasun/contrastFinder/webapp/controller/IndexController.java
index e829a613..a9a976c7 100644
--- a/contrast-finder-webapp/src/main/java/org/asqatasun/contrastFinder/webapp/controller/IndexController.java
+++ b/contrast-finder-webapp/src/main/java/org/asqatasun/contrastFinder/webapp/controller/IndexController.java
@@ -55,10 +55,14 @@ public class IndexController {
      * View containing the form
      */
     private String mainPageView;
+
     /**
      * piwik analytics key
+     *      default is ''
+     *      can be override in the following file:
+     *      /etc/contrast-finder/contrast-finder.conf
      */
-    @Value("${piwik_analytics_key}")
+    @Value("${piwik_analytics_key:}")
     private String piwikAnalyticsKey;
 
     @Autowired
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/contrast-finder-servlet.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/contrast-finder-servlet.xml
index f9140c59..362ff375 100644
--- a/contrast-finder-webapp/src/main/webapp/WEB-INF/contrast-finder-servlet.xml
+++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/contrast-finder-servlet.xml
@@ -15,6 +15,8 @@
 
     <bean id="exposedPropertiesConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="location" value="file:///etc/contrast-finder/contrast-finder.conf"/>
+        <property name="ignoreResourceNotFound"         value="true" />
+        <property name="ignoreUnresolvablePlaceholders" value="true" />
     </bean>
     
     <import resource="conf/mvc/cf-beans-resolver.xml"/>