configuration tool update

13 files changed, 911 insertions, 1 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 a5a5de33c..b87f38a3c 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
@@ -4,8 +4,21 @@ public class Constants {
 	public static final String STRUTS_SUCCESS = "success";
 	public static final String STRUTS_ERROR = "error";
 	
-
+	public static final String STRUTS_OA_GENERAL = "oa_general";
+	public static final String STRUTS_OA_SAML1 = "oa_saml1";
+	public static final String STRUTS_OA_PVP2 = "oa_pvp2";
+	public static final String STRUTS_OA_SSO = "oa_sso";
+	public static final String STRUTS_OA_STORK = "oa_stork";
+	
 	public static final String SESSION_AUTH = "authsession";
 	public static final String SESSION_AUTH_ERROR = "authsessionerror";
 	
+	public static final String REQUEST_OAID = "oaid";
+	
+	public static final String BKU_ONLINE = "bkuonline";
+	public static final String BKU_LOCAL = "bkulocal";
+	public static final String BKU_HANDY = "bkuhandy";
+	
+	
+	public static final String MOA_CONFIG_BUSINESSSERVICE = "businessService";
 }
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
new file mode 100644
index 000000000..f38d5679c
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
@@ -0,0 +1,359 @@
+package at.gv.egovernment.moa.id.configuration.data.oa;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
+import at.gv.egovernment.moa.id.commons.db.dao.config.BKUURLS;
+import at.gv.egovernment.moa.id.commons.db.dao.config.IdentificationNumber;
+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.OnlineApplication;
+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.configuration.Constants;
+
+
+public class OAGeneralConfig {
+
+	private String dbID = null;
+	
+	private String bkuOnlineURL = null;
+	private String bkuHandyURL = null;
+	private String bkuLocalURL = null;
+
+	private String identifier = null;
+	private String friendlyName = null;
+	
+	private boolean businessService = false;
+	
+	private String target = null;
+	private String targetFriendlyName = null;
+	
+	private String identificationNumber = null;
+	private String identificationType = null;
+	
+	private String aditionalAuthBlockText = null;
+	
+	//TODO: look Template!!!
+	
+	private String mandateProfiles = null;
+	
+	private boolean isActive = false;
+	private String slVersion = null;
+	private boolean useIFrame = false;
+	private boolean useUTC = false;
+	private boolean calculateHPI = false;
+	
+	private String keyBoxIdentifier = null;
+	private static List<String> keyBoxIdentifierList;
+	
+	private String templateURL = null;
+	
+	private Map<String, byte[]> transformations;
+	
+
+	
+	public OAGeneralConfig() {
+	
+	}
+	
+	
+	public void parse(OnlineApplication dbOAConfig) {
+			
+		friendlyName = dbOAConfig.getFriendlyName();
+		
+		keyBoxIdentifier = dbOAConfig.getKeyBoxIdentifier().toString();		
+		
+		identifier = dbOAConfig.getPublicURLPrefix();
+		target = dbOAConfig.getTarget();
+		targetFriendlyName = dbOAConfig.getTargetFriendlyName();
+		
+		if (dbOAConfig.getType().equals(Constants.MOA_CONFIG_BUSINESSSERVICE))
+			businessService = true;
+		else 
+			businessService = false;
+		
+		AuthComponentOA oaauth = dbOAConfig.getAuthComponentOA();
+		if (oaauth != null) {
+			BKUURLS bkuurls = oaauth.getBKUURLS();
+			if (bkuurls != null) {
+				bkuHandyURL = bkuurls.getHandyBKU();
+				bkuLocalURL = bkuurls.getLocalBKU();
+				bkuOnlineURL = bkuurls.getOnlineBKU();
+			}
+			
+			IdentificationNumber idnumber = oaauth.getIdentificationNumber();
+			if (idnumber != null) {
+				identificationNumber = idnumber.getValue();
+			}
+			
+			Mandates mandates = oaauth.getMandates();
+			if (mandates != null) {
+				mandateProfiles = mandates.getProfiles();
+			}
+			
+			slVersion = oaauth.getSlVersion();
+			
+			TemplatesType templates = oaauth.getTemplates();
+			if (templates != null) {
+				aditionalAuthBlockText = templates.getAditionalAuthBlockText();
+				TemplateType templatetype = templates.getTemplate();
+				
+				if (templatetype != null) {
+					templateURL = templatetype.getURL();
+				}
+			}
+			
+			List<TransformsInfoType> transforminfos = oaauth.getTransformsInfo();
+			transformations = new HashMap<String, byte[]>();
+			for (TransformsInfoType el : transforminfos) {
+				transformations.put(el.getFilename(), el.getTransformation());
+			}
+			
+			 keyBoxIdentifierList = new ArrayList<String>();
+			 MOAKeyBoxSelector[] values = MOAKeyBoxSelector.values();
+			 for (int i=0; i<values.length; i++) {
+				 keyBoxIdentifierList.add(values[i].value());
+			 }
+			 
+			 useIFrame = oaauth.isUseIFrame();
+			 useUTC = oaauth.isUseUTC();
+		}
+		
+		
+		
+		
+	}
+
+	public String getIdentifier() {
+		return identifier;
+	}
+
+	public void setIdentifier(String identifier) {
+		this.identifier = identifier;
+	}
+
+	public String getFriendlyName() {
+		return friendlyName;
+	}
+
+	public void setFriendlyName(String friendlyName) {
+		this.friendlyName = friendlyName;
+	}
+
+	public String getTarget() {
+		return target;
+	}
+
+	public void setTarget(String target) {
+		this.target = target;
+	}
+
+	public String getTargetFriendlyName() {
+		return targetFriendlyName;
+	}
+
+	public void setTargetFriendlyName(String targetFriendlyName) {
+		this.targetFriendlyName = targetFriendlyName;
+	}
+
+	public String getIdentificationNumber() {
+		return identificationNumber;
+	}
+
+	public void setIdentificationNumber(String identificationNumber) {
+		this.identificationNumber = identificationNumber;
+	}
+
+	public String getIdentificationType() {
+		return identificationType;
+	}
+
+	public void setIdentificationType(String identificationType) {
+		this.identificationType = identificationType;
+	}
+
+	public String getAditionalAuthBlockText() {
+		return aditionalAuthBlockText;
+	}
+
+	public void setAditionalAuthBlockText(String aditionalAuthBlockText) {
+		this.aditionalAuthBlockText = aditionalAuthBlockText;
+	}
+
+	public String getMandateProfiles() {
+		return mandateProfiles;
+	}
+
+	public void setMandateProfiles(String mandateProfiles) {
+		this.mandateProfiles = mandateProfiles;
+	}
+
+	public boolean isActive() {
+		return isActive;
+	}
+
+	public void setActive(boolean isActive) {
+		this.isActive = isActive;
+	}
+
+	public String getSlVersion() {
+		return slVersion;
+	}
+
+	public void setSlVersion(String slVersion) {
+		this.slVersion = slVersion;
+	}
+
+	public boolean isUseIFrame() {
+		return useIFrame;
+	}
+
+	public void setUseIFrame(boolean useIFrame) {
+		this.useIFrame = useIFrame;
+	}
+
+	public boolean isUseUTC() {
+		return useUTC;
+	}
+
+	public void setUseUTC(boolean useUTC) {
+		this.useUTC = useUTC;
+	}
+
+	public boolean isBusinessService() {
+		return businessService;
+	}
+
+	public void setBusinessService(boolean businessService) {
+		this.businessService = businessService;
+	}
+
+	public String getBkuOnlineURL() {
+		return bkuOnlineURL;
+	}
+
+	public void setBkuOnlineURL(String bkuOnlineURL) {
+		this.bkuOnlineURL = bkuOnlineURL;
+	}
+
+	public String getBkuHandyURL() {
+		return bkuHandyURL;
+	}
+
+	public void setBkuHandyURL(String bkuHandyURL) {
+		this.bkuHandyURL = bkuHandyURL;
+	}
+
+	public String getBkuLocalURL() {
+		return bkuLocalURL;
+	}
+
+	public void setBkuLocalURL(String bkuLocalURL) {
+		this.bkuLocalURL = bkuLocalURL;
+	}
+
+	/**
+	 * @return the keyBoxIdentifier
+	 */
+	public String getKeyBoxIdentifier() {
+		return keyBoxIdentifier;
+	}
+
+	/**
+	 * @param keyBoxIdentifier the keyBoxIdentifier to set
+	 */
+	public void setKeyBoxIdentifier(String keyBoxIdentifier) {
+		this.keyBoxIdentifier = keyBoxIdentifier;
+	}
+	
+	/**
+	 * @return the templateURL
+	 */
+	public String getTemplateURL() {
+		return templateURL;
+	}
+
+	/**
+	 * @param templateURL the templateURL to set
+	 */
+	public void setTemplateURL(String templateURL) {
+		this.templateURL = templateURL;
+	}
+
+	/**
+	 * @return the transformations
+	 */
+	public Map<String, byte[]> getTransformations() {
+		return transformations;
+	}
+
+	/**
+	 * @param transformations the transformations to set
+	 */
+	public void setTransformations(Map<String, byte[]> transformations) {
+		this.transformations = transformations;
+	}
+
+
+	/**
+	 * @return the dbID
+	 */
+	public String getDbID() {
+		return dbID;
+	}
+
+
+	/**
+	 * @param dbID the dbID to set
+	 */
+	public void setDbID(long dbID) {
+		this.dbID = String.valueOf(dbID);
+	}
+
+	/**
+	 * @param dbID the dbID to set
+	 */
+	public void setDbID(String dbID) {
+		this.dbID = dbID;
+	}
+
+
+	/**
+	 * @return the calculateHPI
+	 */
+	public boolean isCalculateHPI() {
+		return calculateHPI;
+	}
+
+
+	/**
+	 * @param calculateHPI the calculateHPI to set
+	 */
+	public void setCalculateHPI(boolean calculateHPI) {
+		this.calculateHPI = calculateHPI;
+	}
+
+
+	/**
+	 * @return the keyBoxIdentifierList
+	 */
+	public List<String> getKeyBoxIdentifierList() {
+		return keyBoxIdentifierList;
+	}
+
+
+	/**
+	 * @param keyBoxIdentifierList the keyBoxIdentifierList to set
+	 */
+	public void setKeyBoxIdentifierList(List<String> keyBoxIdentifierList) {
+		this.keyBoxIdentifierList = keyBoxIdentifierList;
+	}
+
+	
+	
+}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
new file mode 100644
index 000000000..1269e8077
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
@@ -0,0 +1,118 @@
+package at.gv.egovernment.moa.id.configuration.data.oa;
+
+import java.io.File;
+import java.security.cert.CertificateException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+import iaik.x509.X509Certificate;
+import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
+import at.gv.egovernment.moa.id.commons.db.dao.config.OAPVP2;
+import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
+import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
+import at.gv.egovernment.moa.id.configuration.struts.action.EditOAAction;
+
+public class OAPVP2Config {
+	
+	private final Logger log = Logger.getLogger(OAPVP2Config.class);
+	
+	private String metaDataURL = null;
+	private byte[] certificate = null;
+	private String certificateDN = null;
+	
+	private File fileUpload = null;
+	private String fileUploadContentType;
+	private String fileUploadFileName;
+	
+	public OAPVP2Config() {
+	}
+	
+	public List<String> parse(OnlineApplication dbOAConfig) {
+		List<String> errors = new ArrayList<String>();
+		
+		AuthComponentOA authdata = dbOAConfig.getAuthComponentOA();
+		if (authdata != null) {
+			OAPVP2 pvp2 = authdata.getOAPVP2();
+			if (pvp2 != null) {
+				metaDataURL =  pvp2.getMetadataURL();
+				
+				try {
+					X509Certificate x509 = new X509Certificate(pvp2.getCertificate());
+					certificateDN = x509.getSubjectDN().getName();
+				} catch (CertificateException e) {
+					log.warn("PVP2 certificate can not be loaded from Online-Applikation with ID " + dbOAConfig.getPublicURLPrefix());
+					errors.add(LanguageHelper.getErrorString("error.oa.pvp2.certificate", null));
+				}
+			}
+		}
+		return errors;
+	}
+	
+	public String getMetaDataURL() {
+		return metaDataURL;
+	}
+	public void setMetaDataURL(String metaDataURL) {
+		this.metaDataURL = metaDataURL;
+	}
+	public byte[] getCertificate() {
+		return certificate;
+	}
+	public void setCertificate(byte[] certificate) {
+		this.certificate = certificate;
+	}
+
+	/**
+	 * @return the certificateDN
+	 */
+	public String getCertificateDN() {
+		return certificateDN;
+	}
+
+	/**
+	 * @return the fileUpLoad
+	 */
+	public File getFileUpload() {
+		return fileUpload;
+	}
+
+	/**
+	 * @param fileUpLoad the fileUpLoad to set
+	 */
+	public void setFileUpload(File fileUpload) {
+		this.fileUpload = fileUpload;
+	}
+
+	/**
+	 * @return the fileUploadContentType
+	 */
+	public String getFileUploadContentType() {
+		return fileUploadContentType;
+	}
+
+	/**
+	 * @param fileUploadContentType the fileUploadContentType to set
+	 */
+	public void setFileUploadContentType(String fileUploadContentType) {
+		this.fileUploadContentType = fileUploadContentType;
+	}
+
+	/**
+	 * @return the fileUploadFileName
+	 */
+	public String getFileUploadFileName() {
+		return fileUploadFileName;
+	}
+
+	/**
+	 * @param fileUploadFileName the fileUploadFileName to set
+	 */
+	public void setFileUploadFileName(String fileUploadFileName) {
+		this.fileUploadFileName = fileUploadFileName;
+	}
+	
+	
+}
+
+
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASAML1Config.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASAML1Config.java
new file mode 100644
index 000000000..687a06b9e
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASAML1Config.java
@@ -0,0 +1,81 @@
+package at.gv.egovernment.moa.id.configuration.data.oa;
+
+import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
+import at.gv.egovernment.moa.id.commons.db.dao.config.OASAML1;
+import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
+
+public class OASAML1Config {
+
+	private boolean provideStammZahl = false;
+	private boolean provideAuthBlock = false;
+	private boolean provideIdentityLink = false;
+	private boolean provideCertificate = false;
+	private boolean provideFullMandateData = false;
+	private boolean useCondition = false;
+	private int conditionLength = -1;
+	
+	
+	public OASAML1Config() {
+	}
+	
+	public void parse(OnlineApplication dbOAConfig) {
+		AuthComponentOA authdata = dbOAConfig.getAuthComponentOA();
+		if (authdata != null) {
+			OASAML1 saml1 = authdata.getOASAML1();
+			if (saml1 != null) {
+				provideAuthBlock = saml1.isProvideAUTHBlock();
+				provideCertificate = saml1.isProvideCertificate();
+				provideFullMandateData = saml1.isProvideFullMandatorData();
+				provideIdentityLink = saml1.isProvideIdentityLink();
+				provideStammZahl = saml1.isProvideStammzahl();
+				useCondition = saml1.isUseCondition();
+				conditionLength = saml1.getConditionLength().intValue();
+			}
+		}
+	}
+	
+	public boolean isProvideStammZahl() {
+		return provideStammZahl;
+	}
+	public void setProvideStammZahl(boolean provideStammZahl) {
+		this.provideStammZahl = provideStammZahl;
+	}
+	public boolean isProvideAuthBlock() {
+		return provideAuthBlock;
+	}
+	public void setProvideAuthBlock(boolean provideAuthBlock) {
+		this.provideAuthBlock = provideAuthBlock;
+	}
+	public boolean isProvideIdentityLink() {
+		return provideIdentityLink;
+	}
+	public void setProvideIdentityLink(boolean provideIdentityLink) {
+		this.provideIdentityLink = provideIdentityLink;
+	}
+	public boolean isProvideCertificate() {
+		return provideCertificate;
+	}
+	public void setProvideCertificate(boolean provideCertificate) {
+		this.provideCertificate = provideCertificate;
+	}
+	public boolean isProvideFullMandateData() {
+		return provideFullMandateData;
+	}
+	public void setProvideFullMandateData(boolean provideFullMandateData) {
+		this.provideFullMandateData = provideFullMandateData;
+	}
+	public boolean isUseCondition() {
+		return useCondition;
+	}
+	public void setUseCondition(boolean useCondition) {
+		this.useCondition = useCondition;
+	}
+	public int getConditionLength() {
+		return conditionLength;
+	}
+	public void setConditionLength(int conditionLength) {
+		this.conditionLength = conditionLength;
+	}
+	
+	
+}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASSOConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASSOConfig.java
new file mode 100644
index 000000000..0241b6a04
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASSOConfig.java
@@ -0,0 +1,49 @@
+package at.gv.egovernment.moa.id.configuration.data.oa;
+
+import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
+import at.gv.egovernment.moa.id.commons.db.dao.config.OASSO;
+import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
+
+public class OASSOConfig {
+
+	private boolean useSSO = false;
+	private boolean showAuthDataFrame = true;
+	private String singleLogOutURL = null;
+	
+	public OASSOConfig() {
+		
+	}
+	
+	public void parse(OnlineApplication dbOAConfig) {
+		AuthComponentOA authdata = dbOAConfig.getAuthComponentOA();
+		if (authdata != null) {
+			OASSO ssoconfig = authdata.getOASSO();
+			if(ssoconfig != null) {
+				useSSO = ssoconfig.isUseSSO();
+				showAuthDataFrame = ssoconfig.isAuthDataFrame();
+				singleLogOutURL = ssoconfig.getSingleLogOutURL();
+			}	
+		}
+	}
+	
+	public boolean isUseSSO() {
+		return useSSO;
+	}
+	public void setUseSSO(boolean useSSO) {
+		this.useSSO = useSSO;
+	}
+	public boolean isShowAuthDataFrame() {
+		return showAuthDataFrame;
+	}
+	public void setShowAuthDataFrame(boolean showAuthDataFrame) {
+		this.showAuthDataFrame = showAuthDataFrame;
+	}
+	public String getSingleLogOutURL() {
+		return singleLogOutURL;
+	}
+	public void setSingleLogOutURL(String singleLogOutURL) {
+		this.singleLogOutURL = singleLogOutURL;
+	}
+	
+	
+}
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
new file mode 100644
index 000000000..74edde653
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -0,0 +1,5 @@
+package at.gv.egovernment.moa.id.configuration.data.oa;
+
+public class OASTORKConfig {
+
+}
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
new file mode 100644
index 000000000..82bc1b8c4
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -0,0 +1,217 @@
+package at.gv.egovernment.moa.id.configuration.struts.action;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.apache.struts2.interceptor.ServletRequestAware;
+import org.apache.struts2.interceptor.ServletResponseAware;
+
+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.MOAKeyBoxSelector;
+import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
+import at.gv.egovernment.moa.id.configuration.Constants;
+import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
+import at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig;
+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.helper.LanguageHelper;
+import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
+import at.gv.egovernment.moa.id.configuration.validation.oa.OAGeneralConfigValidation;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+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 OAGeneralConfig generalOA = new OAGeneralConfig();
+	private OAPVP2Config pvp2OA = new OAPVP2Config();
+	private OASAML1Config saml1OA = new OASAML1Config();
+	private OASSOConfig ssoOA = new OASSOConfig();
+	private OASTORKConfig storkOA;
+	
+	//STRUTS actions
+	public String inital() {
+		
+		Object authUserObj = request.getSession().getAttribute(Constants.SESSION_AUTH);
+		
+		if (authUserObj != null && authUserObj instanceof AuthenticatedUser) {
+			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);
+		
+		OnlineApplication onlineapplication = ConfigurationDBRead.getOnlineApplication(oaid);
+		
+		generalOA.parse(onlineapplication);
+		ssoOA.parse(onlineapplication);
+		saml1OA.parse(onlineapplication);
+		List<String> errors = pvp2OA.parse(onlineapplication);
+		
+		if (errors.size() > 0) {
+			for (String el : errors)
+				addActionError(el);	
+		}
+		
+		ConfigurationDBUtils.closeSession();
+				
+		return Constants.STRUTS_OA_GENERAL;
+	}
+	
+	public String saveGeneral() {
+		
+		OAGeneralConfigValidation validatior = new OAGeneralConfigValidation();
+		
+		List<String> errors = validatior.validate(generalOA);
+		
+		if (errors.size() > 0) {
+			log.info("OAConfiguration with ID " + generalOA.getIdentifier() + " has some errors.");
+			for (String el : errors)
+				addActionError(el);	
+			
+			return Constants.STRUTS_ERROR;
+		}
+		
+		addActionMessage(LanguageHelper.getGUIString("webpages.oaconfig.success", generalOA.getIdentifier(), request));
+		
+		return Constants.STRUTS_SUCCESS;
+	}
+	
+	public String cancleAndBack() {
+		
+		addActionMessage(LanguageHelper.getGUIString("webpages.oaconfig.cancle", generalOA.getIdentifier(), request));
+		
+		return Constants.STRUTS_SUCCESS;
+	}
+	
+	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;
+	}
+
+}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/ValidationHelper.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/ValidationHelper.java
new file mode 100644
index 000000000..445674582
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/ValidationHelper.java
@@ -0,0 +1,31 @@
+package at.gv.egovernment.moa.id.configuration.validation;
+
+public class ValidationHelper {
+
+	public static boolean validateOAID(String oaIDObj) {
+		if (oaIDObj != null) {
+			long oaID = Long.valueOf(oaIDObj);
+			
+			if (oaID > 0 && oaID < Long.MAX_VALUE)
+				return true;	
+		}
+		return false;
+	}
+	
+	public static boolean validateURL(String url) {
+		
+		return true;
+	}
+	
+	public static boolean validateIdentificationNumber(String idnumber) {
+		
+		return true;
+	}
+	
+	//TODO: insert XSS check from OVS
+	public static boolean isXSSIncluded(String input) {
+		
+		return false;
+	}
+	
+}
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
new file mode 100644
index 000000000..fec79873b
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
@@ -0,0 +1,17 @@
+package at.gv.egovernment.moa.id.configuration.validation.oa;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig;
+
+public class OAGeneralConfigValidation {
+
+	public List<String> validate(OAGeneralConfig oageneral) {
+		
+		List<String> errors = new ArrayList<String>();
+		
+		
+		return errors;
+	}
+}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
new file mode 100644
index 000000000..adc7333db
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
@@ -0,0 +1,5 @@
+package at.gv.egovernment.moa.id.configuration.validation.oa;
+
+public class OAPVP2ConfigValidation {
+
+}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASAML1ConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASAML1ConfigValidation.java
new file mode 100644
index 000000000..f2fb22ae7
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASAML1ConfigValidation.java
@@ -0,0 +1,5 @@
+package at.gv.egovernment.moa.id.configuration.validation.oa;
+
+public class OASAML1ConfigValidation {
+
+}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASSOConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASSOConfigValidation.java
new file mode 100644
index 000000000..5694d8fa4
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASSOConfigValidation.java
@@ -0,0 +1,5 @@
+package at.gv.egovernment.moa.id.configuration.validation.oa;
+
+public class OASSOConfigValidation {
+
+}
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
new file mode 100644
index 000000000..ccd1b66ff
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
@@ -0,0 +1,5 @@
+package at.gv.egovernment.moa.id.configuration.validation.oa;
+
+public class OASTORKConfigValidation {
+
+}