--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/ContextListener.java	2015/02/23 15:49:00	2352
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/ContextListener.java	2015/07/14 08:32:56	2605
@@ -1,17 +1,27 @@
 package dk.daoas.daoadresseservice;
 
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Properties;
+
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.servlet.ServletRegistration;
 import javax.servlet.annotation.WebListener;
 
+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.AccountingCircuitBreaker;
+import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
+import dk.thoerup.circuitbreaker.statistics.AccountingStatistics;
 import dk.thoerup.circuitbreaker.web.CircuitBreakerServletBase;
 import dk.thoerup.webconfig.ConfigServlet;
-import dk.thoerup.webconfig.ContextConfigLoader;
+import dk.thoerup.webconfig.PropertiesConfigLoader;
 
 /**
  * Application Lifecycle Listener implementation class ContextListener
@@ -20,7 +30,7 @@
 @WebListener
 public class ContextListener implements ServletContextListener {
 	
-
+	
 
 
     public ContextListener() {
@@ -31,33 +41,62 @@
          // TODO Auto-generated method stub
     }
 
-    @Override
+    @SuppressWarnings("deprecation")
+	@Override
     public void contextInitialized(ServletContextEvent ctxtEvt)  {
     	System.out.println("Starting DAO Context");
     	
+    	
+    	
     	ServletContext ctxt = ctxtEvt.getServletContext();
     	
-    	ServiceConfig conf = initConfig(ctxt);
+    	ServiceConfig conf = null;
+    	try {
+    		conf = initConfig(ctxt);
+    	} catch (IOException e) {
+    		System.out.println("Error loading config " + e.getMessage());    		
+    		throw new RuntimeException(e);
+    	}
     	
     	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");
     }
     
-    private void initDataLoader(ServletContext ctxt, ServiceConfig conf) {
-    	DataLoader load = new DataLoader(ctxt,conf);    	
-    	ctxt.setAttribute("dataloader", load);
-    	load.doLoad();
-    }
+
 	
     
-    private ServiceConfig initConfig(ServletContext ctxt) {
+    private ServiceConfig initConfig(ServletContext ctxt) throws IOException {
+    	
+    	final String CONF_FILE_NAME = "daoadresseservice.conf";
+    	
+    	
     	ServiceConfig conf = new ServiceConfig();
     	
-    	new ContextConfigLoader(ctxt).loadConfig(conf);
+    	String file = null;
+    	if (SystemUtils.IS_OS_WINDOWS) {
+    		file = "C:\\" + CONF_FILE_NAME;
+    	} else {
+    		file = "/etc/" + CONF_FILE_NAME;
+    	}
+    
+    	Properties propsFile = new Properties();
+    	try (FileReader reader = new FileReader(file) ) {
+    		propsFile.load(reader);	
+    	}
+ 	
+    	
+    	new PropertiesConfigLoader(propsFile).loadConfig(conf);
+    	
     	
     	ctxt.setAttribute("config", conf);
     	
@@ -67,17 +106,24 @@
         ServletRegistration.Dynamic dynconf = ctxt.addServlet("webconfig", servlet );
         dynconf.addMapping("/ConfigServlet");
         
-        return conf;	
-        
+        return conf;	        
+    }
+    
+    private void initDataLoader(ServletContext ctxt, ServiceConfig conf) {
+    	DataLoader load = new DataLoader(ctxt,conf);    	
+    	ctxt.setAttribute("dataloader", load);
+    	load.doLoad();
     }
     
     private void initCircuitBreakers(ServletContext ctxt, ServiceConfig conf) {
     	CircuitBreakerManager mgr = CircuitBreakerManager.getManager();
     	
-    	AccountingCircuitBreaker osm = new AccountingCircuitBreaker("osm", conf);
+    	CircuitBreaker osm = new CircuitBreaker("osm", conf);
+    	osm.setStatistics( new AccountingStatistics() );
     	mgr.addCircuitBreaker( osm );
     	
-    	AccountingCircuitBreaker google = new AccountingCircuitBreaker("google", conf);
+    	CircuitBreaker google = new CircuitBreaker("google", conf);
+    	google.setStatistics( new AccountingStatistics() );
     	mgr.addCircuitBreaker( google );