1 files changed, 29 insertions, 5 deletions
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java
index bac2d0011..399533d3f 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java
@@ -23,6 +23,7 @@ import at.gv.egiz.components.configuration.api.Configuration;
 import at.gv.egiz.components.configuration.api.ConfigurationException;
 import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
+import at.gv.egovernment.moa.id.commons.db.dao.config.STORK;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
 
@@ -86,11 +87,24 @@ public class ConfigurationUtil {
 
 		Properties result = new Properties();
 
+		if (config == null) {
+			return null;
+			
+		}
+		STORK storkConfig = null;
+		try {
+			storkConfig = config.getAuthComponentGeneral().getForeignIdentities().getSTORK();
+		
+		} catch (Exception e) {
+			Logger.debug("No general STORK configuration found.");
+			
+		}
+		
 		//convert all online applications
 		List<OnlineApplication> oaList = config.getOnlineApplication();
 		for (int i=0; i<oaList.size(); i++) {
 			OnlineApplication oa = oaList.get(i);
-			Map<String, String> keyValueOA = ConfigurationMigrationUtils.convertHyberJaxBOnlineApplicationToKeyValue(oa);
+			Map<String, String> keyValueOA = ConfigurationMigrationUtils.convertHyberJaxBOnlineApplicationToKeyValue(oa, storkConfig);
 			
 			String serviceIdentifier = keyValueOA.get(MOAIDConfigurationConstants.PREFIX_SERVICES);
 			if (MiscUtil.isEmpty(serviceIdentifier)) {
@@ -106,7 +120,13 @@ public class ConfigurationUtil {
 							+ key, 
 							keyValueOA.get(key));
 				
-			}						
+			}
+			//set correct metadata list identifier
+			result.put(MOAIDConfigurationConstants.PREFIX_MOAID_SERVICES 
+					+ "." + serviceIdentifier + "." + String.valueOf(i) + "."
+					+ MOAIDConfigurationConstants.METADATA_LIST +".0", 
+					MOAIDConfigurationConstants.PREFIX_MOAID_SERVICES 
+					+ "." + serviceIdentifier);
 		}
 		
 		Map<String, String> keyValueGeneral = ConfigurationMigrationUtils.convertHyberJaxBMOAIDConfigToKeyValue(config);
@@ -189,8 +209,12 @@ public class ConfigurationUtil {
 		Properties inProperties = new Properties();
 		inProperties.load(inStream);
 
-		System.getProperties().setProperty("location", "file:" + outputDBConfigFilePath);
-		ApplicationContext context = new ClassPathXmlApplicationContext("configuration.beans.xml");
+		System.getProperties().setProperty("moa.id.webconfig", "file:" + outputDBConfigFilePath);
+		ApplicationContext context = new ClassPathXmlApplicationContext(
+				new String[]{
+						"configuration.beans.xml", 
+						"moaid.migration.beans.xml"
+						});
 		Configuration dbConfiguration = (Configuration) context.getBean("moaidconfig");
 
 		List<String> keys = null;
@@ -217,7 +241,7 @@ public class ConfigurationUtil {
 			// remove existing entries
 			for (String key : keys) {
 				try {
-					dbConfiguration.setStringValue(key, null);
+					dbConfiguration.deleteIds(key);
 				} catch (ConfigurationException e) {
 					System.out.println("Could NOT persist the configuration file's information in the database.");