Merge remote-tracking branch 'remotes/origin/vidp' into moa2_0_tlenz

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
	id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
	id/server/moa-id-commons/pom.xml
	id/server/stork2-saml-engine/pom.xml
	pom.xml
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom

11 files changed, 1557 insertions, 1369 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java
index 7a9d91a5d..79a966b81 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java
@@ -69,9 +69,12 @@ public class Constants {
 	public static final String BKU_HANDY = "bkuhandy";
 	
 	public static final String MOA_CONFIG_BUSINESSSERVICE = "businessService";
-	public static final String MOA_CONFIG_PROTOCOL_SAML1 = "id_saml1";
+    public static final String MOA_CONFIG_STORKSERVICE = "storkService";
+    public static final String MOA_CONFIG_PROTOCOL_SAML1 = "id_saml1";
 	public static final String MOA_CONFIG_PROTOCOL_PVP2 = "id_pvp2x";
-	
+    public static final String MOA_CONFIG_PROTOCOL_STORK2 = "id_stork2";
+
+
 	public static final String DEFAULT_LOCALBKU_URL = "https://127.0.0.1:3496/https-security-layer-request";
 	public static final String DEFAULT_HANDYBKU_URL = "https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx";
 	
@@ -80,20 +83,24 @@ public class Constants {
 	public static final String IDENIFICATIONTYPE_FN = "FN";
 	public static final String IDENIFICATIONTYPE_ERSB = "ERSB";
 	public static final String IDENIFICATIONTYPE_ZVR = "ZVR";
-	public static final String IDENIFICATIONTYPE_BASEID = "urn:publicid:gv.at:baseid+";
+    public static final String IDENIFICATIONTYPE_STORK = "STORK";
+    public static final String IDENIFICATIONTYPE_BASEID = "urn:publicid:gv.at:baseid+";
 	
 	public static final String IDENIFICATIONTYPE_BASEID_FN = IDENIFICATIONTYPE_BASEID + "X" + IDENIFICATIONTYPE_FN;
 	public static final String IDENIFICATIONTYPE_BASEID_ZVR = IDENIFICATIONTYPE_BASEID + "X" + IDENIFICATIONTYPE_ZVR;
 			
 	public static final String PREFIX_WPBK = "urn:publicid:gv.at:wbpk+";
-	
-	public static final Map<String, String> BUSINESSSERVICENAMES;
+    public static final String PREFIX_STORK = "urn:publicid:gv.at:storkid+";
+
+
+    public static final Map<String, String> BUSINESSSERVICENAMES;
 	static {
 		Hashtable<String, String> tmp = new Hashtable<String, String>();
 		tmp.put(IDENIFICATIONTYPE_FN, "Firmenbuchnummer");
 		tmp.put(IDENIFICATIONTYPE_ZVR, "Vereinsnummer");
 		tmp.put(IDENIFICATIONTYPE_ERSB, "ERsB Kennzahl");
-		
-		BUSINESSSERVICENAMES = Collections.unmodifiableMap(tmp);
+        tmp.put(IDENIFICATIONTYPE_STORK, "STORK");
+
+        BUSINESSSERVICENAMES = Collections.unmodifiableMap(tmp);
 	}
 }
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
index 0c4823f43..2dce3534f 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
@@ -92,7 +92,7 @@ public class ConfigurationProvider {
 		configFileName = System.getProperty(SYSTEM_PROP_CONFIG);
 		
 	    if (configFileName == null) {
-	        throw new ConfigurationException("config.01");
+	        throw new ConfigurationException("config.05");
 	    }
 	    
 		// determine the directory of the root config file
@@ -377,6 +377,14 @@ public class ConfigurationProvider {
 	public String getMailOAActivationSubject() {
 		return props.getProperty("general.mail.createOArequest.isactive.subject");
 	}
+
+    public String getDefaultLanguage() {
+        try {
+            return props.getProperty("general.defaultlanguage").toLowerCase();
+        } catch (Exception ex) {
+            return "de";
+        }
+    }
 	
 	public String getMailOAActivationTemplate() throws ConfigurationException {
 		String url = props.getProperty("general.mail.createOArequest.isactive.template");
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
index 773dd8e7c..4c3486b46 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
@@ -114,6 +114,7 @@ public class GeneralMOAIDConfig {
 	private static Map<String, String> chainigmodelist;
 	
 	private String trustedCACerts = null;
+
 	
 	private String defaultBKUOnline = "";
 	private String defaultBKULocal = "https://127.0.0.1:3496/https-security-layer-request";
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 56c3cb654..3354fd708 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
@@ -31,14 +31,18 @@ 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 org.apache.log4j.Logger;
 
 public class GeneralStorkConfig {
 
 	private List<CPEPS> cpepslist;
 	private List<StorkAttribute> attributes;
 	private int qaa;
+    private static final Logger log = Logger.getLogger(GeneralStorkConfig.class);
+
+    public void parse(MOAIDConfiguration config) {
+        log.error("STARTED STORK CONFIG");
 
-	public void parse(MOAIDConfiguration config) {
 
 		if (config != null) {
 			AuthComponentGeneral auth = config.getAuthComponentGeneral();
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
index 990227738..7510b8932 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
@@ -59,17 +59,19 @@ public class OAGeneralConfig {
 	private String friendlyName = null;
 	
 	private boolean businessService = false;
-	
-	private String target = null;
+    private boolean storkService = false;
+
+    private String target = null;
 	private String target_subsector = null;
 	private String target_admin = null;
 	private static List<String> targetList = null;
 	private String targetFriendlyName = null;
 	private boolean isAdminTarget = false;
-	
+
 	private String identificationNumber = null;
 	private String identificationType = null;
 	private static List<String> identificationTypeList = null;
+    private String storkSPTargetCountry = null;
 	
 	private String aditionalAuthBlockText = null;
 		
@@ -119,7 +121,8 @@ public class OAGeneralConfig {
 		 identificationTypeList = Arrays.asList(
 				 Constants.IDENIFICATIONTYPE_FN,
 				 Constants.IDENIFICATIONTYPE_ZVR,
-				 Constants.IDENIFICATIONTYPE_ERSB);
+				 Constants.IDENIFICATIONTYPE_ERSB,
+                 Constants.IDENIFICATIONTYPE_STORK);
 	}
 	
 	
@@ -160,8 +163,17 @@ public class OAGeneralConfig {
 			businessService = true;
 		else 
 			businessService = false;
-		
-		AuthComponentOA oaauth = dbOAConfig.getAuthComponentOA();
+
+        if (dbOAConfig.getType().equals(Constants.MOA_CONFIG_STORKSERVICE))
+            storkService = true;
+        else
+            storkService = false;
+
+        if (dbOAConfig.getStorkSPTargetCountry() != null)
+            storkSPTargetCountry = dbOAConfig.getStorkSPTargetCountry();
+
+
+        AuthComponentOA oaauth = dbOAConfig.getAuthComponentOA();
 		if (oaauth != null) {
 			BKUURLS bkuurls = oaauth.getBKUURLS();
 			
@@ -206,7 +218,10 @@ public class OAGeneralConfig {
 					if (Constants.PREFIX_WPBK.startsWith(split[0]) && split.length >= 2) {
 						identificationType = split[1];
 						identificationNumber = split[2];
-					}
+					} else if (Constants.PREFIX_STORK.startsWith(split[0]) && split.length >= 2) {
+                        identificationType = split[1]; // setting at as iden category ?
+                        identificationNumber = split[2]; // setting sp country as ident type -> sp ident
+                    }
 				}
 			}
 			
@@ -319,6 +334,14 @@ public class OAGeneralConfig {
 		return identificationNumber;
 	}
 
+    public String getStorkSPTargetCountry() {
+        return storkSPTargetCountry;
+    }
+
+    public void setStorkSPTargetCountry(String storkSPTargetCountry) {
+        this.storkSPTargetCountry = storkSPTargetCountry;
+    }
+
 	public void setIdentificationNumber(String identificationNumber) {
 		this.identificationNumber = identificationNumber;
 	}
@@ -359,6 +382,14 @@ public class OAGeneralConfig {
 		return businessService;
 	}
 
+    public boolean isStorkService() {
+        return storkService;
+    }
+
+    public void setStorkService(boolean storkService) {
+        this.storkService = storkService;
+    }
+
 	public void setBusinessService(boolean businessService) {
 		this.businessService = businessService;
 	}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index da07b10b0..d9f2a4d85 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -26,11 +26,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
+import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OASTORK;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAStorkAttribute;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.config.StorkAttribute;
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.id.protocols.stork2.AttributeProviderFactory;
 
 public class OASTORKConfig {
 
@@ -65,6 +68,7 @@ public class OASTORKConfig {
 
 				// prepare attribute helper list
 				attributes = new ArrayList<AttributeHelper>();
+                try {
 				for(StorkAttribute current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getAttributes()) {
 					AttributeHelper tmp = null;
 
@@ -77,6 +81,21 @@ public class OASTORKConfig {
 
 					attributes.add(tmp);
 				}
+				
+				// fetch vidp config
+				setVidpEnabled(config.isVidpEnabled());
+				setRequireConsent(config.isRequireConsent());
+
+				attributeProviderPlugins = config.getAttributeProviders();
+				// - if no attribute providers are configured, add a dummy
+				// TODO this is a dirty hack since we have to have one entry to
+				// clone from in the web form. Happens when time is short.
+				// Sorry.
+				if (attributeProviderPlugins.isEmpty())
+					attributeProviderPlugins.add(new AttributeProviderPlugin());
+				} catch (NullPointerException ex) {
+                    Logger.error("Nullpointerexception encountered in Configurationinterface");
+                }
 			}
 		}
 	}
@@ -126,4 +145,39 @@ public class OASTORKConfig {
 	public void setHelperAttributes(List<AttributeHelper> attributes) {
 		this.attributes = attributes;
 	}
+	
+	/*
+	 * VIDP settings below
+	 */
+	private boolean vidpEnabled = false;
+	private List<AttributeProviderPlugin> attributeProviderPlugins = new ArrayList<AttributeProviderPlugin>();
+	private boolean requireConsent;
+
+	public List<String> getAvailableAttributeProviderPlugins() {
+		return AttributeProviderFactory.getAvailablePlugins();
+	}
+	
+	public List<AttributeProviderPlugin> getAttributeProviderPlugins() {
+		return attributeProviderPlugins;
+	}
+	
+	public void setAttributeProviderPlugins(List<AttributeProviderPlugin> update) {
+		attributeProviderPlugins = update;
+	}
+
+	public boolean isVidpEnabled() {
+		return vidpEnabled;
+	}
+	
+	public void setVidpEnabled(boolean update) {
+		vidpEnabled = update;
+	}
+	
+	public boolean isRequireConsent() {
+		return requireConsent;
+	}
+	
+	public void setRequireConsent(boolean update) {
+		requireConsent = update;
+	}
 }
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java
index a2f0628eb..73b2708ae 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java
@@ -23,6 +23,10 @@
 package at.gv.egovernment.moa.id.configuration.helper;
 
 
+import at.gv.egovernment.moa.id.configuration.config.ConfigurationProvider;
+import at.gv.egovernment.moa.id.configuration.exception.ConfigurationException;
+import at.gv.egovernment.moa.logging.Logger;
+
 import java.text.MessageFormat;
 import java.util.Locale;
 import java.util.ResourceBundle;
@@ -34,9 +38,44 @@ public class LanguageHelper {
 
 	private static ResourceBundle errorRes_DE = ResourceBundle.getBundle("applicationResources", Locale.GERMAN);
 	private static ResourceBundle guiRes_DE = ResourceBundle.getBundle("applicationResources", Locale.GERMAN);
-	
-	public static String getGUIString(String code, HttpServletRequest request) {
-		return guiRes_DE.getString(code);
+
+    private static ResourceBundle errorRes_EN = ResourceBundle.getBundle("applicationResources_en", Locale.ENGLISH);
+    private static ResourceBundle guiRes_EN = ResourceBundle.getBundle("applicationResources_en", Locale.ENGLISH);
+
+    private static ResourceBundle errorLanguage() {
+        Logger.setHierarchy("moa.id.configuration");
+        try {
+            ConfigurationProvider configurationProvider = ConfigurationProvider.getInstance();
+            if (configurationProvider.getDefaultLanguage().equals("en")) {
+                return errorRes_EN;
+            } else {
+                return errorRes_DE;
+            }
+        } catch (ConfigurationException e) {
+            Logger.error("Configuration exception while getting ConfigurationProvider instance");
+            e.printStackTrace();
+            return errorRes_DE;
+        }
+    }
+
+    private static ResourceBundle guiLanguage() {
+        Logger.setHierarchy("moa.id.configuration");
+        try {
+            ConfigurationProvider configurationProvider = ConfigurationProvider.getInstance();
+            if (configurationProvider.getDefaultLanguage().equals("en")) {
+                return guiRes_EN;
+            } else {
+                return guiRes_DE;
+            }
+        } catch (ConfigurationException e) {
+            Logger.error("Configuration exception while getting ConfigurationProvider instance");
+            e.printStackTrace();
+            return guiRes_DE;
+        }
+    }
+
+    public static String getGUIString(String code, HttpServletRequest request) {
+        return guiRes_DE.getString(code);
 	}
 	
 	public static String getGUIString(String code) {
@@ -44,16 +83,15 @@ public class LanguageHelper {
 	}
 	
 	public static String getErrorString(String code, HttpServletRequest request) {
-		return errorRes_DE.getString(code);
+		return errorLanguage().getString(code);
 	}
 	
 	public static String getErrorString(String code) {
-		return errorRes_DE.getString(code);
+		return errorLanguage().getString(code);
 	}
 	
 	public static String getGUIString(String code, String parameter, HttpServletRequest request) {
-				
-		return MessageFormat.format(getGUIString(code, request), parameter);
+        return MessageFormat.format(getGUIString(code, request), parameter);
 	}
 	
 	public static String getErrorString(String code, Object[] parameter, HttpServletRequest request) {
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
index dfc9b8801..b77b47d15 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
@@ -23,12 +23,7 @@
 package at.gv.egovernment.moa.id.configuration.struts.action;
 
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -99,7 +94,8 @@ public class EditGeneralConfigAction extends ActionSupport
 	private String formID;
 	
 	public String loadConfig() {
-		HttpSession session = request.getSession();
+
+        HttpSession session = request.getSession();
 		if (session == null) {
 			log.info("No http Session found.");
 			return Constants.STRUTS_ERROR;
@@ -116,8 +112,16 @@ public class EditGeneralConfigAction extends ActionSupport
 			moaconfig.parse(dbconfig);
 			storkconfig = new GeneralStorkConfig();
 			storkconfig.parse(dbconfig);
-			
-			ConfigurationDBUtils.closeSession();
+
+            if (moaconfig == null) {
+                log.error("MOA configuration is null");
+            }
+
+            if (storkconfig == null) {
+                log.error("Stork configuration is null");
+            }
+
+            ConfigurationDBUtils.closeSession();
 			
 			formID = Random.nextRandom();
 			session.setAttribute(Constants.SESSION_FORMID, formID);
@@ -136,7 +140,7 @@ public class EditGeneralConfigAction extends ActionSupport
 			log.info("No http Session found.");
 			return Constants.STRUTS_ERROR;
 		}
-		
+
 		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
 		authUser = (AuthenticatedUser) authUserObj;
 		
@@ -164,7 +168,7 @@ public class EditGeneralConfigAction extends ActionSupport
 			errors.addAll(new StorkConfigValidator().validate(storkconfig)); 
 
 			if (errors.size() > 0) {
-				log.info("General MOA-ID configuration has some erros.");
+				log.info("General MOA-ID configuration has some errors.");
 				for (String el : errors)
 					addActionError(el);	
 				
@@ -201,7 +205,24 @@ public class EditGeneralConfigAction extends ActionSupport
 	}
 	
 	private String saveFormToDatabase() {
-		
+
+        log.debug("Saving form to database");
+        log.error("Saving form to db");
+        log.info("SV frm db");
+
+        for (Object obj : Collections.list(request.getParameterNames())) {
+            log.error(" PARAM: " + obj.toString());
+        }
+        for (Object obj : Collections.list(request.getSession().getAttributeNames())) {
+            log.error(" SES PARAM: " + obj.toString());
+        }
+
+        try {
+            log.error(" ASSERTION " + moaconfig.getTimeoutAssertion());
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+
 		MOAIDConfiguration oldconfig = ConfigurationDBRead.getMOAIDConfiguration();
 		AuthComponentGeneral oldauth = null;
 		if (oldconfig != null) {
@@ -272,7 +293,8 @@ public class EditGeneralConfigAction extends ActionSupport
 		
 		dbauthgeneral.setTrustManagerRevocationChecking(moaconfig.isTrustmanagerrevocationcheck());
 		
-		
+
+
 		Protocols dbprotocols = dbauth.getProtocols();
 		if (dbprotocols == null) {
 			dbprotocols = new Protocols();
@@ -426,6 +448,7 @@ public class EditGeneralConfigAction extends ActionSupport
 //		}
 				
 		DefaultBKUs dbbkus = dbconfig.getDefaultBKUs();
+
 		if (dbbkus == null) {
 			dbbkus = new DefaultBKUs();
 			dbconfig.setDefaultBKUs(dbbkus);
@@ -489,12 +512,14 @@ public class EditGeneralConfigAction extends ActionSupport
 		
 		//TODO: Set STORK Config!!!
 		if (oldauth != null) {
-			ForeignIdentities oldforeign = oldauth.getForeignIdentities();
+            ForeignIdentities oldforeign = oldauth.getForeignIdentities();
 			if (oldforeign != null) {
 				STORK oldstork = oldforeign.getSTORK();
 				if (oldstork == null)
 					oldstork = new STORK();
 
+                try {
+                log.error("QAAAA " + storkconfig.getDefaultQaa());
 				oldstork.setQualityAuthenticationAssuranceLevel(storkconfig.getDefaultQaa());
 				
 				if (storkconfig.getAttributes() != null)
@@ -510,6 +535,16 @@ public class EditGeneralConfigAction extends ActionSupport
 					oldstork.setCPEPS((List<CPEPS>) (new ArrayList<CPEPS>()));
 				
 				dbforeign.setSTORK(oldstork);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+                try{
+                   log.error("CPEPS LIST: " + storkconfig.getCpepslist().size() );
+                    log.error("CPEPS 1:" + storkconfig.getCpepslist().get(0).getCountryCode() +storkconfig.getCpepslist().get(0).getURL());
+                }   catch (Exception ex) {
+                    ex.printStackTrace();
+                }
 			}
 		}
 
@@ -651,6 +686,7 @@ public class EditGeneralConfigAction extends ActionSupport
 	 */
 	public void setMoaconfig(GeneralMOAIDConfig moaconfig) {
 		this.moaconfig = moaconfig;
+        log.error("MOA CONFIG SET");
 	}
 	
 	/**
@@ -669,6 +705,7 @@ public class EditGeneralConfigAction extends ActionSupport
 	 */
 	public void setStorkconfig(GeneralStorkConfig storkconfig) {
 		this.storkconfig = storkconfig;
+        log.error("STORK CONFIG SET");
 	}
 
 	/**
@@ -684,8 +721,8 @@ public class EditGeneralConfigAction extends ActionSupport
 	public void setFormID(String formID) {
 		this.formID = formID;
 	}
-	
-	
+
+
 	
 
 }
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index 19006ea22..e5d84d461 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -22,65 +22,16 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.configuration.struts.action;
 
-import iaik.utils.URLDecoder;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.security.cert.CertificateException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.log4j.Logger;
-import org.apache.struts2.interceptor.ServletRequestAware;
-import org.apache.struts2.interceptor.ServletResponseAware;
-import org.bouncycastle.asn1.InMemoryRepresentable;
-
 import at.gv.egovernment.moa.id.auth.builder.LoginFormBuilder;
 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.AuthComponentOA;
-import at.gv.egovernment.moa.id.commons.db.dao.config.BKUSelectionCustomizationType;
-import at.gv.egovernment.moa.id.commons.db.dao.config.BKUURLS;
-import at.gv.egovernment.moa.id.commons.db.dao.config.DefaultBKUs;
-import at.gv.egovernment.moa.id.commons.db.dao.config.IdentificationNumber;
-import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
-import at.gv.egovernment.moa.id.commons.db.dao.config.MOAKeyBoxSelector;
-import at.gv.egovernment.moa.id.commons.db.dao.config.Mandates;
-import at.gv.egovernment.moa.id.commons.db.dao.config.MandatesProfileNameItem;
-import at.gv.egovernment.moa.id.commons.db.dao.config.OAOAUTH20;
-import at.gv.egovernment.moa.id.commons.db.dao.config.OAPVP2;
-import at.gv.egovernment.moa.id.commons.db.dao.config.OASAML1;
-import at.gv.egovernment.moa.id.commons.db.dao.config.OASSO;
-import at.gv.egovernment.moa.id.commons.db.dao.config.OASTORK;
-import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
-import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplicationType;
-import at.gv.egovernment.moa.id.commons.db.dao.config.TemplateType;
-import at.gv.egovernment.moa.id.commons.db.dao.config.TemplatesType;
-import at.gv.egovernment.moa.id.commons.db.dao.config.TransformsInfoType;
-import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
+import at.gv.egovernment.moa.id.commons.db.dao.config.*;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.config.ConfigurationProvider;
 import at.gv.egovernment.moa.id.configuration.data.FormularCustomization;
-import at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig;
-import at.gv.egovernment.moa.id.configuration.data.oa.OAOAuth20Config;
-import at.gv.egovernment.moa.id.configuration.data.oa.OAPVP2Config;
-import at.gv.egovernment.moa.id.configuration.data.oa.OASAML1Config;
-import at.gv.egovernment.moa.id.configuration.data.oa.OASSOConfig;
-import at.gv.egovernment.moa.id.configuration.data.oa.OASTORKConfig;
+import at.gv.egovernment.moa.id.configuration.data.oa.*;
 import at.gv.egovernment.moa.id.configuration.exception.ConfigurationException;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.helper.MailHelper;
@@ -88,1286 +39,1310 @@ import at.gv.egovernment.moa.id.configuration.helper.StringHelper;
 import at.gv.egovernment.moa.id.configuration.validation.FormularCustomizationValitator;
 import at.gv.egovernment.moa.id.configuration.validation.TargetValidator;
 import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
-import at.gv.egovernment.moa.id.configuration.validation.oa.OAFileUploadValidation;
-import at.gv.egovernment.moa.id.configuration.validation.oa.OAGeneralConfigValidation;
-import at.gv.egovernment.moa.id.configuration.validation.oa.OAOAUTH20ConfigValidation;
-import at.gv.egovernment.moa.id.configuration.validation.oa.OAPVP2ConfigValidation;
-import at.gv.egovernment.moa.id.configuration.validation.oa.OASAML1ConfigValidation;
-import at.gv.egovernment.moa.id.configuration.validation.oa.OASSOConfigValidation;
-import at.gv.egovernment.moa.id.configuration.validation.oa.OASTORKConfigValidation;
+import at.gv.egovernment.moa.id.configuration.validation.oa.*;
 import at.gv.egovernment.moa.id.util.FormBuildUtils;
 import at.gv.egovernment.moa.id.util.Random;
 import at.gv.egovernment.moa.util.MiscUtil;
-
 import com.opensymphony.xwork2.ActionSupport;
+import iaik.utils.URLDecoder;
+import org.apache.log4j.Logger;
+import org.apache.struts2.interceptor.ServletRequestAware;
+import org.apache.struts2.interceptor.ServletResponseAware;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.*;
+import java.math.BigInteger;
+import java.security.cert.CertificateException;
+import java.util.*;
 
 public class EditOAAction extends ActionSupport implements ServletRequestAware, ServletResponseAware {
-	
-	private final Logger log = Logger.getLogger(EditOAAction.class);
-	
-	private static final long serialVersionUID = 1L;
-	
-	private HttpServletRequest request;
-	private HttpServletResponse response;
-	
-	private AuthenticatedUser authUser;
-	
-	private String oaidobj;
-	private boolean newOA;
-	private String formID;
-	
-	private boolean onlyBusinessService = false;
-	private boolean subTargetSet = false;
-	private boolean deaktivededBusinessService = false;
-	private boolean isMetaDataRefreshRequired = false;
-	
-	private String nextPage;
-	
-	private OAGeneralConfig generalOA = new OAGeneralConfig();
-	private OAPVP2Config pvp2OA = new OAPVP2Config();
-	private OASAML1Config saml1OA = new OASAML1Config();
-	private OASSOConfig ssoOA = new OASSOConfig();
-	private OAOAuth20Config oauth20OA = new OAOAuth20Config();
-	private OASTORKConfig storkOA = new OASTORKConfig();
-	private FormularCustomization formOA = new FormularCustomization();
-		
-	private InputStream stream;
-	
-	private Map<String, byte[]> sendAssertionForm = new HashMap<String, byte[]>();
-	private Map<String, byte[]> bkuSelectionForm = new HashMap<String, byte[]>();
-	
-	// STRUTS actions
-	public String inital() {
-		HttpSession session = request.getSession();
-		if (session == null) {
-			log.info("No http Session found.");
-			return Constants.STRUTS_ERROR;
-		}
-		
-		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
-		
-		authUser = (AuthenticatedUser) authUserObj;
-		
-		long oaid = -1;
-		
-		if (!ValidationHelper.validateOAID(oaidobj)) {
-			addActionError(LanguageHelper.getErrorString("errors.edit.oa.oaid", request));
-			return Constants.STRUTS_ERROR;
-		}
-		oaid = Long.valueOf(oaidobj);
-		
-		UserDatabase userdb = null;
-		OnlineApplication onlineapplication = null;
-		
-		if (authUser.isAdmin())
-			onlineapplication = ConfigurationDBRead.getOnlineApplication(oaid);
-		
-		else {
-			userdb = ConfigurationDBRead.getUserWithID(authUser.getUserID());
-			
-			if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) {
-				log.info("Online-Applikation managemant disabled. Mail address is not verified.");
-				addActionError(LanguageHelper.getErrorString("error.editoa.mailverification"));
-				return Constants.STRUTS_SUCCESS;
-			}
-			
-			// TODO: change to direct Database operation
-			List<OnlineApplication> oas = userdb.getOnlineApplication();
-			for (OnlineApplication oa : oas) {
-				if (oa.getHjid() == oaid) {
-					onlineapplication = oa;
-					break;
-				}
-			}
-			if (onlineapplication == null) {
-				addActionError(LanguageHelper.getErrorString("errors.edit.oa.oaid", request));
-				return Constants.STRUTS_ERROR;
-			}
-		}
-		
-		generalOA.parse(onlineapplication);
-		ssoOA.parse(onlineapplication);
-		saml1OA.parse(onlineapplication);
-		oauth20OA.parse(onlineapplication);
-		session.setAttribute(Constants.SESSION_OAUTH20SECRET, this.oauth20OA.getClientSecret());
-
-		storkOA.parse(onlineapplication);
-		
-		Map<String, String> map = new HashMap<String, String>();
-		map.putAll(FormBuildUtils.getDefaultMap());
-		formOA.parse(onlineapplication, map);
-		
-		session.setAttribute(Constants.SESSION_BKUFORMPREVIEW, map);
-		
-		List<String> errors = pvp2OA.parse(onlineapplication);
-		
-		if (errors.size() > 0) {
-			for (String el : errors)
-				addActionError(el);
-		}
-		
-		subTargetSet = MiscUtil.isNotEmpty(generalOA.getTarget_subsector());
-		
-		// set UserSpezific OA Parameters
-		if (!authUser.isAdmin()) generateUserSpecificConfigurationOptions(userdb);
-		
-		ConfigurationDBUtils.closeSession();
-		session.setAttribute(Constants.SESSION_OAID, oaid);
-		
-		formID = Random.nextRandom();
-		session.setAttribute(Constants.SESSION_FORMID, formID);
-		
-		newOA = false;
-		
-		return Constants.STRUTS_OA_EDIT;
-	}
-	
-	public String newOA() {
-		log.debug("insert new Online-Application");
-		
-		HttpSession session = request.getSession();
-		if (session == null) {
-			log.info("No http Session found.");
-			return Constants.STRUTS_ERROR;
-		}
-		
-		session.setAttribute(Constants.SESSION_OAID, null);
-		nextPage = Constants.STRUTS_RETURNAREA_VALUES.main.name();
-		
-		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
-		
-		authUser = (AuthenticatedUser) authUserObj;
-		
-		UserDatabase userdb = ConfigurationDBRead.getUserWithID(authUser.getUserID());
-		
-		if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) {
-			log.info("Online-Applikation managemant disabled. Mail address is not verified.");
-			addActionError(LanguageHelper.getErrorString("error.editoa.mailverification"));
-			return Constants.STRUTS_SUCCESS;
-		}
-		
-		MOAIDConfiguration moaidconfig = ConfigurationDBRead.getMOAIDConfiguration();
-		if (moaidconfig != null) {
-			DefaultBKUs defaultbkus = moaidconfig.getDefaultBKUs();
-			if (defaultbkus != null) {
-				generalOA.setBkuHandyURL(defaultbkus.getHandyBKU());
-				generalOA.setBkuLocalURL(defaultbkus.getLocalBKU());
-				generalOA.setBkuOnlineURL(defaultbkus.getOnlineBKU());
-			}
-		}
-		
-		// set UserSpezific OA Parameters
-		if (!authUser.isAdmin()) generateUserSpecificConfigurationOptions(userdb);
-		
-		ConfigurationDBUtils.closeSession();
-		
-		newOA = true;
-		formID = Random.nextRandom();
-		session.setAttribute(Constants.SESSION_FORMID, formID);
-		
-		session.setAttribute(Constants.SESSION_BKUFORMPREVIEW, null);
-		
-		this.oauth20OA.generateClientSecret();
-		session.setAttribute(Constants.SESSION_OAUTH20SECRET, this.oauth20OA.getClientSecret());
-		
-		return Constants.STRUTS_OA_EDIT;
-	}
-	
-	public String saveOA() {
-		HttpSession session = request.getSession();
-		if (session == null) {
-			log.info("No http Session found.");
-			return Constants.STRUTS_ERROR;
-		}
-		
-		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
-		authUser = (AuthenticatedUser) authUserObj;
-		
-		Object formidobj = session.getAttribute(Constants.SESSION_FORMID);
-		if (formidobj != null && formidobj instanceof String) {
-			String formid = (String) formidobj;
-			if (!formid.equals(formID)) {
-				log.warn("FormIDs does not match. Some suspect Form is received from user " + authUser.getFamilyName()
-						+ authUser.getGivenName() + authUser.getUserID());
-				return Constants.STRUTS_ERROR;
-			}
-		} else {
-			log.warn("FormIDs does not match. Some suspect Form is received from user " + authUser.getFamilyName()
-					+ authUser.getGivenName() + authUser.getUserID());
-			return Constants.STRUTS_ERROR;
-		}
-		session.setAttribute(Constants.SESSION_FORMID, null);
-		
-		UserDatabase userdb = ConfigurationDBRead.getUserWithID(authUser.getUserID());
-		if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) {
-			log.info("Online-Applikation managemant disabled. Mail address is not verified.");
-			addActionError(LanguageHelper.getErrorString("error.editoa.mailverification"));
-			return Constants.STRUTS_SUCCESS;
-		}
-		
-		OnlineApplication onlineapplication = null;
-		List<String> errors = new ArrayList<String>();
-		
-		Object oadbid = request.getSession().getAttribute(Constants.SESSION_OAID);
-		Long oaid = (long) -1;
-		
-		if (oadbid != null) {
-			try {
-				oaid = (Long) oadbid;
-				if (oaid < 0 || oaid > Long.MAX_VALUE) {
-					addActionError(LanguageHelper.getErrorString("errors.edit.oa.oaid", request));
-					return Constants.STRUTS_ERROR;
-				}
-				
-			}
-			catch (Throwable t) {
-				addActionError(LanguageHelper.getErrorString("errors.edit.oa.oaid", request));
-				return Constants.STRUTS_ERROR;
-			}
-		}
-		
-		// valid DBID and check entry
-		String oaidentifier = generalOA.getIdentifier();
-		if (MiscUtil.isEmpty(oaidentifier)) {
-			log.info("Empty OA identifier");
-			errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.empty"));
-			
-		} else {
-			
-			if (!ValidationHelper.validateURL(oaidentifier)) {
-				log.warn("OnlineapplikationIdentifier is not a valid URL: " + oaidentifier);
-				errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.valid",
-						new Object[] { ValidationHelper.getNotValidOAIdentifierCharacters() }));
-			} else {
-				
-				if (oaid == -1) {
-					onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier);
-					newOA = true;
-					if (onlineapplication != null) {
-						log.info("The OAIdentifier is not unique");
-						errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.notunique"));
-					}
-					
-				} else {
-					onlineapplication = ConfigurationDBRead.getOnlineApplication(oaid);
-					if (!oaidentifier.equals(onlineapplication.getPublicURLPrefix())) {
-						
-						if (ConfigurationDBRead.getOnlineApplication(oaidentifier) != null) {
-							log.info("The OAIdentifier is not unique");
-							errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.notunique"));
-						}
-					}
-				}
-			}
-		}
-		
-		// set UserSpezific OA Parameters
-		if (!authUser.isAdmin()) generateUserSpecificConfigurationOptions(userdb);
-		
-		// check form
-		OAGeneralConfigValidation validatior_general = new OAGeneralConfigValidation();
-		OAPVP2ConfigValidation validatior_pvp2 = new OAPVP2ConfigValidation();
-		OASAML1ConfigValidation validatior_saml1 = new OASAML1ConfigValidation();
-		OASSOConfigValidation validatior_sso = new OASSOConfigValidation();
-		OASTORKConfigValidation validator_stork = new OASTORKConfigValidation();
-		FormularCustomizationValitator validator_form = new FormularCustomizationValitator();
-		OAOAUTH20ConfigValidation validatior_oauth20 = new OAOAUTH20ConfigValidation();
-		OAFileUploadValidation valiator_fileUpload = new OAFileUploadValidation();
-		
-		errors.addAll(validatior_general.validate(generalOA, authUser.isAdmin()));
-		errors.addAll(validatior_pvp2.validate(pvp2OA));
-		errors.addAll(validatior_saml1.validate(saml1OA, generalOA));
-		errors.addAll(validatior_sso.validate(ssoOA, authUser.isAdmin()));
-		errors.addAll(validator_stork.validate(storkOA));
-		errors.addAll(validator_form.validate(formOA));
-		errors.addAll(validatior_oauth20.validate(oauth20OA));
-		
-		//validate BKU-selection template		
-		List<String> templateError = valiator_fileUpload.validate(generalOA.getBkuSelectionFileUploadFileName()
-				, generalOA.getBkuSelectionFileUpload(), "validation.general.bkuselection", bkuSelectionForm);
-		if (templateError != null && templateError.size() == 0) {
-			if (bkuSelectionForm != null && bkuSelectionForm.size() > 0)
-				session.setAttribute(Constants.SESSION_BKUSELECTIONTEMPLATE, bkuSelectionForm);
-			
-			else
-				bkuSelectionForm = (Map<String, byte[]>) session.getAttribute(Constants.SESSION_BKUSELECTIONTEMPLATE);
-
-		} else {
-			errors.addAll(templateError);
-			
-		}
-		
-		//validate send-assertion template
-		templateError = valiator_fileUpload.validate(generalOA.getSendAssertionFileUploadFileName()
-				, generalOA.getSendAssertionFileUpload(), "validation.general.sendassertion", sendAssertionForm);
-		if (templateError != null && templateError.size() == 0) {			
-			if (sendAssertionForm != null && sendAssertionForm.size() > 0)
-				session.setAttribute(Constants.SESSION_SENDASSERTIONTEMPLATE, sendAssertionForm);
-			
-			else
-				sendAssertionForm = (Map<String, byte[]>) session.getAttribute(Constants.SESSION_SENDASSERTIONTEMPLATE);
-
-		} else {
-			errors.addAll(templateError);
-			
-		}
-		
-		
-		// Do not allow SSO in combination with special BKUSelection features
-		if (ssoOA.isUseSSO() && (formOA.isOnlyMandateAllowed() || !formOA.isShowMandateLoginButton())) {
-			log.warn("Special BKUSelection features can not be used in combination with SSO");
-			errors.add(LanguageHelper.getErrorString("validation.general.bkuselection.specialfeatures.valid"));
-		}
-		
-		if (errors.size() > 0) {
-			log.info("OAConfiguration with ID " + generalOA.getIdentifier() + " has some errors.");
-			for (String el : errors)
-				addActionError(el);
-			
-			formID = Random.nextRandom();
-			session.setAttribute(Constants.SESSION_FORMID, formID);
-			return Constants.STRUTS_ERROR_VALIDATION;
-			
-		} else {
-			
-			boolean newentry = false;
-			
-			if (onlineapplication == null) {
-				onlineapplication = new OnlineApplication();
-				newentry = true;
-				onlineapplication.setIsActive(false);
-				
-				if (!authUser.isAdmin()) {
-					onlineapplication.setIsAdminRequired(true);
-					
-				} else
-					isMetaDataRefreshRequired = true;
-				
-			} else {
-				if (!authUser.isAdmin() && !onlineapplication.getPublicURLPrefix().equals(generalOA.getIdentifier())) {
-					
-					onlineapplication.setIsAdminRequired(true);
-					onlineapplication.setIsActive(false);
-					log.info("User with ID " + authUser.getUserID() + " change OA-PublicURLPrefix. Reaktivation is required.");
-				}
-				
-			}
-			
-			if ((onlineapplication.isIsAdminRequired() == null)
-					|| (authUser.isAdmin() && generalOA.isActive() && onlineapplication.isIsAdminRequired())) {
-				
-				onlineapplication.setIsAdminRequired(false);
-				isMetaDataRefreshRequired = true;
-				
-				if (onlineapplication.getHjid() != null) userdb = ConfigurationDBRead.getUsersWithOADBID(onlineapplication.getHjid());
-				
-				if (userdb != null && !userdb.isIsAdmin()) {
-					try {
-						MailHelper.sendUserOnlineApplicationActivationMail(userdb.getGivenname(), userdb.getFamilyname(),
-								userdb.getInstitut(), onlineapplication.getPublicURLPrefix(), userdb.getMail());
-					}
-					catch (ConfigurationException e) {
-						log.warn("Sending Mail to User " + userdb.getMail() + " failed", e);
-					}
-				}
-			}
-
-			//save OA configuration
-			String error = saveOAConfigToDatabase(onlineapplication, newentry);
-			if (MiscUtil.isNotEmpty(error)) {
-				log.warn("OA configuration can not be stored!");
-				addActionError(error);
-				
-				formID = Random.nextRandom();
-				session.setAttribute(Constants.SESSION_FORMID, formID);
-				return Constants.STRUTS_ERROR_VALIDATION;
-			}
-			
-			//set metadata reload flag if reload is required 
-			if (pvp2OA.getMetaDataURL() != null) {
-				
-				try {
-					if (isMetaDataRefreshRequired
-							|| !pvp2OA.getMetaDataURL().equals(onlineapplication.getAuthComponentOA().getOAPVP2().getMetadataURL())
-							|| pvp2OA.getFileUpload() != null
-							|| pvp2OA.isReLoad()) {
-						
-						log.debug("Set PVP2 Metadata refresh flag.");
-						MOAIDConfiguration moaconfig = ConfigurationDBRead.getMOAIDConfiguration();
-						moaconfig.setPvp2RefreshItem(new Date());
-						ConfigurationDBUtils.saveOrUpdate(moaconfig);
-						
-					}
-				}
-				catch (Throwable e) {
-					log.info("Found no MetadataURL in OA-Databaseconfig!", e);
-				}
-				
-			}
-		}
-		
-		Object nextPageAttr = session.getAttribute(Constants.SESSION_RETURNAREA);
-		if (nextPageAttr != null && nextPageAttr instanceof String) {
-			nextPage = (String) nextPageAttr;
-			session.setAttribute(Constants.SESSION_RETURNAREA, null);
-			
-		} else {
-			nextPage = Constants.STRUTS_RETURNAREA_VALUES.main.name();
-		}
-		
-		if (onlineapplication.isIsAdminRequired()) {
-			int numoas = 0;
-			int numusers = 0;
-			
-			List<OnlineApplication> openOAs = ConfigurationDBRead.getAllNewOnlineApplications();
-			if (openOAs != null) numoas = openOAs.size();
-			
-			List<UserDatabase> openUsers = ConfigurationDBRead.getAllNewUsers();
-			if (openUsers != null) numusers = openUsers.size();
-			try {
-				
-				addActionMessage(LanguageHelper.getGUIString("webpages.oaconfig.success.admin", generalOA.getIdentifier(), request));
-				
-				if (numusers > 0 || numoas > 0) MailHelper.sendAdminMail(numoas, numusers);
-				
-			}
-			catch (ConfigurationException e) {
-				log.warn("Sending Mail to Admin failed.", e);
-			}
-			
-		} else
-			addActionMessage(LanguageHelper.getGUIString("webpages.oaconfig.success", generalOA.getIdentifier(), request));
-		
-		//remove session attributes
-		session.setAttribute(Constants.SESSION_OAID, null);
-		session.removeAttribute(Constants.SESSION_BKUSELECTIONTEMPLATE);
-		session.removeAttribute(Constants.SESSION_SENDASSERTIONTEMPLATE);
-		
-		ConfigurationDBUtils.closeSession();
-		return Constants.STRUTS_SUCCESS;
-	}
-	
-	public String cancleAndBackOA() {
-		
-		HttpSession session = request.getSession();
-		if (session == null) {
-			log.info("No http Session found.");
-			return Constants.STRUTS_ERROR;
-		}
-		
-		Object nextPageAttr = session.getAttribute(Constants.SESSION_RETURNAREA);
-		if (nextPageAttr != null && nextPageAttr instanceof String) {
-			nextPage = (String) nextPageAttr;
-			session.setAttribute(Constants.SESSION_RETURNAREA, null);
-			
-		} else {
-			nextPage = Constants.STRUTS_RETURNAREA_VALUES.main.name();
-		}
-		
-		session.setAttribute(Constants.SESSION_OAID, null);
-		
-		addActionMessage(LanguageHelper.getGUIString("webpages.oaconfig.cancle", generalOA.getIdentifier(), request));
-		
-		ConfigurationDBUtils.closeSession();
-		
-		return Constants.STRUTS_SUCCESS;
-	}
-	
-	public String deleteOA() {
-		HttpSession session = request.getSession();
-		if (session == null) {
-			log.info("No http Session found.");
-			return Constants.STRUTS_ERROR;
-		}
-		
-		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
-		authUser = (AuthenticatedUser) authUserObj;
-		
-		Object formidobj = session.getAttribute(Constants.SESSION_FORMID);
-		if (formidobj != null && formidobj instanceof String) {
-			String formid = (String) formidobj;
-			if (!formid.equals(formID)) {
-				log.warn("FormIDs does not match. Some suspect Form is received from user " + authUser.getFamilyName()
-						+ authUser.getGivenName() + authUser.getUserID());
-				return Constants.STRUTS_ERROR;
-			}
-		} else {
-			log.warn("FormIDs does not match. Some suspect Form is received from user " + authUser.getFamilyName()
-					+ authUser.getGivenName() + authUser.getUserID());
-			return Constants.STRUTS_ERROR;
-		}
-		session.setAttribute(Constants.SESSION_FORMID, null);
-		
-		Object nextPageAttr = session.getAttribute(Constants.SESSION_RETURNAREA);
-		if (nextPageAttr != null && nextPageAttr instanceof String) {
-			nextPage = (String) nextPageAttr;
-			
-		} else {
-			nextPage = Constants.STRUTS_RETURNAREA_VALUES.main.name();
-		}
-		
-		UserDatabase userdb = ConfigurationDBRead.getUserWithID(authUser.getUserID());
-		if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) {
-			log.info("Online-Applikation managemant disabled. Mail address is not verified.");
-			addActionError(LanguageHelper.getErrorString("error.editoa.mailverification"));
-			return Constants.STRUTS_SUCCESS;
-		}
-		
-		String oaidentifier = generalOA.getIdentifier();
-		if (MiscUtil.isEmpty(oaidentifier)) {
-			log.info("Empty OA identifier");
-			addActionError(LanguageHelper.getErrorString("validation.general.oaidentifier.empty"));
-			
-			formID = Random.nextRandom();
-			session.setAttribute(Constants.SESSION_FORMID, formID);
-			return Constants.STRUTS_ERROR_VALIDATION;
-			
-		} else {
-			if (ValidationHelper.isValidOAIdentifier(oaidentifier)) {
-				log.warn("IdentificationNumber contains potentail XSS characters: " + oaidentifier);
-				addActionError(LanguageHelper.getErrorString("validation.general.oaidentifier.valid",
-						new Object[] { ValidationHelper.getNotValidOAIdentifierCharacters() }));
-				
-				formID = Random.nextRandom();
-				session.setAttribute(Constants.SESSION_FORMID, formID);
-				return Constants.STRUTS_ERROR_VALIDATION;
-			}
-		}
-		
-		OnlineApplication onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier);
-		request.getSession().setAttribute(Constants.SESSION_OAID, null);
-		
-		try {
-			if (MiscUtil.isNotEmpty(onlineapplication.getAuthComponentOA().getOAPVP2().getMetadataURL())) {
-				
-				MOAIDConfiguration moaconfig = ConfigurationDBRead.getMOAIDConfiguration();
-				moaconfig.setPvp2RefreshItem(new Date());
-				ConfigurationDBUtils.saveOrUpdate(moaconfig);
-				
-			}
-		}
-		catch (Throwable e) {
-			log.info("Found no MetadataURL in OA-Databaseconfig!", e);
-		}
-		
-		if (ConfigurationDBUtils.delete(onlineapplication)) {
-			
-			if (!authUser.isAdmin()) {
-				UserDatabase user = ConfigurationDBRead.getUserWithID(authUser.getUserID());
-				List<OnlineApplication> useroas = user.getOnlineApplication();
-				
-				for (OnlineApplicationType oa : useroas) {
-					if (oa.getHjid().equals(onlineapplication.getHjid())) {
-						useroas.remove(oa);
-					}
-				}
-				
-				try {
-					ConfigurationDBUtils.saveOrUpdate(user);
-					
-				}
-				catch (MOADatabaseException e) {
-					log.warn("User information can not be updated in database", e);
-					addActionError(LanguageHelper.getGUIString("error.db.oa.store", request));
-					return Constants.STRUTS_ERROR;
-				}
-			}
-			
-			ConfigurationDBUtils.closeSession();
-			
-			addActionMessage(LanguageHelper.getGUIString("webpages.oaconfig.delete.message", generalOA.getIdentifier(), request));
-			
-			return Constants.STRUTS_SUCCESS;
-			
-		} else {
-			ConfigurationDBUtils.closeSession();
-			addActionError(LanguageHelper.getGUIString("webpages.oaconfig.delete.error", generalOA.getIdentifier(), request));
-			return Constants.STRUTS_SUCCESS;
-		}
-		
-	}
-	
-	public String bkuFramePreview() {
-		
-		String preview = null;
-		
-		HttpSession session = request.getSession();
-		if (session == null) {
-			log.info("No http Session found.");
-			preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible");
-			
-		} else {
-			InputStream input = null;
-			
-			try {
-				Object mapobj = session.getAttribute(Constants.SESSION_BKUFORMPREVIEW);
-				if (mapobj != null && mapobj instanceof Map<?, ?>) {
-					
-					ConfigurationProvider config = ConfigurationProvider.getInstance();
-					String templateURL = config.getConfigRootDir() + ConfigurationProvider.HTMLTEMPLATE_DIR
-							+ ConfigurationProvider.HTMLTEMPLATE_FILE;
-					
-					File file = new File(templateURL);
-					input = new FileInputStream(file);
-					
-					String contextpath = config.getMOAIDInstanceURL();
-					if (MiscUtil.isEmpty(contextpath)) {
-						log.info("NO MOA-ID instance URL configurated.");
-						throw new ConfigurationException("No MOA-ID instance configurated");
-					}
-					
-					preview = LoginFormBuilder.getTemplate(input);
-					preview = preview.replace(LoginFormBuilder.CONTEXTPATH, contextpath);
-					
-					Map<String, String> map = (Map<String, String>) mapobj;
-					
-					request.setCharacterEncoding("UTF-8");
-					
-					String module = request.getParameter(Constants.REQUEST_FORMCUSTOM_MODULE);
-					String value = request.getParameter(Constants.REQUEST_FORMCUSTOM_VALUE);
-					
-					if (value != null) {
-						String[] query = URLDecoder.decode(request.getQueryString()).split("&");
-						value = query[1].substring("value=".length());
-					}
-					
-					synchronized (map) {
-						
-						if (MiscUtil.isNotEmpty(module)) {
-							if (map.containsKey("#" + module + "#")) {
-								if (MiscUtil.isNotEmpty(value)) {
-									if (FormBuildUtils.FONTFAMILY.contains(module) || FormBuildUtils.HEADER_TEXT.contains(module)
-											|| value.startsWith("#"))
-										map.put("#" + module + "#", value);
-									else
-										map.put("#" + module + "#", "#" + value);
-									
-								} else {
-									map.put("#" + module + "#", FormBuildUtils.getDefaultMap().get("#" + module + "#"));
-								}
-							}
-						}
-						preview = FormBuildUtils.customiceLayoutBKUSelection(preview, true, false, map, true);
-					}
-					
-				} else {
-					preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible");
-					
-				}
-				
-			}
-			catch (Exception e) {
-				log.warn("BKUSelection Preview can not be generated.", e);
-				preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible");
-				
-			}
-		}
-		
-		stream = new ByteArrayInputStream(preview.getBytes());
-		
-		return Constants.STRUTS_SUCCESS;
-	}
-	
-	private String saveOAConfigToDatabase(OnlineApplication dboa, boolean newentry) {
-		
-		AuthComponentOA authoa = dboa.getAuthComponentOA();
-		if (authoa == null) {
-			authoa = new AuthComponentOA();
-			dboa.setAuthComponentOA(authoa);
-		}
-		
-		if (authUser.isAdmin()) dboa.setIsActive(generalOA.isActive());
-		
-		dboa.setFriendlyName(generalOA.getFriendlyName());
-		dboa.setCalculateHPI(generalOA.isCalculateHPI());
-		dboa.setRemoveBPKFromAuthBlock(generalOA.isHideBPKAuthBlock());
-		
-		if (authUser.isAdmin())
-			dboa.setKeyBoxIdentifier(MOAKeyBoxSelector.fromValue(generalOA.getKeyBoxIdentifier()));
-		else {
-			if (newentry) dboa.setKeyBoxIdentifier(MOAKeyBoxSelector.SECURE_SIGNATURE_KEYPAIR);
-		}
-		
-		dboa.setPublicURLPrefix(generalOA.getIdentifier());
-		
-		if (generalOA.isBusinessService() || onlyBusinessService) {
-			
-			dboa.setType(Constants.MOA_CONFIG_BUSINESSSERVICE);
-			
-			String num = generalOA.getIdentificationNumber().replaceAll(" ", "");
-			if (num.startsWith(Constants.IDENIFICATIONTYPE_FN)) {
-				num = num.substring(Constants.IDENIFICATIONTYPE_FN.length());
-				
-				num = at.gv.egovernment.moa.util.StringUtils.deleteLeadingZeros(num);
-				
-				// num = StringUtils.leftPad(num, 7, '0');
-			}
-			
-			if (num.startsWith(Constants.IDENIFICATIONTYPE_ZVR)) num = num.substring(Constants.IDENIFICATIONTYPE_ZVR.length());
-			
-			if (num.startsWith(Constants.IDENIFICATIONTYPE_ERSB)) num = num.substring(Constants.IDENIFICATIONTYPE_ERSB.length());
-			
-			IdentificationNumber idnumber = new IdentificationNumber();
-			idnumber.setValue(Constants.PREFIX_WPBK + generalOA.getIdentificationType() + "+" + num);
-			idnumber.setType(Constants.BUSINESSSERVICENAMES.get(generalOA.getIdentificationType()));
-			
-			authoa.setIdentificationNumber(idnumber);
-			
-		} else {
-			dboa.setType(null);
-			
-			if (authUser.isAdmin()) {
-				if (MiscUtil.isNotEmpty(generalOA.getTarget_admin()) && generalOA.isAdminTarget()) {
-					dboa.setTarget(generalOA.getTarget_admin());
-					dboa.setTargetFriendlyName(generalOA.getTargetFriendlyName());
-					
-				} else {
-					
-					String target = generalOA.getTarget();
-					
-					if (MiscUtil.isNotEmpty(generalOA.getTarget_subsector()) && subTargetSet)
-						dboa.setTarget(target + "-" + generalOA.getTarget_subsector());
-					else
-						dboa.setTarget(target);
-					
-					String targetname = TargetValidator.getTargetFriendlyName(target);
-					if (MiscUtil.isNotEmpty(targetname)) dboa.setTargetFriendlyName(targetname);
-					
-				}
-				
-			} else {
-				
-				if (MiscUtil.isNotEmpty(generalOA.getTarget())) {
-					
-					String target = generalOA.getTarget();
-					
-					if (MiscUtil.isNotEmpty(generalOA.getTarget_subsector()) && subTargetSet)
-						dboa.setTarget(target + "-" + generalOA.getTarget_subsector());
-					
-					else
-						dboa.setTarget(target);
-					
-					String targetname = TargetValidator.getTargetFriendlyName(target);
-					if (MiscUtil.isNotEmpty(targetname)) dboa.setTargetFriendlyName(targetname);
-					
-				}
-			}
-		}
-		
-		//store BKU-URLs
-		BKUURLS bkuruls = new BKUURLS();
-		authoa.setBKUURLS(bkuruls);
-		if (authUser.isAdmin()) {
-			bkuruls.setHandyBKU(generalOA.getBkuHandyURL());
-			bkuruls.setLocalBKU(generalOA.getBkuLocalURL());
-			bkuruls.setOnlineBKU(generalOA.getBkuOnlineURL());
-		}
-		
-		TemplatesType templates = authoa.getTemplates();
-		if (templates == null) {
-			templates = new TemplatesType();
-			authoa.setTemplates(templates);
-		}
-		
-		//store BKU-selection and send-assertion templates
-		if (authUser.isAdmin()) {
-			
-			if(generalOA.isDeleteBKUTemplate())
-				templates.setBKUSelectionTemplate(null);
-			
-			if (generalOA.isDeleteSendAssertionTemplate())
-				templates.setSendAssertionTemplate(null);
-			
-			
-			if (bkuSelectionForm != null && bkuSelectionForm.size() > 0) {
-				TransformsInfoType template = new TransformsInfoType();
-				
-				Iterator<String> interator = bkuSelectionForm.keySet().iterator();
-				template.setFilename(interator.next());
-				template.setTransformation(bkuSelectionForm.get(
-						template.getFilename()));
-				
-				templates.setBKUSelectionTemplate(template);					
-			}
-			
-			if (sendAssertionForm != null && sendAssertionForm.size() > 0) {
-				TransformsInfoType template = new TransformsInfoType();
-				
-				Iterator<String> interator = sendAssertionForm.keySet().iterator();
-				template.setFilename(interator.next());
-				template.setTransformation(sendAssertionForm.get(
-						template.getFilename()));
-				
-				templates.setSendAssertionTemplate(template);					
-			}	
-		}
-		
-		
-		//store BKU-selection customization
-		BKUSelectionCustomizationType bkuselectioncustom = templates.getBKUSelectionCustomization();
-		if (bkuselectioncustom == null) {
-			bkuselectioncustom = new BKUSelectionCustomizationType();
-			templates.setBKUSelectionCustomization(bkuselectioncustom);
-		}
-		
-		Mandates mandates = new Mandates();
-		if (generalOA.isUseMandates()) {
-			if (MiscUtil.isNotEmpty(generalOA.getMandateProfiles())) {
-				List<MandatesProfileNameItem> profileList = new ArrayList<MandatesProfileNameItem>();
-				String[] inputList = generalOA.getMandateProfiles().split(",");
-				for (int i=0; i<inputList.length; i++) {
-					
-					MandatesProfileNameItem item = new MandatesProfileNameItem();
-					item.setItem(inputList[i]);
-					profileList.add(item);
-				}
-				mandates.setProfileNameItems(profileList );
-				mandates.setProfiles(null);
-			}
-			
-			
-		} else {
-			mandates.setProfiles(null);
-			mandates.setProfileNameItems(null);
-		}
-		
-		authoa.setMandates(mandates);
-		bkuselectioncustom.setMandateLoginButton(MiscUtil.isNotEmpty(generalOA.getMandateProfiles()));
-		bkuselectioncustom.setOnlyMandateLoginAllowed(formOA.isOnlyMandateAllowed());
-		
-		if (authUser.isAdmin()) {
-			templates.setAditionalAuthBlockText(StringHelper.getUTF8String(
-					generalOA.getAditionalAuthBlockText()));
-			
-			List<TemplateType> template = templates.getTemplate();
-			if (generalOA.isLegacy()) {
-				
-				if (template == null)
-					template = new ArrayList<TemplateType>();
-				else
-					template.clear();
-				
-				if (MiscUtil.isNotEmpty(generalOA.getSLTemplateURL1())) {
-					TemplateType el = new TemplateType();
-					el.setURL(generalOA.getSLTemplateURL1());
-					template.add(el);
-				} else
-					template.add(new TemplateType());				
-				if (MiscUtil.isNotEmpty(generalOA.getSLTemplateURL2())) {
-					TemplateType el = new TemplateType();
-					el.setURL(generalOA.getSLTemplateURL2());
-					template.add(el);
-				}else
-					template.add(new TemplateType());
-				if (MiscUtil.isNotEmpty(generalOA.getSLTemplateURL3())) {
-					TemplateType el = new TemplateType();
-					el.setURL(generalOA.getSLTemplateURL3());
-					template.add(el);
-				}else
-					template.add(new TemplateType());
-				
-			} else {
-				if (template != null && template.size() > 0) template.clear();
-			}
-			
-			bkuselectioncustom.setBackGroundColor(parseColor(formOA.getBackGroundColor()));
-			bkuselectioncustom.setFrontColor(parseColor(formOA.getFrontColor()));
-			
-			bkuselectioncustom.setHeaderBackGroundColor(parseColor(formOA.getHeader_BackGroundColor()));
-			bkuselectioncustom.setHeaderFrontColor(parseColor(formOA.getHeader_FrontColor()));
-			bkuselectioncustom.setHeaderText(formOA.getHeader_text());
-			
-			bkuselectioncustom.setButtonBackGroundColor(parseColor(formOA.getButton_BackGroundColor()));
-			bkuselectioncustom.setButtonBackGroundColorFocus(parseColor(formOA.getButton_BackGroundColorFocus()));
-			bkuselectioncustom.setButtonFontColor(parseColor(formOA.getButton_FrontColor()));
-			
-			if (MiscUtil.isNotEmpty(formOA.getAppletRedirectTarget()))
-				bkuselectioncustom.setAppletRedirectTarget(formOA.getAppletRedirectTarget());
-			
-			bkuselectioncustom.setFontType(formOA.getFontType());
-			
-			bkuselectioncustom.setAppletHeight(formOA.getApplet_height());
-			bkuselectioncustom.setAppletWidth(formOA.getApplet_width());
-			
-		}
-		
-		// set default transformation if it is empty
-		List<TransformsInfoType> transformsInfo = authoa.getTransformsInfo();
-		if (transformsInfo == null) {
-			// TODO: set OA specific transformation if it is required
-			
-		}
-		
-		OAPVP2 pvp2 = authoa.getOAPVP2();
-		if (pvp2 == null) {
-			pvp2 = new OAPVP2();
-			authoa.setOAPVP2(pvp2);
-		}
-		
-		pvp2.setMetadataURL(pvp2OA.getMetaDataURL());
-		try {
-			
-			if (pvp2OA.getFileUpload() != null) pvp2.setCertificate(pvp2OA.getCertificate());
-			
-		}
-		catch (CertificateException e) {
-			log.info("Uploaded Certificate can not be found", e);
-			return LanguageHelper.getErrorString("validation.pvp2.certificate.notfound");
-		}
-		catch (IOException e) {
-			log.info("Uploaded Certificate can not be parsed", e);
-			return LanguageHelper.getErrorString("validation.pvp2.certificate.format");
-		}
-		
-		OASAML1 saml1 = authoa.getOASAML1();
-		if (saml1 == null) {
-			saml1 = new OASAML1();
-			authoa.setOASAML1(saml1);
-			saml1.setIsActive(false);
-		}
-		
-		if (authUser.isAdmin()) {
-			saml1.setIsActive(saml1OA.isActive());
-		}
-		
-		if (saml1.isIsActive() != null && saml1.isIsActive()) {
-			saml1.setProvideAUTHBlock(saml1OA.isProvideAuthBlock());
-			saml1.setProvideCertificate(saml1OA.isProvideCertificate());
-			saml1.setProvideFullMandatorData(saml1OA.isProvideFullMandateData());
-			saml1.setProvideIdentityLink(saml1OA.isProvideIdentityLink());
-			saml1.setProvideStammzahl(saml1OA.isProvideStammZahl());
-			saml1.setUseCondition(saml1OA.isUseCondition());
-			saml1.setConditionLength(BigInteger.valueOf(saml1OA.getConditionLength()));
-			// TODO: set sourceID
-			// saml1.setSourceID("");
-		}
-		
-		OASSO sso = authoa.getOASSO();
-		if (sso == null) {
-			sso = new OASSO();
-			authoa.setOASSO(sso);
-			sso.setAuthDataFrame(true);
-		}
-		sso.setUseSSO(ssoOA.isUseSSO());
-		
-		if (authUser.isAdmin()) sso.setAuthDataFrame(ssoOA.isShowAuthDataFrame());
-		
-		sso.setSingleLogOutURL(ssoOA.getSingleLogOutURL());
-		
-		if (oauth20OA != null) {
-			log.debug("Saving OAuth 2.0 configuration:");
-			OAOAUTH20 oaOAuth20 = authoa.getOAOAUTH20();
-			if (oaOAuth20 == null) {
-				oaOAuth20 = new OAOAUTH20();
-				authoa.setOAOAUTH20(oaOAuth20);
-			}
-			
-			oaOAuth20.setOAuthClientId(generalOA.getIdentifier());
-			// oaOAuth20.setOAuthClientSecret(oauth20OA.getClientSecret());
-			oaOAuth20.setOAuthRedirectUri(oauth20OA.getRedirectUri());
-			log.debug("client id: " + oauth20OA.getClientId());
-			log.debug("client secret: " + oauth20OA.getClientSecret());
-			log.debug("redirect uri:" + oauth20OA.getRedirectUri());
-			
-			oaOAuth20.setOAuthClientSecret((String) request.getSession().getAttribute(Constants.SESSION_OAUTH20SECRET));
-			request.getSession().setAttribute(Constants.SESSION_OAUTH20SECRET, null);
-			
-		}
-		
-		
-		// fetch stork configuration from database model
-		OASTORK stork = authoa.getOASTORK();
-		if (stork == null) {
-			// if there is none, create a new one with default values.
-			stork = new OASTORK();
-			authoa.setOASTORK(stork);
-			stork.setStorkLogonEnabled(false);
-		}
-		// transfer the incoming data to the database model
-		stork.setStorkLogonEnabled(storkOA.isStorkLogonEnabled());
-		stork.setQaa(storkOA.getQaa());
-		stork.setOAAttributes(storkOA.getAttributes());
-
-		try {
-			if (newentry) {
-				ConfigurationDBUtils.save(dboa);
-				
-				if (!authUser.isAdmin()) {
-					UserDatabase user = ConfigurationDBRead.getUserWithID(authUser.getUserID());
-					
-					List<OnlineApplication> useroas = user.getOnlineApplication();
-					if (useroas == null) useroas = new ArrayList<OnlineApplication>();
-					
-					useroas.add(dboa);
-					ConfigurationDBUtils.saveOrUpdate(user);
-				}
-			}
-			
-			else
-				ConfigurationDBUtils.saveOrUpdate(dboa);
-			
-		}
-		catch (MOADatabaseException e) {
-			log.warn("Online-Application can not be stored.", e);
-			return LanguageHelper.getErrorString("error.db.oa.store");
-		}
-		
-		return null;
-	}
-	
-	private String parseColor(String color) {
-		String value = "";
-		
-		if (MiscUtil.isNotEmpty(color)) {
-			if (!color.startsWith("#"))
-				value = "#" + color;
-			else
-				value = color;
-		}
-		return value;
-	}
-	
-	private void generateUserSpecificConfigurationOptions(UserDatabase userdb) {
-		
-		if (userdb.isIsMandateUser() != null && userdb.isIsMandateUser()) {
-			String bpk = userdb.getBpk();
-			if (bpk.startsWith(Constants.IDENIFICATIONTYPE_BASEID_FN) || bpk.startsWith(Constants.IDENIFICATIONTYPE_BASEID_ZVR)) {
-				
-				onlyBusinessService = true;
-				generalOA.setBusinessService(true);
-				
-			}
-			
-			deaktivededBusinessService = true;
-			String[] split = bpk.split("\\+");
-			generalOA.setIdentificationType(split[1].substring(1));
-			
-			if (bpk.startsWith(Constants.IDENIFICATIONTYPE_BASEID_FN))
-				generalOA.setIdentificationNumber(at.gv.egovernment.moa.util.StringUtils.deleteLeadingZeros(split[2]));
-			else
-				generalOA.setIdentificationNumber(split[2]);
-			
-		}
-		
-	}
-	
-	public String setGeneralOAConfig() {
-		
-		return Constants.STRUTS_SUCCESS;
-	}
-	
-	public String setSAML1OAConfig() {
-		
-		return Constants.STRUTS_SUCCESS;
-	}
-	
-	public String setPVP2OAConfig() {
-		
-		return Constants.STRUTS_SUCCESS;
-	}
-	
-	public String setSSOOAConfig() {
-		
-		return Constants.STRUTS_SUCCESS;
-	}
-	
-	public String setSTORKOAConfig() {
-		
-		return Constants.STRUTS_SUCCESS;
-	}
-	
-	// Getter and Setter
-	public void setServletResponse(HttpServletResponse arg0) {
-		this.response = arg0;
-		
-	}
-	
-	public void setServletRequest(HttpServletRequest arg0) {
-		this.request = arg0;
-		
-	}
-	
-	public HttpServletRequest getRequest() {
-		return request;
-	}
-	
-	public void setRequest(HttpServletRequest request) {
-		this.request = request;
-	}
-	
-	public HttpServletResponse getResponse() {
-		return response;
-	}
-	
-	public void setResponse(HttpServletResponse response) {
-		this.response = response;
-	}
-	
-	public OAGeneralConfig getGeneralOA() {
-		return generalOA;
-	}
-	
-	public void setGeneralOA(OAGeneralConfig generalOA) {
-		this.generalOA = generalOA;
-	}
-	
-	public OAPVP2Config getPvp2OA() {
-		return pvp2OA;
-	}
-	
-	public void setPvp2OA(OAPVP2Config pvp2oa) {
-		pvp2OA = pvp2oa;
-	}
-	
-	public OASAML1Config getSaml1OA() {
-		return saml1OA;
-	}
-	
-	public void setSaml1OA(OASAML1Config saml1oa) {
-		saml1OA = saml1oa;
-	}
-	
-	public OASSOConfig getSsoOA() {
-		return ssoOA;
-	}
-	
-	public void setSsoOA(OASSOConfig ssoOA) {
-		this.ssoOA = ssoOA;
-	}
-	
-	public OASTORKConfig getStorkOA() {
-		return storkOA;
-	}
-	
-	public void setStorkOA(OASTORKConfig storkOA) {
-		this.storkOA = storkOA;
-	}
-	
-	/**
-	 * @param oaidobj
-	 *            the oaidobj to set
-	 */
-	public void setOaidobj(String oaidobj) {
-		this.oaidobj = oaidobj;
-	}
-	
-	/**
-	 * @return the authUser
-	 */
-	public AuthenticatedUser getAuthUser() {
-		return authUser;
-	}
-	
-	/**
-	 * @return the newOA
-	 */
-	public boolean isNewOA() {
-		return newOA;
-	}
-	
-	/**
-	 * @param newOA
-	 *            the newOA to set
-	 */
-	public void setNewOA(boolean newOA) {
-		this.newOA = newOA;
-	}
-	
-	/**
-	 * @return the nextPage
-	 */
-	public String getNextPage() {
-		return nextPage;
-	}
-	
-	/**
-	 * @return the formID
-	 */
-	public String getFormID() {
-		return formID;
-	}
-	
-	/**
-	 * @param formID
-	 *            the formID to set
-	 */
-	public void setFormID(String formID) {
-		this.formID = formID;
-	}
-	
-	/**
-	 * @return the onlyBusinessService
-	 */
-	public boolean isOnlyBusinessService() {
-		return onlyBusinessService;
-	}
-	
-	/**
-	 * @param onlyBusinessService
-	 *            the onlyBusinessService to set
-	 */
-	public void setOnlyBusinessService(boolean onlyBusinessService) {
-		this.onlyBusinessService = onlyBusinessService;
-	}
-	
-	/**
-	 * @return the subTargetSet
-	 */
-	public boolean isSubTargetSet() {
-		return subTargetSet;
-	}
-	
-	/**
-	 * @param subTargetSet
-	 *            the subTargetSet to set
-	 */
-	public void setSubTargetSet(boolean subTargetSet) {
-		this.subTargetSet = subTargetSet;
-	}
-	
-	/**
-	 * @return the deaktivededBusinessService
-	 */
-	public boolean isDeaktivededBusinessService() {
-		return deaktivededBusinessService;
-	}
-	
-	/**
-	 * @param deaktivededBusinessService
-	 *            the deaktivededBusinessService to set
-	 */
-	public void setDeaktivededBusinessService(boolean deaktivededBusinessService) {
-		this.deaktivededBusinessService = deaktivededBusinessService;
-	}
-	
-	/**
-	 * @return the formOA
-	 */
-	public FormularCustomization getFormOA() {
-		return formOA;
-	}
-	
-	/**
-	 * @param formOA
-	 *            the formOA to set
-	 */
-	public void setFormOA(FormularCustomization formOA) {
-		this.formOA = formOA;
-	}
-	
-	/**
-	 * @return the stream
-	 */
-	public InputStream getStream() {
-		return stream;
-	}
-	
-	public OAOAuth20Config getOauth20OA() {
-		return oauth20OA;
-	}
-	
-	public void setOauth20OA(OAOAuth20Config oauth20OA) {
-		this.oauth20OA = oauth20OA;
-	}
-	
+
+    private final Logger log = Logger.getLogger(EditOAAction.class);
+
+    private static final long serialVersionUID = 1L;
+
+    private HttpServletRequest request;
+    private HttpServletResponse response;
+
+    private AuthenticatedUser authUser;
+
+    private String oaidobj;
+    private boolean newOA;
+    private String formID;
+
+    private boolean onlyBusinessService = false;
+    private boolean onlyStorkService = false;
+    private boolean subTargetSet = false;
+    private boolean deaktivededBusinessService = false;
+    private boolean deactivatedStorkService = false;
+    private boolean isMetaDataRefreshRequired = false;
+
+    private String nextPage;
+
+    private OAGeneralConfig generalOA = new OAGeneralConfig();
+    private OAPVP2Config pvp2OA = new OAPVP2Config();
+    private OASAML1Config saml1OA = new OASAML1Config();
+    private OASSOConfig ssoOA = new OASSOConfig();
+    private OAOAuth20Config oauth20OA = new OAOAuth20Config();
+    private OASTORKConfig storkOA = new OASTORKConfig();
+    private FormularCustomization formOA = new FormularCustomization();
+
+    private InputStream stream;
+
+    private Map<String, byte[]> sendAssertionForm = new HashMap<String, byte[]>();
+    private Map<String, byte[]> bkuSelectionForm = new HashMap<String, byte[]>();
+
+    // STRUTS actions
+    public String inital() {
+        HttpSession session = request.getSession();
+        if (session == null) {
+            log.info("No http Session found.");
+            return Constants.STRUTS_ERROR;
+        }
+
+        Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
+
+        authUser = (AuthenticatedUser) authUserObj;
+
+        long oaid = -1;
+
+        if (!ValidationHelper.validateOAID(oaidobj)) {
+            addActionError(LanguageHelper.getErrorString("errors.edit.oa.oaid", request));
+            return Constants.STRUTS_ERROR;
+        }
+        oaid = Long.valueOf(oaidobj);
+
+        UserDatabase userdb = null;
+        OnlineApplication onlineapplication = null;
+
+        if (authUser.isAdmin())
+            onlineapplication = ConfigurationDBRead.getOnlineApplication(oaid);
+
+        else {
+            userdb = ConfigurationDBRead.getUserWithID(authUser.getUserID());
+
+            if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) {
+                log.info("Online-Applikation managemant disabled. Mail address is not verified.");
+                addActionError(LanguageHelper.getErrorString("error.editoa.mailverification"));
+                return Constants.STRUTS_SUCCESS;
+            }
+
+            // TODO: change to direct Database operation
+            List<OnlineApplication> oas = userdb.getOnlineApplication();
+            for (OnlineApplication oa : oas) {
+                if (oa.getHjid() == oaid) {
+                    onlineapplication = oa;
+                    break;
+                }
+            }
+            if (onlineapplication == null) {
+                addActionError(LanguageHelper.getErrorString("errors.edit.oa.oaid", request));
+                return Constants.STRUTS_ERROR;
+            }
+        }
+
+        generalOA.parse(onlineapplication);
+        ssoOA.parse(onlineapplication);
+        saml1OA.parse(onlineapplication);
+        oauth20OA.parse(onlineapplication);
+        session.setAttribute(Constants.SESSION_OAUTH20SECRET, this.oauth20OA.getClientSecret());
+
+        storkOA.parse(onlineapplication);
+
+        Map<String, String> map = new HashMap<String, String>();
+        map.putAll(FormBuildUtils.getDefaultMap());
+        formOA.parse(onlineapplication, map);
+
+        session.setAttribute(Constants.SESSION_BKUFORMPREVIEW, map);
+
+        List<String> errors = pvp2OA.parse(onlineapplication);
+
+        if (errors.size() > 0) {
+            for (String el : errors)
+                addActionError(el);
+        }
+
+        subTargetSet = MiscUtil.isNotEmpty(generalOA.getTarget_subsector());
+
+        // set UserSpezific OA Parameters
+        if (!authUser.isAdmin()) generateUserSpecificConfigurationOptions(userdb);
+
+        ConfigurationDBUtils.closeSession();
+        session.setAttribute(Constants.SESSION_OAID, oaid);
+
+        formID = Random.nextRandom();
+        session.setAttribute(Constants.SESSION_FORMID, formID);
+
+        newOA = false;
+
+        return Constants.STRUTS_OA_EDIT;
+    }
+
+    public String newOA() {
+        log.debug("insert new Online-Application");
+
+        HttpSession session = request.getSession();
+        if (session == null) {
+            log.info("No http Session found.");
+            return Constants.STRUTS_ERROR;
+        }
+
+        session.setAttribute(Constants.SESSION_OAID, null);
+        nextPage = Constants.STRUTS_RETURNAREA_VALUES.main.name();
+
+        Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
+
+        authUser = (AuthenticatedUser) authUserObj;
+
+        UserDatabase userdb = ConfigurationDBRead.getUserWithID(authUser.getUserID());
+
+        if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) {
+            log.info("Online-Applikation managemant disabled. Mail address is not verified.");
+            addActionError(LanguageHelper.getErrorString("error.editoa.mailverification"));
+            return Constants.STRUTS_SUCCESS;
+        }
+
+        MOAIDConfiguration moaidconfig = ConfigurationDBRead.getMOAIDConfiguration();
+        if (moaidconfig != null) {
+            DefaultBKUs defaultbkus = moaidconfig.getDefaultBKUs();
+            if (defaultbkus != null) {
+                generalOA.setBkuHandyURL(defaultbkus.getHandyBKU());
+                generalOA.setBkuLocalURL(defaultbkus.getLocalBKU());
+                generalOA.setBkuOnlineURL(defaultbkus.getOnlineBKU());
+            }
+        }
+
+        // set UserSpezific OA Parameters
+        if (!authUser.isAdmin()) generateUserSpecificConfigurationOptions(userdb);
+
+        ConfigurationDBUtils.closeSession();
+
+        newOA = true;
+        formID = Random.nextRandom();
+        session.setAttribute(Constants.SESSION_FORMID, formID);
+
+        session.setAttribute(Constants.SESSION_BKUFORMPREVIEW, null);
+
+        this.oauth20OA.generateClientSecret();
+        session.setAttribute(Constants.SESSION_OAUTH20SECRET, this.oauth20OA.getClientSecret());
+
+        return Constants.STRUTS_OA_EDIT;
+    }
+
+    public String saveOA() {
+        HttpSession session = request.getSession();
+        if (session == null) {
+            log.info("No http Session found.");
+            return Constants.STRUTS_ERROR;
+        }
+
+        Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
+        authUser = (AuthenticatedUser) authUserObj;
+
+        Object formidobj = session.getAttribute(Constants.SESSION_FORMID);
+        if (formidobj != null && formidobj instanceof String) {
+            String formid = (String) formidobj;
+            if (!formid.equals(formID)) {
+                log.warn("FormIDs does not match. Some suspect Form is received from user " + authUser.getFamilyName()
+                        + authUser.getGivenName() + authUser.getUserID());
+                return Constants.STRUTS_ERROR;
+            }
+        } else {
+            log.warn("FormIDs does not match. Some suspect Form is received from user " + authUser.getFamilyName()
+                    + authUser.getGivenName() + authUser.getUserID());
+            return Constants.STRUTS_ERROR;
+        }
+        session.setAttribute(Constants.SESSION_FORMID, null);
+
+        UserDatabase userdb = ConfigurationDBRead.getUserWithID(authUser.getUserID());
+        if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) {
+            log.info("Online-Applikation managemant disabled. Mail address is not verified.");
+            addActionError(LanguageHelper.getErrorString("error.editoa.mailverification"));
+            return Constants.STRUTS_SUCCESS;
+        }
+
+        OnlineApplication onlineapplication = null;
+        List<String> errors = new ArrayList<String>();
+
+        Object oadbid = request.getSession().getAttribute(Constants.SESSION_OAID);
+        Long oaid = (long) -1;
+
+        if (oadbid != null) {
+            try {
+                oaid = (Long) oadbid;
+                if (oaid < 0 || oaid > Long.MAX_VALUE) {
+                    addActionError(LanguageHelper.getErrorString("errors.edit.oa.oaid", request));
+                    return Constants.STRUTS_ERROR;
+                }
+
+            } catch (Throwable t) {
+                addActionError(LanguageHelper.getErrorString("errors.edit.oa.oaid", request));
+                return Constants.STRUTS_ERROR;
+            }
+        }
+
+        // valid DBID and check entry
+        String oaidentifier = generalOA.getIdentifier();
+        if (MiscUtil.isEmpty(oaidentifier)) {
+            log.info("Empty OA identifier");
+            errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.empty"));
+
+        } else {
+
+            if (!ValidationHelper.validateURL(oaidentifier)) {
+                log.warn("OnlineapplikationIdentifier is not a valid URL: " + oaidentifier);
+                errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.valid",
+                        new Object[]{ValidationHelper.getNotValidOAIdentifierCharacters()}));
+            } else {
+
+                if (oaid == -1) {
+                    onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier);
+                    newOA = true;
+                    if (onlineapplication != null) {
+                        log.info("The OAIdentifier is not unique");
+                        errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.notunique"));
+                    }
+
+                } else {
+                    onlineapplication = ConfigurationDBRead.getOnlineApplication(oaid);
+                    if (!oaidentifier.equals(onlineapplication.getPublicURLPrefix())) {
+
+                        if (ConfigurationDBRead.getOnlineApplication(oaidentifier) != null) {
+                            log.info("The OAIdentifier is not unique");
+                            errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.notunique"));
+                        }
+                    }
+                }
+            }
+        }
+
+        // set UserSpezific OA Parameters
+        if (!authUser.isAdmin()) generateUserSpecificConfigurationOptions(userdb);
+
+        // check form
+        OAGeneralConfigValidation validatior_general = new OAGeneralConfigValidation();
+        OAPVP2ConfigValidation validatior_pvp2 = new OAPVP2ConfigValidation();
+        OASAML1ConfigValidation validatior_saml1 = new OASAML1ConfigValidation();
+        OASSOConfigValidation validatior_sso = new OASSOConfigValidation();
+        OASTORKConfigValidation validator_stork = new OASTORKConfigValidation();
+        FormularCustomizationValitator validator_form = new FormularCustomizationValitator();
+        OAOAUTH20ConfigValidation validatior_oauth20 = new OAOAUTH20ConfigValidation();
+        OAFileUploadValidation valiator_fileUpload = new OAFileUploadValidation();
+
+        errors.addAll(validatior_general.validate(generalOA, authUser.isAdmin()));
+        errors.addAll(validatior_pvp2.validate(pvp2OA));
+        errors.addAll(validatior_saml1.validate(saml1OA, generalOA));
+        errors.addAll(validatior_sso.validate(ssoOA, authUser.isAdmin()));
+        errors.addAll(validator_stork.validate(storkOA));
+        errors.addAll(validator_form.validate(formOA));
+        errors.addAll(validatior_oauth20.validate(oauth20OA));
+
+        //validate BKU-selection template
+        List<String> templateError = valiator_fileUpload.validate(generalOA.getBkuSelectionFileUploadFileName()
+                , generalOA.getBkuSelectionFileUpload(), "validation.general.bkuselection", bkuSelectionForm);
+        if (templateError != null && templateError.size() == 0) {
+            if (bkuSelectionForm != null && bkuSelectionForm.size() > 0)
+                session.setAttribute(Constants.SESSION_BKUSELECTIONTEMPLATE, bkuSelectionForm);
+
+            else
+                bkuSelectionForm = (Map<String, byte[]>) session.getAttribute(Constants.SESSION_BKUSELECTIONTEMPLATE);
+
+        } else {
+            errors.addAll(templateError);
+
+        }
+
+        //validate send-assertion template
+        templateError = valiator_fileUpload.validate(generalOA.getSendAssertionFileUploadFileName()
+                , generalOA.getSendAssertionFileUpload(), "validation.general.sendassertion", sendAssertionForm);
+        if (templateError != null && templateError.size() == 0) {
+            if (sendAssertionForm != null && sendAssertionForm.size() > 0)
+                session.setAttribute(Constants.SESSION_SENDASSERTIONTEMPLATE, sendAssertionForm);
+
+            else
+                sendAssertionForm = (Map<String, byte[]>) session.getAttribute(Constants.SESSION_SENDASSERTIONTEMPLATE);
+
+        } else {
+            errors.addAll(templateError);
+
+        }
+
+
+        // Do not allow SSO in combination with special BKUSelection features
+        if (ssoOA.isUseSSO() && (formOA.isOnlyMandateAllowed() || !formOA.isShowMandateLoginButton())) {
+            log.warn("Special BKUSelection features can not be used in combination with SSO");
+            errors.add(LanguageHelper.getErrorString("validation.general.bkuselection.specialfeatures.valid"));
+        }
+
+        if (errors.size() > 0) {
+            log.info("OAConfiguration with ID " + generalOA.getIdentifier() + " has some errors.");
+            for (String el : errors)
+                addActionError(el);
+
+            formID = Random.nextRandom();
+            session.setAttribute(Constants.SESSION_FORMID, formID);
+            return Constants.STRUTS_ERROR_VALIDATION;
+
+        } else {
+
+            boolean newentry = false;
+
+            if (onlineapplication == null) {
+                onlineapplication = new OnlineApplication();
+                newentry = true;
+                onlineapplication.setIsActive(false);
+
+                if (!authUser.isAdmin()) {
+                    onlineapplication.setIsAdminRequired(true);
+
+                } else
+                    isMetaDataRefreshRequired = true;
+
+            } else {
+                if (!authUser.isAdmin() && !onlineapplication.getPublicURLPrefix().equals(generalOA.getIdentifier())) {
+
+                    onlineapplication.setIsAdminRequired(true);
+                    onlineapplication.setIsActive(false);
+                    log.info("User with ID " + authUser.getUserID() + " change OA-PublicURLPrefix. Reaktivation is required.");
+                }
+
+            }
+
+            if ((onlineapplication.isIsAdminRequired() == null)
+                    || (authUser.isAdmin() && generalOA.isActive() && onlineapplication.isIsAdminRequired())) {
+
+                onlineapplication.setIsAdminRequired(false);
+                isMetaDataRefreshRequired = true;
+
+                if (onlineapplication.getHjid() != null)
+                    userdb = ConfigurationDBRead.getUsersWithOADBID(onlineapplication.getHjid());
+
+                if (userdb != null && !userdb.isIsAdmin()) {
+                    try {
+                        MailHelper.sendUserOnlineApplicationActivationMail(userdb.getGivenname(), userdb.getFamilyname(),
+                                userdb.getInstitut(), onlineapplication.getPublicURLPrefix(), userdb.getMail());
+                    } catch (ConfigurationException e) {
+                        log.warn("Sending Mail to User " + userdb.getMail() + " failed", e);
+                    }
+                }
+            }
+
+            //save OA configuration
+            String error = saveOAConfigToDatabase(onlineapplication, newentry);
+            if (MiscUtil.isNotEmpty(error)) {
+                log.warn("OA configuration can not be stored!");
+                addActionError(error);
+
+                formID = Random.nextRandom();
+                session.setAttribute(Constants.SESSION_FORMID, formID);
+                return Constants.STRUTS_ERROR_VALIDATION;
+            }
+
+            //set metadata reload flag if reload is required
+            if (pvp2OA.getMetaDataURL() != null) {
+
+                try {
+                    if (isMetaDataRefreshRequired
+                            || !pvp2OA.getMetaDataURL().equals(onlineapplication.getAuthComponentOA().getOAPVP2().getMetadataURL())
+                            || pvp2OA.getFileUpload() != null
+                            || pvp2OA.isReLoad()) {
+
+                        log.debug("Set PVP2 Metadata refresh flag.");
+                        MOAIDConfiguration moaconfig = ConfigurationDBRead.getMOAIDConfiguration();
+                        moaconfig.setPvp2RefreshItem(new Date());
+                        ConfigurationDBUtils.saveOrUpdate(moaconfig);
+
+                    }
+                } catch (Throwable e) {
+                    log.info("Found no MetadataURL in OA-Databaseconfig!", e);
+                }
+
+            }
+        }
+
+        Object nextPageAttr = session.getAttribute(Constants.SESSION_RETURNAREA);
+        if (nextPageAttr != null && nextPageAttr instanceof String) {
+            nextPage = (String) nextPageAttr;
+            session.setAttribute(Constants.SESSION_RETURNAREA, null);
+
+        } else {
+            nextPage = Constants.STRUTS_RETURNAREA_VALUES.main.name();
+        }
+
+        if (onlineapplication.isIsAdminRequired()) {
+            int numoas = 0;
+            int numusers = 0;
+
+            List<OnlineApplication> openOAs = ConfigurationDBRead.getAllNewOnlineApplications();
+            if (openOAs != null) numoas = openOAs.size();
+
+            List<UserDatabase> openUsers = ConfigurationDBRead.getAllNewUsers();
+            if (openUsers != null) numusers = openUsers.size();
+            try {
+
+                addActionMessage(LanguageHelper.getGUIString("webpages.oaconfig.success.admin", generalOA.getIdentifier(), request));
+
+                if (numusers > 0 || numoas > 0) MailHelper.sendAdminMail(numoas, numusers);
+
+            } catch (ConfigurationException e) {
+                log.warn("Sending Mail to Admin failed.", e);
+            }
+
+        } else
+            addActionMessage(LanguageHelper.getGUIString("webpages.oaconfig.success", generalOA.getIdentifier(), request));
+
+        //remove session attributes
+        session.setAttribute(Constants.SESSION_OAID, null);
+        session.removeAttribute(Constants.SESSION_BKUSELECTIONTEMPLATE);
+        session.removeAttribute(Constants.SESSION_SENDASSERTIONTEMPLATE);
+
+        ConfigurationDBUtils.closeSession();
+        return Constants.STRUTS_SUCCESS;
+    }
+
+    public String cancleAndBackOA() {
+
+        HttpSession session = request.getSession();
+        if (session == null) {
+            log.info("No http Session found.");
+            return Constants.STRUTS_ERROR;
+        }
+
+        Object nextPageAttr = session.getAttribute(Constants.SESSION_RETURNAREA);
+        if (nextPageAttr != null && nextPageAttr instanceof String) {
+            nextPage = (String) nextPageAttr;
+            session.setAttribute(Constants.SESSION_RETURNAREA, null);
+
+        } else {
+            nextPage = Constants.STRUTS_RETURNAREA_VALUES.main.name();
+        }
+
+        session.setAttribute(Constants.SESSION_OAID, null);
+
+        addActionMessage(LanguageHelper.getGUIString("webpages.oaconfig.cancle", generalOA.getIdentifier(), request));
+
+        ConfigurationDBUtils.closeSession();
+
+        return Constants.STRUTS_SUCCESS;
+    }
+
+    public String deleteOA() {
+        HttpSession session = request.getSession();
+        if (session == null) {
+            log.info("No http Session found.");
+            return Constants.STRUTS_ERROR;
+        }
+
+        Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
+        authUser = (AuthenticatedUser) authUserObj;
+
+        Object formidobj = session.getAttribute(Constants.SESSION_FORMID);
+        if (formidobj != null && formidobj instanceof String) {
+            String formid = (String) formidobj;
+            if (!formid.equals(formID)) {
+                log.warn("FormIDs does not match. Some suspect Form is received from user " + authUser.getFamilyName()
+                        + authUser.getGivenName() + authUser.getUserID());
+                return Constants.STRUTS_ERROR;
+            }
+        } else {
+            log.warn("FormIDs does not match. Some suspect Form is received from user " + authUser.getFamilyName()
+                    + authUser.getGivenName() + authUser.getUserID());
+            return Constants.STRUTS_ERROR;
+        }
+        session.setAttribute(Constants.SESSION_FORMID, null);
+
+        Object nextPageAttr = session.getAttribute(Constants.SESSION_RETURNAREA);
+        if (nextPageAttr != null && nextPageAttr instanceof String) {
+            nextPage = (String) nextPageAttr;
+
+        } else {
+            nextPage = Constants.STRUTS_RETURNAREA_VALUES.main.name();
+        }
+
+        UserDatabase userdb = ConfigurationDBRead.getUserWithID(authUser.getUserID());
+        if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) {
+            log.info("Online-Applikation managemant disabled. Mail address is not verified.");
+            addActionError(LanguageHelper.getErrorString("error.editoa.mailverification"));
+            return Constants.STRUTS_SUCCESS;
+        }
+
+        String oaidentifier = generalOA.getIdentifier();
+        if (MiscUtil.isEmpty(oaidentifier)) {
+            log.info("Empty OA identifier");
+            addActionError(LanguageHelper.getErrorString("validation.general.oaidentifier.empty"));
+
+            formID = Random.nextRandom();
+            session.setAttribute(Constants.SESSION_FORMID, formID);
+            return Constants.STRUTS_ERROR_VALIDATION;
+
+        } else {
+            if (ValidationHelper.isValidOAIdentifier(oaidentifier)) {
+                log.warn("IdentificationNumber contains potentail XSS characters: " + oaidentifier);
+                addActionError(LanguageHelper.getErrorString("validation.general.oaidentifier.valid",
+                        new Object[]{ValidationHelper.getNotValidOAIdentifierCharacters()}));
+
+                formID = Random.nextRandom();
+                session.setAttribute(Constants.SESSION_FORMID, formID);
+                return Constants.STRUTS_ERROR_VALIDATION;
+            }
+        }
+
+        OnlineApplication onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier);
+        request.getSession().setAttribute(Constants.SESSION_OAID, null);
+
+        try {
+            if (MiscUtil.isNotEmpty(onlineapplication.getAuthComponentOA().getOAPVP2().getMetadataURL())) {
+
+                MOAIDConfiguration moaconfig = ConfigurationDBRead.getMOAIDConfiguration();
+                moaconfig.setPvp2RefreshItem(new Date());
+                ConfigurationDBUtils.saveOrUpdate(moaconfig);
+
+            }
+        } catch (Throwable e) {
+            log.info("Found no MetadataURL in OA-Databaseconfig!", e);
+        }
+
+        if (ConfigurationDBUtils.delete(onlineapplication)) {
+
+            if (!authUser.isAdmin()) {
+                UserDatabase user = ConfigurationDBRead.getUserWithID(authUser.getUserID());
+                List<OnlineApplication> useroas = user.getOnlineApplication();
+
+                for (OnlineApplicationType oa : useroas) {
+                    if (oa.getHjid().equals(onlineapplication.getHjid())) {
+                        useroas.remove(oa);
+                    }
+                }
+
+                try {
+                    ConfigurationDBUtils.saveOrUpdate(user);
+
+                } catch (MOADatabaseException e) {
+                    log.warn("User information can not be updated in database", e);
+                    addActionError(LanguageHelper.getGUIString("error.db.oa.store", request));
+                    return Constants.STRUTS_ERROR;
+                }
+            }
+
+            ConfigurationDBUtils.closeSession();
+
+            addActionMessage(LanguageHelper.getGUIString("webpages.oaconfig.delete.message", generalOA.getIdentifier(), request));
+
+            return Constants.STRUTS_SUCCESS;
+
+        } else {
+            ConfigurationDBUtils.closeSession();
+            addActionError(LanguageHelper.getGUIString("webpages.oaconfig.delete.error", generalOA.getIdentifier(), request));
+            return Constants.STRUTS_SUCCESS;
+        }
+
+    }
+
+    public String bkuFramePreview() {
+
+        String preview = null;
+
+        HttpSession session = request.getSession();
+        if (session == null) {
+            log.info("No http Session found.");
+            preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible");
+
+        } else {
+            InputStream input = null;
+
+            try {
+                Object mapobj = session.getAttribute(Constants.SESSION_BKUFORMPREVIEW);
+                if (mapobj != null && mapobj instanceof Map<?, ?>) {
+
+                    ConfigurationProvider config = ConfigurationProvider.getInstance();
+                    String templateURL = config.getConfigRootDir() + ConfigurationProvider.HTMLTEMPLATE_DIR
+                            + ConfigurationProvider.HTMLTEMPLATE_FILE;
+
+                    File file = new File(templateURL);
+                    input = new FileInputStream(file);
+
+                    String contextpath = config.getMOAIDInstanceURL();
+                    if (MiscUtil.isEmpty(contextpath)) {
+                        log.info("NO MOA-ID instance URL configurated.");
+                        throw new ConfigurationException("No MOA-ID instance configurated");
+                    }
+
+                    preview = LoginFormBuilder.getTemplate(input);
+                    preview = preview.replace(LoginFormBuilder.CONTEXTPATH, contextpath);
+
+                    Map<String, String> map = (Map<String, String>) mapobj;
+
+                    request.setCharacterEncoding("UTF-8");
+
+                    String module = request.getParameter(Constants.REQUEST_FORMCUSTOM_MODULE);
+                    String value = request.getParameter(Constants.REQUEST_FORMCUSTOM_VALUE);
+
+                    if (value != null) {
+                        String[] query = URLDecoder.decode(request.getQueryString()).split("&");
+                        value = query[1].substring("value=".length());
+                    }
+
+                    synchronized (map) {
+
+                        if (MiscUtil.isNotEmpty(module)) {
+                            if (map.containsKey("#" + module + "#")) {
+                                if (MiscUtil.isNotEmpty(value)) {
+                                    if (FormBuildUtils.FONTFAMILY.contains(module) || FormBuildUtils.HEADER_TEXT.contains(module)
+                                            || value.startsWith("#"))
+                                        map.put("#" + module + "#", value);
+                                    else
+                                        map.put("#" + module + "#", "#" + value);
+
+                                } else {
+                                    map.put("#" + module + "#", FormBuildUtils.getDefaultMap().get("#" + module + "#"));
+                                }
+                            }
+                        }
+                        preview = FormBuildUtils.customiceLayoutBKUSelection(preview, true, false, map, true);
+                    }
+
+                } else {
+                    preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible");
+
+                }
+
+            } catch (Exception e) {
+                log.warn("BKUSelection Preview can not be generated.", e);
+                preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible");
+
+            }
+        }
+
+        stream = new ByteArrayInputStream(preview.getBytes());
+
+        return Constants.STRUTS_SUCCESS;
+    }
+
+    private String saveOAConfigToDatabase(OnlineApplication dboa, boolean newentry) {
+
+        AuthComponentOA authoa = dboa.getAuthComponentOA();
+        if (authoa == null) {
+            authoa = new AuthComponentOA();
+            dboa.setAuthComponentOA(authoa);
+        }
+
+        if (authUser.isAdmin()) dboa.setIsActive(generalOA.isActive());
+
+        dboa.setFriendlyName(generalOA.getFriendlyName());
+        dboa.setCalculateHPI(generalOA.isCalculateHPI());
+        dboa.setRemoveBPKFromAuthBlock(generalOA.isHideBPKAuthBlock());
+
+        if (authUser.isAdmin())
+            dboa.setKeyBoxIdentifier(MOAKeyBoxSelector.fromValue(generalOA.getKeyBoxIdentifier()));
+        else {
+            if (newentry) dboa.setKeyBoxIdentifier(MOAKeyBoxSelector.SECURE_SIGNATURE_KEYPAIR);
+        }
+
+        dboa.setPublicURLPrefix(generalOA.getIdentifier());
+
+        if (generalOA.isStorkService() || onlyStorkService) {
+            dboa.setType(Constants.MOA_CONFIG_STORKSERVICE);
+            dboa.setStorkSPTargetCountry(generalOA.getStorkSPTargetCountry());
+
+
+            IdentificationNumber idnumber = new IdentificationNumber();
+            idnumber.setValue(Constants.PREFIX_STORK + "AT+" + generalOA.getStorkSPTargetCountry());
+            idnumber.setType(Constants.BUSINESSSERVICENAMES.get(generalOA.getIdentificationType()));
+
+            authoa.setIdentificationNumber(idnumber);
+
+        } else if (generalOA.isBusinessService() || onlyBusinessService) {
+
+            dboa.setType(Constants.MOA_CONFIG_BUSINESSSERVICE);
+
+            String num = generalOA.getIdentificationNumber().replaceAll(" ", "");
+            if (num.startsWith(Constants.IDENIFICATIONTYPE_FN)) {
+                num = num.substring(Constants.IDENIFICATIONTYPE_FN.length());
+
+                num = at.gv.egovernment.moa.util.StringUtils.deleteLeadingZeros(num);
+
+                // num = StringUtils.leftPad(num, 7, '0');
+            }
+
+            if (num.startsWith(Constants.IDENIFICATIONTYPE_ZVR))
+                num = num.substring(Constants.IDENIFICATIONTYPE_ZVR.length());
+
+            if (num.startsWith(Constants.IDENIFICATIONTYPE_ERSB))
+                num = num.substring(Constants.IDENIFICATIONTYPE_ERSB.length());
+
+            IdentificationNumber idnumber = new IdentificationNumber();
+            idnumber.setValue(Constants.PREFIX_WPBK + generalOA.getIdentificationType() + "+" + num);
+            idnumber.setType(Constants.BUSINESSSERVICENAMES.get(generalOA.getIdentificationType()));
+
+            authoa.setIdentificationNumber(idnumber);
+
+        } else {
+            dboa.setType(null);
+
+            if (authUser.isAdmin()) {
+                if (MiscUtil.isNotEmpty(generalOA.getTarget_admin()) && generalOA.isAdminTarget()) {
+                    dboa.setTarget(generalOA.getTarget_admin());
+                    dboa.setTargetFriendlyName(generalOA.getTargetFriendlyName());
+
+                } else {
+
+                    String target = generalOA.getTarget();
+
+                    if (MiscUtil.isNotEmpty(generalOA.getTarget_subsector()) && subTargetSet)
+                        dboa.setTarget(target + "-" + generalOA.getTarget_subsector());
+                    else
+                        dboa.setTarget(target);
+
+                    String targetname = TargetValidator.getTargetFriendlyName(target);
+                    if (MiscUtil.isNotEmpty(targetname)) dboa.setTargetFriendlyName(targetname);
+
+                }
+
+            } else {
+
+                if (MiscUtil.isNotEmpty(generalOA.getTarget())) {
+
+                    String target = generalOA.getTarget();
+
+                    if (MiscUtil.isNotEmpty(generalOA.getTarget_subsector()) && subTargetSet)
+                        dboa.setTarget(target + "-" + generalOA.getTarget_subsector());
+
+                    else
+                        dboa.setTarget(target);
+
+                    String targetname = TargetValidator.getTargetFriendlyName(target);
+                    if (MiscUtil.isNotEmpty(targetname)) dboa.setTargetFriendlyName(targetname);
+
+                }
+            }
+        }
+
+        //store BKU-URLs
+        BKUURLS bkuruls = new BKUURLS();
+        authoa.setBKUURLS(bkuruls);
+        if (authUser.isAdmin()) {
+            bkuruls.setHandyBKU(generalOA.getBkuHandyURL());
+            bkuruls.setLocalBKU(generalOA.getBkuLocalURL());
+            bkuruls.setOnlineBKU(generalOA.getBkuOnlineURL());
+        }
+
+        TemplatesType templates = authoa.getTemplates();
+        if (templates == null) {
+            templates = new TemplatesType();
+            authoa.setTemplates(templates);
+        }
+
+        //store BKU-selection and send-assertion templates
+        if (authUser.isAdmin()) {
+
+            if (generalOA.isDeleteBKUTemplate())
+                templates.setBKUSelectionTemplate(null);
+
+            if (generalOA.isDeleteSendAssertionTemplate())
+                templates.setSendAssertionTemplate(null);
+
+
+            if (bkuSelectionForm != null && bkuSelectionForm.size() > 0) {
+                TransformsInfoType template = new TransformsInfoType();
+
+                Iterator<String> interator = bkuSelectionForm.keySet().iterator();
+                template.setFilename(interator.next());
+                template.setTransformation(bkuSelectionForm.get(
+                        template.getFilename()));
+
+                templates.setBKUSelectionTemplate(template);
+            }
+
+            if (sendAssertionForm != null && sendAssertionForm.size() > 0) {
+                TransformsInfoType template = new TransformsInfoType();
+
+                Iterator<String> interator = sendAssertionForm.keySet().iterator();
+                template.setFilename(interator.next());
+                template.setTransformation(sendAssertionForm.get(
+                        template.getFilename()));
+
+                templates.setSendAssertionTemplate(template);
+            }
+        }
+
+
+        //store BKU-selection customization
+        BKUSelectionCustomizationType bkuselectioncustom = templates.getBKUSelectionCustomization();
+        if (bkuselectioncustom == null) {
+            bkuselectioncustom = new BKUSelectionCustomizationType();
+            templates.setBKUSelectionCustomization(bkuselectioncustom);
+        }
+
+        Mandates mandates = new Mandates();
+        if (generalOA.isUseMandates()) {
+            mandates.setProfiles(generalOA.getMandateProfiles());
+
+        } else {
+            mandates.setProfiles(new String());
+        }
+
+        authoa.setMandates(mandates);
+        bkuselectioncustom.setMandateLoginButton(MiscUtil.isNotEmpty(generalOA.getMandateProfiles()));
+        bkuselectioncustom.setOnlyMandateLoginAllowed(formOA.isOnlyMandateAllowed());
+
+        if (authUser.isAdmin()) {
+            templates.setAditionalAuthBlockText(generalOA.getAditionalAuthBlockText());
+
+            List<TemplateType> template = templates.getTemplate();
+            if (generalOA.isLegacy()) {
+
+                if (template == null)
+                    template = new ArrayList<TemplateType>();
+                else
+                    template.clear();
+
+                if (MiscUtil.isNotEmpty(generalOA.getSLTemplateURL1())) {
+                    TemplateType el = new TemplateType();
+                    el.setURL(generalOA.getSLTemplateURL1());
+                    template.add(el);
+                } else
+                    template.add(new TemplateType());
+                if (MiscUtil.isNotEmpty(generalOA.getSLTemplateURL2())) {
+                    TemplateType el = new TemplateType();
+                    el.setURL(generalOA.getSLTemplateURL2());
+                    template.add(el);
+                } else
+                    template.add(new TemplateType());
+                if (MiscUtil.isNotEmpty(generalOA.getSLTemplateURL3())) {
+                    TemplateType el = new TemplateType();
+                    el.setURL(generalOA.getSLTemplateURL3());
+                    template.add(el);
+                } else
+                    template.add(new TemplateType());
+
+            } else {
+                if (template != null && template.size() > 0) template.clear();
+            }
+
+            bkuselectioncustom.setBackGroundColor(parseColor(formOA.getBackGroundColor()));
+            bkuselectioncustom.setFrontColor(parseColor(formOA.getFrontColor()));
+
+            bkuselectioncustom.setHeaderBackGroundColor(parseColor(formOA.getHeader_BackGroundColor()));
+            bkuselectioncustom.setHeaderFrontColor(parseColor(formOA.getHeader_FrontColor()));
+            bkuselectioncustom.setHeaderText(formOA.getHeader_text());
+
+            bkuselectioncustom.setButtonBackGroundColor(parseColor(formOA.getButton_BackGroundColor()));
+            bkuselectioncustom.setButtonBackGroundColorFocus(parseColor(formOA.getButton_BackGroundColorFocus()));
+            bkuselectioncustom.setButtonFontColor(parseColor(formOA.getButton_FrontColor()));
+
+            if (MiscUtil.isNotEmpty(formOA.getAppletRedirectTarget()))
+                bkuselectioncustom.setAppletRedirectTarget(formOA.getAppletRedirectTarget());
+
+            bkuselectioncustom.setFontType(formOA.getFontType());
+
+            bkuselectioncustom.setAppletHeight(formOA.getApplet_height());
+            bkuselectioncustom.setAppletWidth(formOA.getApplet_width());
+
+        }
+
+        // set default transformation if it is empty
+        List<TransformsInfoType> transformsInfo = authoa.getTransformsInfo();
+        if (transformsInfo == null) {
+            // TODO: set OA specific transformation if it is required
+
+        }
+
+        OAPVP2 pvp2 = authoa.getOAPVP2();
+        if (pvp2 == null) {
+            pvp2 = new OAPVP2();
+            authoa.setOAPVP2(pvp2);
+        }
+
+        pvp2.setMetadataURL(pvp2OA.getMetaDataURL());
+        try {
+
+            if (pvp2OA.getFileUpload() != null) pvp2.setCertificate(pvp2OA.getCertificate());
+
+        } catch (CertificateException e) {
+            log.info("Uploaded Certificate can not be found", e);
+            return LanguageHelper.getErrorString("validation.pvp2.certificate.notfound");
+        } catch (IOException e) {
+            log.info("Uploaded Certificate can not be parsed", e);
+            return LanguageHelper.getErrorString("validation.pvp2.certificate.format");
+        }
+
+        OASAML1 saml1 = authoa.getOASAML1();
+        if (saml1 == null) {
+            saml1 = new OASAML1();
+            authoa.setOASAML1(saml1);
+            saml1.setIsActive(false);
+        }
+
+        if (authUser.isAdmin()) {
+            saml1.setIsActive(saml1OA.isActive());
+        }
+
+        if (saml1.isIsActive() != null && saml1.isIsActive()) {
+            saml1.setProvideAUTHBlock(saml1OA.isProvideAuthBlock());
+            saml1.setProvideCertificate(saml1OA.isProvideCertificate());
+            saml1.setProvideFullMandatorData(saml1OA.isProvideFullMandateData());
+            saml1.setProvideIdentityLink(saml1OA.isProvideIdentityLink());
+            saml1.setProvideStammzahl(saml1OA.isProvideStammZahl());
+            saml1.setUseCondition(saml1OA.isUseCondition());
+            saml1.setConditionLength(BigInteger.valueOf(saml1OA.getConditionLength()));
+            // TODO: set sourceID
+            // saml1.setSourceID("");
+        }
+
+        OASSO sso = authoa.getOASSO();
+        if (sso == null) {
+            sso = new OASSO();
+            authoa.setOASSO(sso);
+            sso.setAuthDataFrame(true);
+        }
+        sso.setUseSSO(ssoOA.isUseSSO());
+
+        if (authUser.isAdmin()) sso.setAuthDataFrame(ssoOA.isShowAuthDataFrame());
+
+        sso.setSingleLogOutURL(ssoOA.getSingleLogOutURL());
+
+        if (oauth20OA != null) {
+            log.debug("Saving OAuth 2.0 configuration:");
+            OAOAUTH20 oaOAuth20 = authoa.getOAOAUTH20();
+            if (oaOAuth20 == null) {
+                oaOAuth20 = new OAOAUTH20();
+                authoa.setOAOAUTH20(oaOAuth20);
+            }
+
+            oaOAuth20.setOAuthClientId(generalOA.getIdentifier());
+            // oaOAuth20.setOAuthClientSecret(oauth20OA.getClientSecret());
+            oaOAuth20.setOAuthRedirectUri(oauth20OA.getRedirectUri());
+            log.debug("client id: " + oauth20OA.getClientId());
+            log.debug("client secret: " + oauth20OA.getClientSecret());
+            log.debug("redirect uri:" + oauth20OA.getRedirectUri());
+
+            oaOAuth20.setOAuthClientSecret((String) request.getSession().getAttribute(Constants.SESSION_OAUTH20SECRET));
+            request.getSession().setAttribute(Constants.SESSION_OAUTH20SECRET, null);
+
+        }
+
+
+        // fetch stork configuration from database model
+        OASTORK stork = authoa.getOASTORK();
+        if (stork == null) {
+            // if there is none, create a new one with default values.
+            stork = new OASTORK();
+            authoa.setOASTORK(stork);
+            stork.setStorkLogonEnabled(false);
+        }
+        // transfer the incoming data to the database model
+        stork.setStorkLogonEnabled(storkOA.isStorkLogonEnabled());
+        stork.setQaa(storkOA.getQaa());
+        stork.setOAAttributes(storkOA.getAttributes());
+        stork.setVidpEnabled(storkOA.isVidpEnabled());
+        stork.setRequireConsent(storkOA.isRequireConsent());
+        stork.setAttributeProviders(storkOA.getAttributeProviderPlugins());
+
+        try {
+            if (newentry) {
+                ConfigurationDBUtils.save(dboa);
+
+                if (!authUser.isAdmin()) {
+                    UserDatabase user = ConfigurationDBRead.getUserWithID(authUser.getUserID());
+
+                    List<OnlineApplication> useroas = user.getOnlineApplication();
+                    if (useroas == null) useroas = new ArrayList<OnlineApplication>();
+
+                    useroas.add(dboa);
+                    ConfigurationDBUtils.saveOrUpdate(user);
+                }
+            } else
+                ConfigurationDBUtils.saveOrUpdate(dboa);
+
+        } catch (MOADatabaseException e) {
+            log.warn("Online-Application can not be stored.", e);
+            return LanguageHelper.getErrorString("error.db.oa.store");
+        }
+
+        return null;
+    }
+
+    private String parseColor(String color) {
+        String value = "";
+
+        if (MiscUtil.isNotEmpty(color)) {
+            if (!color.startsWith("#"))
+                value = "#" + color;
+            else
+                value = color;
+        }
+        return value;
+    }
+
+    private void generateUserSpecificConfigurationOptions(UserDatabase userdb) {
+
+        if (userdb.isIsMandateUser() != null && userdb.isIsMandateUser()) {
+            String bpk = userdb.getBpk();
+            if (bpk.startsWith(Constants.IDENIFICATIONTYPE_BASEID_FN) || bpk.startsWith(Constants.IDENIFICATIONTYPE_BASEID_ZVR)) {
+                onlyBusinessService = true;
+                generalOA.setBusinessService(true);
+            } else if (bpk.startsWith(Constants.IDENIFICATIONTYPE_STORK)) {
+                onlyStorkService = true;
+                generalOA.setStorkService(true);
+            }
+
+            deaktivededBusinessService = true;
+            deactivatedStorkService = true;
+            String[] split = bpk.split("\\+");
+            generalOA.setIdentificationType(split[1].substring(1));
+
+            if (bpk.startsWith(Constants.IDENIFICATIONTYPE_BASEID_FN))
+                generalOA.setIdentificationNumber(at.gv.egovernment.moa.util.StringUtils.deleteLeadingZeros(split[2]));
+            else
+                generalOA.setIdentificationNumber(split[2]);
+
+        }
+
+    }
+
+    public String setGeneralOAConfig() {
+
+        return Constants.STRUTS_SUCCESS;
+    }
+
+    public String setSAML1OAConfig() {
+
+        return Constants.STRUTS_SUCCESS;
+    }
+
+    public String setPVP2OAConfig() {
+
+        return Constants.STRUTS_SUCCESS;
+    }
+
+    public String setSSOOAConfig() {
+
+        return Constants.STRUTS_SUCCESS;
+    }
+
+    public String setSTORKOAConfig() {
+
+        return Constants.STRUTS_SUCCESS;
+    }
+
+    // Getter and Setter
+    public void setServletResponse(HttpServletResponse arg0) {
+        this.response = arg0;
+
+    }
+
+    public void setServletRequest(HttpServletRequest arg0) {
+        this.request = arg0;
+
+    }
+
+    public HttpServletRequest getRequest() {
+        return request;
+    }
+
+    public void setRequest(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    public HttpServletResponse getResponse() {
+        return response;
+    }
+
+    public void setResponse(HttpServletResponse response) {
+        this.response = response;
+    }
+
+    public OAGeneralConfig getGeneralOA() {
+        return generalOA;
+    }
+
+    public void setGeneralOA(OAGeneralConfig generalOA) {
+        this.generalOA = generalOA;
+    }
+
+    public OAPVP2Config getPvp2OA() {
+        return pvp2OA;
+    }
+
+    public void setPvp2OA(OAPVP2Config pvp2oa) {
+        pvp2OA = pvp2oa;
+    }
+
+    public OASAML1Config getSaml1OA() {
+        return saml1OA;
+    }
+
+    public void setSaml1OA(OASAML1Config saml1oa) {
+        saml1OA = saml1oa;
+    }
+
+    public OASSOConfig getSsoOA() {
+        return ssoOA;
+    }
+
+    public void setSsoOA(OASSOConfig ssoOA) {
+        this.ssoOA = ssoOA;
+    }
+
+    public OASTORKConfig getStorkOA() {
+        return storkOA;
+    }
+
+    public void setStorkOA(OASTORKConfig storkOA) {
+        this.storkOA = storkOA;
+    }
+
+    /**
+     * @param oaidobj the oaidobj to set
+     */
+    public void setOaidobj(String oaidobj) {
+        this.oaidobj = oaidobj;
+    }
+
+    /**
+     * @return the authUser
+     */
+    public AuthenticatedUser getAuthUser() {
+        return authUser;
+    }
+
+    /**
+     * @return the newOA
+     */
+    public boolean isNewOA() {
+        return newOA;
+    }
+
+    /**
+     * @param newOA the newOA to set
+     */
+    public void setNewOA(boolean newOA) {
+        this.newOA = newOA;
+    }
+
+    /**
+     * @return the nextPage
+     */
+    public String getNextPage() {
+        return nextPage;
+    }
+
+    /**
+     * @return the formID
+     */
+    public String getFormID() {
+        return formID;
+    }
+
+    /**
+     * @param formID the formID to set
+     */
+    public void setFormID(String formID) {
+        this.formID = formID;
+    }
+
+    /**
+     * @return the onlyBusinessService
+     */
+    public boolean isOnlyBusinessService() {
+        return onlyBusinessService;
+    }
+
+    /**
+     * @param onlyStorkService the onlyStorkService to set
+     */
+    public void setOnlyStorkService(boolean onlyStorkService) {
+        this.onlyStorkService = onlyStorkService;
+    }
+
+    /**
+     * @return the onlyStorkService
+     */
+    public boolean isOnlyStorkService() {
+        return onlyStorkService;
+    }
+
+    /**
+     * @param onlyBusinessService the onlyBusinessService to set
+     */
+    public void setOnlyBusinessService(boolean onlyBusinessService) {
+        this.onlyBusinessService = onlyBusinessService;
+    }
+
+
+    /**
+     * @return the subTargetSet
+     */
+    public boolean isSubTargetSet() {
+        return subTargetSet;
+    }
+
+    /**
+     * @param subTargetSet the subTargetSet to set
+     */
+    public void setSubTargetSet(boolean subTargetSet) {
+        this.subTargetSet = subTargetSet;
+    }
+
+    /**
+     * @return the deaktivededBusinessService
+     */
+    public boolean isDeaktivededBusinessService() {
+        return deaktivededBusinessService;
+    }
+
+    /**
+     * @return the deactivatedStorkService
+     */
+    public boolean isDeactivatedStorkService() {
+        return deactivatedStorkService;
+    }
+
+    /**
+     * @param deactivatedStorkService the deactivatedStorkService to set
+     */
+
+    public void setDeactivatedStorkService(boolean deactivatedStorkService) {
+
+        this.deactivatedStorkService = deactivatedStorkService;
+    }
+
+    /**
+     * @param deaktivededBusinessService the deaktivededBusinessService to set
+     */
+    public void setDeaktivededBusinessService(boolean deaktivededBusinessService) {
+        this.deaktivededBusinessService = deaktivededBusinessService;
+    }
+
+    /**
+     * @return the formOA
+     */
+    public FormularCustomization getFormOA() {
+        return formOA;
+    }
+
+    /**
+     * @param formOA the formOA to set
+     */
+    public void setFormOA(FormularCustomization formOA) {
+        this.formOA = formOA;
+    }
+
+    /**
+     * @return the stream
+     */
+    public InputStream getStream() {
+        return stream;
+    }
+
+    public OAOAuth20Config getOauth20OA() {
+        return oauth20OA;
+    }
+
+    public void setOauth20OA(OAOAuth20Config oauth20OA) {
+        this.oauth20OA = oauth20OA;
+    }
+
 }
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
index d3a2241d3..637500c1e 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
@@ -172,14 +172,29 @@ public class OAGeneralConfigValidation {
 		
 						
 		boolean businessservice = form.isBusinessService();
-		
-		if (businessservice) {
+        boolean storkservice = form.isStorkService();
+
+		if (storkservice) {
+          check = form.getStorkSPTargetCountry();
+            if ((check==null)||(check.length() < 1)) {
+                log.warn("Stork target country is not known");
+                errors.add(LanguageHelper.getErrorString("validation.general.stork.sptarget"));
+            }
+
+            if (check.length() > 10) {
+                log.warn("Incorrect size of Stork target country, too many characters");
+                errors.add(LanguageHelper.getErrorString("validation.general.stork.sptargetsize"));
+            }
+
+
+
+        } else if (businessservice) {
 			
 			//check identification type
 			check = form.getIdentificationType();
 			if (!form.getIdentificationTypeList().contains(check)) {
 				log.info("IdentificationType is not known.");
-				errors.add(LanguageHelper.getErrorString("validation.general.identificationtype.valid"));
+				errors.add(LanguageHelper.getErrorString("validation.general.stork.sptarget"));
 			}
 			
 			//check identification number
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
index f72999020..067e85aa6 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
@@ -27,8 +27,11 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 
+import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.configuration.data.oa.OASTORKConfig;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
+import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
+import at.gv.egovernment.moa.util.MiscUtil;
 
 public class OASTORKConfigValidation {
 
@@ -45,6 +48,21 @@ public class OASTORKConfigValidation {
 			errors.add(LanguageHelper.getErrorString("validation.stork.qaa.outofrange",
 					new Object[] {qaa} ));
 		}
+		
+		for(AttributeProviderPlugin current : oageneral.getAttributeProviderPlugins()) {
+			if (MiscUtil.isEmpty(current.getUrl()) || !ValidationHelper.validateURL(current.getUrl())) {
+				log.info("AttributeProviderPlugin URL has no valid form.");
+				errors.add(LanguageHelper.getErrorString("validation.stork.ap.url.valid"));
+			}
+			if (MiscUtil.isEmpty(current.getName())) {
+				log.info("AttributeProviderPlugin Name is empty.");
+				errors.add(LanguageHelper.getErrorString("validation.stork.ap.name.valid"));
+			}
+			if (MiscUtil.isEmpty(current.getAttributes()) || !current.getAttributes().matches("[a-zA-Z]+(, ?[a-zA-Z]+)*")) {
+				log.info("AttributeProviderPlugin attributes are empty or do not match csv format.");
+				errors.add(LanguageHelper.getErrorString("validation.stork.ap.attributes.valid"));
+			}
+		}
 
 		return errors;
 	}