add functionality to support more than one ELGA mandate-service

Conflicts:
	id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/utils/ELGAMandateServiceMetadataProvider.java

2 files changed, 34 insertions, 4 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
index a221d30e4..6099760e0 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
@@ -171,6 +171,10 @@ public class ConfigurationMigrationUtils {
 				}
 			}
 			
+			//convert selected SZR-GW service
+			if (MiscUtil.isNotEmpty(oa.getSelectedSZRGWServiceURL()))
+				result.put(MOAIDConfigurationConstants.SERVICE_EXTERNAL_SZRGW_SERVICE_URL, oa.getSelectedSZRGWServiceURL());
+			
 	        AuthComponentOA oaauth = oa.getAuthComponentOA();
 			if (oaauth != null) {
 				
@@ -227,7 +231,15 @@ public class ConfigurationMigrationUtils {
 					if (mandateProfiles != null)
 						result.put(MOAIDConfigurationConstants.SERVICE_AUTH_MANDATES_OVS_USE, Boolean.TRUE.toString());					
 					else
-						result.put(MOAIDConfigurationConstants.SERVICE_AUTH_MANDATES_OVS_USE, Boolean.FALSE.toString());					
+						result.put(MOAIDConfigurationConstants.SERVICE_AUTH_MANDATES_OVS_USE, Boolean.FALSE.toString());
+					
+					
+					if (MiscUtil.isNotEmpty(mandates.getSelectedMISServiceURL()))
+						result.put(MOAIDConfigurationConstants.SERVICE_EXTERNAL_MIS_SERVICE_URL, mandates.getSelectedMISServiceURL());
+					
+					if (MiscUtil.isNotEmpty(mandates.getSelecteELGAServiceURL()))
+						result.put(MOAIDConfigurationConstants.SERVICE_EXTERNAL_ELGA_MANDATE_SERVICE_URL, mandates.getSelecteELGAServiceURL());
+					
 				}
 				
 				//convert KeyBoxSelector
@@ -749,7 +761,9 @@ public class ConfigurationMigrationUtils {
 	        	dbOA.setEventCodes(oa.get(MOAIDConfigurationConstants.SERVICE_REVERSION_LOGS_EVENTCODES));
 	        	
 	        }
-	        	        
+
+	        dbOA.setSelectedSZRGWServiceURL(oa.get(MOAIDConfigurationConstants.SERVICE_EXTERNAL_SZRGW_SERVICE_URL));
+	        
 	        if (Boolean.valueOf(oa.get(MOAIDConfigurationConstants.SERVICE_BUSINESSSERVICE))) {
 	            dbOA.setType(MOA_CONFIG_BUSINESSSERVICE);
 				
@@ -861,6 +875,9 @@ public class ConfigurationMigrationUtils {
 	        			dbProfiles.add(el.trim());
 	        		                	
 	        		mandates.setProfiles(null);
+	        		
+	        		mandates.setSelectedMISServiceURL(oa.get(MOAIDConfigurationConstants.SERVICE_EXTERNAL_MIS_SERVICE_URL));
+	        		mandates.setSelecteELGAServiceURL(oa.get(MOAIDConfigurationConstants.SERVICE_EXTERNAL_ELGA_MANDATE_SERVICE_URL));
 	        	}
 
 	        } else {
@@ -1162,6 +1179,13 @@ public class ConfigurationMigrationUtils {
 	public static Map<String, String> convertHyberJaxBMOAIDConfigToKeyValue(MOAIDConfiguration config) {
 		Map<String, String> result = new HashMap<String, String>();
 		if (config != null) {
+			
+			if (MiscUtil.isNotEmpty(config.getElgaMandateServiceURLs()))
+				result.put(MOAIDConfigurationConstants.GENERAL_AUTH_SERVICES_ELGA_MANDATE_SERVICE_URL, 
+						config.getElgaMandateServiceURLs());
+					
+			
+			
 			AuthComponentGeneral auth = config.getAuthComponentGeneral();
 			
 			if (auth != null) {
@@ -1483,6 +1507,7 @@ public class ConfigurationMigrationUtils {
         
 		MOAIDConfiguration dbconfig = new MOAIDConfiguration();
 		
+		dbconfig.setElgaMandateServiceURLs(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_SERVICES_ELGA_MANDATE_SERVICE_URL));
 		
 		AuthComponentGeneral dbauth = dbconfig.getAuthComponentGeneral();
 		if (dbauth == null) {
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
index 7d9fc452a..9fe90daa4 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
@@ -49,12 +49,13 @@ public final class MOAIDConfigurationConstants extends MOAIDConstants {
 	private static final String STORK = "stork";
 	private static final String TEMPLATES = "templates";	
 	private static final String INTERFEDERATION = "interfederation";
+	private static final String ELGA_MANDATE_SERVICE_URL = "modules.elga_mandate.service.entityID";
 	
 	private static final String PROTOCOLS = "protocols";
 	private static final String SAML1 = "saml1";
 	private static final String PVP2X = "pvp2x";
 	private static final String OPENID = "openID";
-	
+		
 	private static final String SERVICE_AUTH_TARGET = AUTH + "." + TARGET;
 	private static final String SERVICE_AUTH_TARGET_PUBLIC = SERVICE_AUTH_TARGET + ".public";
 	private static final String SERVICE_AUTH_TARGET_BUSINESS = SERVICE_AUTH_TARGET + ".business";	
@@ -182,7 +183,9 @@ public final class MOAIDConfigurationConstants extends MOAIDConstants {
 	public static final String SERVICE_REVERSION_LOGS_ENABLED = SERVICE_REVERSION + ".log.enabled";
 	public static final String SERVICE_REVERSION_LOGS_EVENTCODES = SERVICE_REVERSION + ".log.eventcodes";
 	
-	
+	public static final String SERVICE_EXTERNAL_ELGA_MANDATE_SERVICE_URL = ELGA_MANDATE_SERVICE_URL;
+	public static final String SERVICE_EXTERNAL_MIS_SERVICE_URL = "modules.mis.service.url";
+	public static final String SERVICE_EXTERNAL_SZRGW_SERVICE_URL = "modules.szrgw.service.url";
 	
 	//Namespaces for general MOA-ID config
 	public static final String GENERAL_PUBLICURLPREFIX = PREFIX_MOAID_GENERAL + ".publicURLPrefix";
@@ -219,6 +222,8 @@ public final class MOAIDConfigurationConstants extends MOAIDConstants {
 	public static final String GENERAL_AUTH_SERVICES_SZRGW_URL = GENERAL_AUTH + ".services.szrgw.url";
 	public static final String GENERAL_AUTH_SERVICES_HVB_URL = GENERAL_AUTH + ".services.hvb.url";
 	
+	public static final String GENERAL_AUTH_SERVICES_ELGA_MANDATE_SERVICE_URL = PREFIX_MOAID_GENERAL + "." + ELGA_MANDATE_SERVICE_URL;
+	
 	public static final String GENERAL_AUTH_SSO_SERVICENAME = GENERAL_AUTH + "." + SSO + ".servicename";
 	public static final String GENERAL_AUTH_SSO_TARGET = GENERAL_AUTH + "." + SSO + ".target";
 	public static final String GENERAL_AUTH_SSO_AUTHBLOCK_TEXT = GENERAL_AUTH + "." + SSO + ".authblock.text";