--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/ContextListener.java	2015/02/23 15:11:39	2350
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/ContextListener.java	2015/02/23 15:20:10	2351
@@ -34,20 +34,22 @@
     	
     	ServletContext ctxt = ctxtEvt.getServletContext();
     	
-    	initDataLoader(ctxt);
-    	initConfig(ctxt);
+    	ServiceConfig conf = initConfig(ctxt);
+    	
+    	initDataLoader(ctxt,conf);
+    	
     	
     	System.out.println("DAO Context done");
     }
     
-    private void initDataLoader(ServletContext ctxt) {
-    	DataLoader load = new DataLoader(ctxt);    	
+    private void initDataLoader(ServletContext ctxt, ServiceConfig conf) {
+    	DataLoader load = new DataLoader(ctxt,conf);    	
     	ctxt.setAttribute("dataloader", load);
     	load.doLoad();
     }
 	
     
-    private void initConfig(ServletContext ctxt) {
+    private ServiceConfig initConfig(ServletContext ctxt) {
     	ServiceConfig conf = new ServiceConfig();
     	
     	new ContextConfigLoader(ctxt).loadConfig(conf);
@@ -59,9 +61,9 @@
         servlet.setConfigObject( conf );
         ServletRegistration.Dynamic dynconf = ctxt.addServlet("webconfig", servlet );
         dynconf.addMapping("/ConfigServlet");
-    	
-    	
-    	
+        
+        return conf;	
+        
     }