--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/ContextListener.java	2015/02/27 07:34:08	2393
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/ContextListener.java	2015/07/14 08:32:56	2605
@@ -12,9 +12,13 @@
 
 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.PropertiesConfigLoader;
@@ -37,10 +41,13 @@
          // 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 = null;
@@ -54,7 +61,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");
     }
@@ -105,10 +118,12 @@
     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 );