1 files changed, 22 insertions, 20 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
index c830e682d..d8bb0179c 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
@@ -25,15 +25,14 @@ package at.gv.egovernment.moa.id.configuration.data;
 import java.util.ArrayList;
 import java.util.List;
 
-import at.gv.egovernment.moa.id.commons.config.persistence.MOAIDConfigurationImpl;
-import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
-import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
-import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentGeneral;
-import at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS;
-import at.gv.egovernment.moa.id.commons.db.dao.config.ForeignIdentities;
-import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
-import at.gv.egovernment.moa.id.commons.db.dao.config.STORK;
-import at.gv.egovernment.moa.id.commons.db.dao.config.StorkAttribute;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AuthComponentGeneral;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.CPEPS;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.ForeignIdentities;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.MOAIDConfiguration;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.STORK;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.StorkAttribute;
+import at.gv.egovernment.moa.id.config.webgui.exception.ConfigurationException;
+import at.gv.egovernment.moa.id.configuration.config.ConfigurationProvider;
 
 import org.apache.log4j.Logger;
 
@@ -49,18 +48,17 @@ public class GeneralStorkConfig {
     /**
 	 * 
 	 */
-	public GeneralStorkConfig() {
-				
-		dbconfig = ConfigurationDBRead.getMOAIDConfiguration();
-		
+	public GeneralStorkConfig() {		
+		try {
+			dbconfig = ConfigurationProvider.getInstance().getDbRead().getMOAIDConfiguration();
+			
+		} catch (ConfigurationException e) {
+			log.error("MOA-ID-Configuration initialization FAILED.", e);
+			
+		}
+			
 	}
-    
-	@Override
-    protected void finalize() throws Throwable {
-		ConfigurationDBUtils.closeSession();
-        super.finalize();        
-    }
-		
+    	
     public void parse(MOAIDConfiguration config) {
         log.info("Initializing general Stork config");
 
@@ -108,6 +106,10 @@ public class GeneralStorkConfig {
 		}
 	}
 
+    public List<CPEPS> getRawCPEPSList() {
+    	return cpepslist;
+    }
+    
 	public List<CPEPS> getCpepslist() {
 		if (null == cpepslist)
 			return null;