1 files changed, 26 insertions, 12 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index da3a79d32..f4cdeddb7 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -323,7 +323,7 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 
 		String legacyconfig = props.getProperty("configuration.xml.legacy");
 		String xmlconfig = props.getProperty("configuration.xml");
-		String xmlconfigout = props.getProperty("configuration.xml.out");
+//		String xmlconfigout = props.getProperty("configuration.xml.out");
 		
 		
 		//check if XML config should be used
@@ -344,8 +344,15 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 		if (MiscUtil.isNotEmpty(legacyconfig)) {
 			Logger.warn("WARNING! MOA-ID 2.0 is started with legacy configuration. This setup is not recommended!");
 			
-			MOAIDConfiguration moaconfig = BuildFromLegacyConfig.build(new File(legacyconfig), rootConfigFileDir);		
+			MOAIDConfiguration moaconfig = BuildFromLegacyConfig.build(new File(legacyconfig), rootConfigFileDir, null);
+			
+			List<OnlineApplication> oas = moaconfig.getOnlineApplication();
+			for (OnlineApplication oa : oas)
+				ConfigurationDBUtils.save(oa);
+
+			moaconfig.setOnlineApplication(null);	
 			ConfigurationDBUtils.save(moaconfig);
+			
 			Logger.info("Legacy Configuration load is completed.");
 			
 	
@@ -361,6 +368,13 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 				File file = new File(xmlconfig); 
 				MOAIDConfiguration moaconfig = (MOAIDConfiguration) m.unmarshal(file);
 				//ConfigurationDBUtils.save(moaconfig);
+				
+				List<OnlineApplication> importoas = moaconfig.getOnlineApplication();
+				for (OnlineApplication importoa : importoas) {
+					ConfigurationDBUtils.saveOrUpdate(importoa);
+				}
+				
+				moaconfig.setOnlineApplication(null);
 				ConfigurationDBUtils.saveOrUpdate(moaconfig);
 				
 			} catch (Exception e) {
@@ -375,16 +389,16 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 		Logger.info("MOA-ID 2.0 is loaded.");
 		
 		
-		//TODO: only for Testing!!!
-		if (MiscUtil.isNotEmpty(xmlconfigout)) {
-			Logger.info("Write MOA-ID 2.x xml config into " + xmlconfig);
-			JAXBContext jc = JAXBContext.newInstance("at.gv.egovernment.moa.id.commons.db.dao.config");
-			Marshaller m = jc.createMarshaller();
-			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-			File test = new File(xmlconfigout);
-			m.marshal(moaidconfig, test);
-			
-		}
+//		//TODO: only for Testing!!!
+//		if (MiscUtil.isNotEmpty(xmlconfigout)) {
+//			Logger.info("Write MOA-ID 2.x xml config into " + xmlconfig);
+//			JAXBContext jc = JAXBContext.newInstance("at.gv.egovernment.moa.id.commons.db.dao.config");
+//			Marshaller m = jc.createMarshaller();
+//			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+//			File test = new File(xmlconfigout);
+//			m.marshal(moaidconfig, test);
+//			
+//		}
 		
 		//build STORK Config	
 		AuthComponentGeneral auth = getAuthComponentGeneral();