--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/ContextListener.java	2015/06/09 09:14:28	2571
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/ContextListener.java	2015/07/15 13:47:40	2617
@@ -1,7 +1,10 @@
 package dk.daoas.daoadresseservice;
 
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.Charset;
 import java.util.Properties;
 
 import javax.servlet.ServletContext;
@@ -12,6 +15,9 @@
 
 import org.apache.commons.lang3.SystemUtils;
 
+import com.jcabi.manifests.Manifests;
+import com.jcabi.manifests.ServletMfs;
+
 import dk.daoas.daoadresseservice.admin.ServiceConfig;
 import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
@@ -42,6 +48,8 @@
     public void contextInitialized(ServletContextEvent ctxtEvt)  {
     	System.out.println("Starting DAO Context");
     	
+    	
+    	
     	ServletContext ctxt = ctxtEvt.getServletContext();
     	
     	ServiceConfig conf = null;
@@ -55,7 +63,13 @@
     	initDataLoader(ctxt, conf);
     	
     	initCircuitBreakers(ctxt, conf);
+
     	
+    	try {
+    		Manifests.DEFAULT.append(new ServletMfs(ctxt));
+    	} catch (Exception e) {
+    		System.out.println("Error loading config " + e.getMessage());
+    	}
     	
     	System.out.println("DAO Context done");
     }
@@ -78,7 +92,7 @@
     	}
     
     	Properties propsFile = new Properties();
-    	try (FileReader reader = new FileReader(file) ) {
+    	try ( Reader reader = new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8")) ) {
     		propsFile.load(reader);	
     	}