add virtual IDP enabled flag to configuration

3 files changed, 36 insertions, 1 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 e819805ad..63d8f463c 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
@@ -1188,6 +1188,9 @@ public class ConfigurationMigrationUtils {
 					result.put(MOAIDConfigurationConstants.GENERAL_PUBLICURLPREFIX, 
 							authgen.getPublicURLPreFix());						
 					
+					result.put(MOAIDConfigurationConstants.GENERAL_ISVIRTUALIDPSENABLED, 
+							String.valueOf(authgen.isVirtualPublicURLPrefixEnabled()));
+					
 					TimeOuts timeouts = authgen.getTimeOuts();
 					if (timeouts != null) {
 						
@@ -1480,6 +1483,16 @@ public class ConfigurationMigrationUtils {
 			
 		dbauthgeneral.setPublicURLPreFix(moaconfig.get(MOAIDConfigurationConstants.GENERAL_PUBLICURLPREFIX));
 		
+		if (MiscUtil.isNotEmpty(moaconfig.get(MOAIDConfigurationConstants.GENERAL_ISVIRTUALIDPSENABLED))) {
+			dbauthgeneral.setVirtualPublicURLPrefixEnabled(
+					Boolean.valueOf(
+							moaconfig.get(MOAIDConfigurationConstants.GENERAL_ISVIRTUALIDPSENABLED)));
+			
+		} else {
+			dbauthgeneral.setVirtualPublicURLPrefixEnabled(false);
+			
+		}
+		
 		if (MiscUtil.isNotEmpty(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_CERTSTORE_URL)))
 				dbauthgeneral.setCertStoreDirectory(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_CERTSTORE_URL));
 
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 c338c65ba..7d9fc452a 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
@@ -186,6 +186,7 @@ public final class MOAIDConfigurationConstants extends MOAIDConstants {
 	
 	//Namespaces for general MOA-ID config
 	public static final String GENERAL_PUBLICURLPREFIX = PREFIX_MOAID_GENERAL + ".publicURLPrefix";
+	public static final String GENERAL_ISVIRTUALIDPSENABLED = PREFIX_MOAID_GENERAL + ".isVirtualIDPsEnabled";
 	
 	private static final String GENERAL_DEFAULTS = PREFIX_MOAID_GENERAL + ".defaults";	
 	private static final String GENERAL_DEFAULTS_BKU = GENERAL_DEFAULTS + "." + BKU;
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/GeneralConfiguration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/GeneralConfiguration.java
index 883245da8..d3e454e51 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/GeneralConfiguration.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/GeneralConfiguration.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
@@ -107,6 +108,9 @@ public class GeneralConfiguration
     @XmlAttribute(name = "Hjid")
     protected Long hjid;
 
+    @XmlTransient
+    protected boolean virtualPublicURLPrefixEnabled = false;
+    
     /**
      * Gets the value of the timeOuts property.
      * 
@@ -322,7 +326,24 @@ public class GeneralConfiguration
         return true;
     }
 
-    public boolean equals(Object object) {
+    
+    
+    /**
+	 * @return the virtualPublicURLPrefixEnabled
+	 */
+	public boolean isVirtualPublicURLPrefixEnabled() {
+		return virtualPublicURLPrefixEnabled;
+	}
+
+	/**
+	 * @param virtualPublicURLPrefixEnabled the virtualPublicURLPrefixEnabled to set
+	 */
+	public void setVirtualPublicURLPrefixEnabled(
+			boolean virtualPublicURLPrefixEnabled) {
+		this.virtualPublicURLPrefixEnabled = virtualPublicURLPrefixEnabled;
+	}
+
+	public boolean equals(Object object) {
         final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
         return equals(null, null, object, strategy);
     }