move validator classes to moa-id-commons

19 files changed, 18 insertions, 506 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 70241fafb..df1faa7c0 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
@@ -82,9 +82,7 @@ public class Constants {
 
 	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";
-	
-	public static final String PUBLICSERVICE_URL_POSTFIX = ".gv.at";
-	
+		
 	public static final String IDENIFICATIONTYPE_FN = "FN";
 	public static final String IDENIFICATIONTYPE_ERSB = "ERSB";
 	public static final String IDENIFICATIONTYPE_ZVR = "ZVR";
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 d43c97aed..93986529e 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
@@ -42,8 +42,8 @@ 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.commons.validation.TargetValidator;
 import at.gv.egovernment.moa.id.configuration.Constants;
-import at.gv.egovernment.moa.id.configuration.validation.TargetValidator;
 import at.gv.egovernment.moa.util.MiscUtil;
 
 
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 a54d6c74a..0a308a354 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
@@ -65,6 +65,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.TrustAnchor;
 import at.gv.egovernment.moa.id.commons.db.dao.config.VerifyAuthBlock;
 import at.gv.egovernment.moa.id.commons.db.dao.config.VerifyIdentityLink;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 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.GeneralMOAIDConfig;
@@ -72,7 +73,6 @@ import at.gv.egovernment.moa.id.configuration.data.GeneralStorkConfig;
 import at.gv.egovernment.moa.id.configuration.exception.BasicActionException;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.helper.StringHelper;
-import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.validation.moaconfig.MOAConfigValidator;
 import at.gv.egovernment.moa.id.configuration.validation.moaconfig.StorkConfigValidator;
 import at.gv.egovernment.moa.id.util.Random;
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 452c5580d..88dcbb5da 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
@@ -27,6 +27,8 @@ 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.*;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.commons.validation.TargetValidator;
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 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;
@@ -38,8 +40,6 @@ import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.helper.MailHelper;
 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.*;
 import at.gv.egovernment.moa.id.util.FormBuildUtils;
 import at.gv.egovernment.moa.id.util.Random;
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
index d04592aa3..d24fd114f 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
@@ -84,6 +84,7 @@ import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 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;
@@ -94,7 +95,6 @@ import at.gv.egovernment.moa.id.configuration.helper.AuthenticationHelper;
 import at.gv.egovernment.moa.id.configuration.helper.DateTimeHelper;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.helper.MailHelper;
-import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants;
 import at.gv.egovernment.moa.id.util.Random;
 import at.gv.egovernment.moa.util.MiscUtil;
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
index e51ee7ca6..fdef558a9 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
@@ -39,6 +39,7 @@ 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.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 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.OAListElement;
@@ -46,7 +47,6 @@ import at.gv.egovernment.moa.id.configuration.exception.BasicActionException;
 import at.gv.egovernment.moa.id.configuration.exception.ConfigurationException;
 import at.gv.egovernment.moa.id.configuration.helper.FormDataHelper;
 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 ListOAsAction extends BasicAction {
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java
index 382dc6372..5799c88b2 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java
@@ -38,6 +38,7 @@ 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.UserDatabase;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 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.UserDatabaseFrom;
@@ -48,7 +49,6 @@ import at.gv.egovernment.moa.id.configuration.helper.FormDataHelper;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.helper.MailHelper;
 import at.gv.egovernment.moa.id.configuration.validation.UserDatabaseFormValidator;
-import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.util.Random;
 import at.gv.egovernment.moa.util.MiscUtil;
 
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/FormularCustomizationValitator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/FormularCustomizationValitator.java
index ae7ee3c8e..c9a174813 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/FormularCustomizationValitator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/FormularCustomizationValitator.java
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
 
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.data.FormularCustomization;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.util.MiscUtil;
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/TargetValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/TargetValidator.java
deleted file mode 100644
index 6d7032f9d..000000000
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/TargetValidator.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.gv.egovernment.moa.id.configuration.validation;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import at.gv.egovernment.moa.util.MiscUtil;
-
-
-public class TargetValidator {
-
-	private static Map<String, String> targetList = null;
-	
-	static {
-		targetList = new HashMap<String, String>();
-		targetList.put("AR", "Arbeit");
-		targetList.put("AS", "Amtliche Statistik");
-		targetList.put("BF", "Bildung und Forschung");
-		targetList.put("BW", "Bauen und Wohnen");
-		targetList.put("EA", "EU und Auswärtige Angelegenheiten");
-		targetList.put("EF", "Ein- und Ausfuhr");
-		targetList.put("GH", "Gesundheit");
-		targetList.put("GS", "Gesellschaft und Soziales");
-//		targetList.put("GS-RE", "Restitution");
-		targetList.put("JR", "Justiz/Zivilrechtswesen");
-		targetList.put("KL", "Kultus");
-		targetList.put("KU", "Kunst und Kultur");
-		targetList.put("LF", "Land- und Forstwirtschaft");
-		targetList.put("LV", "Landesverteidigung");
-		targetList.put("RT", "Rundfunk und sonstige Medien sowie Telekommunikation");
-		targetList.put("SA", "Steuern und Abgaben");
-		targetList.put("SA", "Sport und Freizeit");
-		targetList.put("SO", "Sicherheit und Ordnung");
-//		targetList.put("SO-VR", "Vereinsregister");
-//		targetList.put("SR-RG", "Strafregister");
-		targetList.put("SV", "Sozialversicherung");
-		targetList.put("UW", "Umwelt");
-		targetList.put("VT", "Verkehr und Technik");
-		targetList.put("VV", "Vermögensverwaltung");
-		targetList.put("WT", "Wirtschaft");
-		targetList.put("ZP", "Personenidentität und Bürgerrechte(zur Person)");
-		targetList.put("BR", "Bereichsübergreifender Rechtsschutz");
-		targetList.put("HR", "Zentrales Rechnungswesen");
-		targetList.put("KI", "Auftraggeberinterne allgemeine Kanzleiindizes");
-		targetList.put("OI", "Öffentlichkeitsarbeit");
-		targetList.put("PV", "Personalverwaltung");
-		targetList.put("RD", "Zentraler Rechtsdienst");
-		targetList.put("VS", "Zentrale Durchführung von Verwaltungsstrafverfahren");
-//		targetList.put("VS-RG", "Zentrales Verwaltungsstrafregister");
-		targetList.put("ZU", "Zustellungen");
-	}
-	
-	public static List<String> getListOfTargets() {
-		Map<String, String> list = new HashMap<String, String>();
-		list.put("", "");
-		list.putAll(targetList);
-		
-		List<String> sortedList = new ArrayList<String>();
-		sortedList.addAll(list.keySet());
-		Collections.sort(sortedList);
-		
-		return sortedList;
-	
-	}
-	
-	public static String getTargetFriendlyName(String target) {
-		String name = targetList.get(target);
-		
-		if (MiscUtil.isNotEmpty(name))
-			return name;
-		else
-			return null;
-	}
-	
-	public static boolean isValidTarget(String target) {
-		return targetList.containsKey(target);
-	}
-	
-	
-}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/UserDatabaseFormValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/UserDatabaseFormValidator.java
index 3ed0157da..662694ce7 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/UserDatabaseFormValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/UserDatabaseFormValidator.java
@@ -31,6 +31,7 @@ import org.apache.log4j.Logger;
 
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
 import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.data.UserDatabaseFrom;
 import at.gv.egovernment.moa.id.configuration.helper.AuthenticationHelper;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
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
deleted file mode 100644
index 3749975df..000000000
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/ValidationHelper.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.gv.egovernment.moa.id.configuration.validation;
-
-import iaik.asn1.ObjectID;
-import iaik.utils.Util;
-import iaik.x509.X509Certificate;
-import iaik.x509.X509ExtensionInitException;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
-import org.apache.log4j.Logger;
-
-public class ValidationHelper {
-
-	private static final Logger log = Logger.getLogger(ValidationHelper.class);
-	
-	private static final String TEMPLATE_DATEFORMAT = "dd.MM.yyyy";
-	
-	
-	public static boolean isPublicServiceAllowed(String identifier) {
-		
-		SSLSocket socket = null;
-		
-		try {
-			URL url = new URL(identifier);
-			String host = url.getHost();
-			
-			if (host.endsWith("/"))
-				host = host.substring(0, host.length()-1);
-			
-			if (url.getHost().endsWith(at.gv.egovernment.moa.id.configuration.Constants.PUBLICSERVICE_URL_POSTFIX)) {
-				log.debug("PublicURLPrefix with .gv.at Domain found.");
-				return true;
-				
-			} else {
-				SSLSocketFactory factory = HttpsURLConnection.getDefaultSSLSocketFactory();			
-				socket = (SSLSocket) factory.createSocket(url.getHost(), url.getPort());
-				socket.startHandshake();
-				
-				SSLSession session = socket.getSession();
-				Certificate[] servercerts = session.getPeerCertificates();
-				X509Certificate[] iaikChain = new X509Certificate[servercerts.length];
-				for (int i=0; i<servercerts.length; i++) {
-					iaikChain[i] = new X509Certificate(servercerts[i].getEncoded());
-				}
-				
-				
-				X509Certificate cert = Util.arrangeCertificateChain(iaikChain, false)[0];
-				
-				if (cert != null) {
-					ObjectID vwOID = new ObjectID("1.2.40.0.10.1.1.1"); // Verwaltungseigenschaft
-					ObjectID dOID = new ObjectID("1.2.40.0.10.1.1.2"); // Dienstleistereigenschaft
-					
-					
-					if ((cert.getExtension(vwOID) == null) && (cert.getExtension(dOID) == null)) {
-						return false;
-						
-					} else {
-						log.info("Found correct X509 Extension in server certificate. PublicService is allowed");
-						return true;
-					}		
-				}
-				
-				return false;
-			}
-				
-		} catch (MalformedURLException e) {
-			log.warn("PublicURLPrefix can not parsed to URL", e);
-			return false;
-			
-		} catch (UnknownHostException e) {
-			log.warn("Can not connect to PublicURLPrefix Server", e);
-			return false;
-			
-		} catch (IOException e) {
-			log.warn("Can not connect to PublicURLPrefix Server", e);
-			return false;
-			
-		} catch (CertificateEncodingException e) {
-			log.warn("Can not parse X509 server certificate", e);
-			return false;
-			
-		} catch (CertificateException e) {
-			log.warn("Can not read X509 server certificate", e);
-			return false;
-			
-		} catch (X509ExtensionInitException e) {
-			log.warn("Can not read X509 server certificate extension", e);
-			return false;
-		}
-		
-		finally {
-			if (socket != null)
-				try {
-					socket.close();
-				} catch (IOException e) {
-					log.warn("SSL Socket can not be closed.", e);
-				}
-		}
-	}
-	
-	public static boolean validateOAID(String oaIDObj) {
-		if (oaIDObj != null) {
-			try {
-				
-				long oaID = Long.valueOf(oaIDObj);
-			
-				if (oaID > 0 && oaID < Long.MAX_VALUE)
-					return true;
-				
-			} catch (Throwable t) {
-				log.warn("No valid DataBase OAID received! " + oaIDObj);
-			}
-		}
-		return false;
-	}
-	
-	public static boolean validateNumber(String value) {
-		
-		log.debug("Validate Number " + value);
-
-		try {
-			Float.valueOf(value);
-			
-			return true;
-			
-		} catch (NumberFormatException e) {
-			return false;
-		}
-		
-		
-	}
-	
-	public static boolean validatePhoneNumber(String value) {
-		log.debug ("Validate PhoneNumber " + value);
-		
-        /* ************************************************************************************************
-         * Legende: 
-         * ========   AA = post/pre-Text
-         *            BB = (+49)
-         *            CC = Vorwahl  
-         *            DD = Durchwahl
-         *            EE = Nebenstelle                                                                
-         * Pattern p = Pattern.compile("^ [a-zA-Z .,;:/\\-]* [ ]* [(]{0,1}[ ]*[+]{0,1}[ ]*[0-9]{0,2}[ ]*[)]{0,1} [ ]* [0-9]*[ ]* [0-9][ ]* [0-9]* [ ]* [a-zA-Z .,;:\\/-]* $");
-         *                                ------- AA -------      --------------------- BB ---------------------      --------- CC --------          - DD -          - EE -          ------- AA -------
-         * ************************************************************************************************ */
-        Pattern pattern = Pattern.compile("^[a-zA-Z .,;:/\\-]*[ ]*[(]{0,1}[ ]*[+]{0,1}[ ]*[0-9]{0,2}[ ]*[)]{0,1}[ ]*[0-9]*[ ]*[0-9]*[ ]*[0-9]*[ ]*[a-zA-Z .,;:\\/-]*$");
-        Matcher matcher = pattern.matcher(value);
-        boolean b = matcher.matches();
-        if (b) {
-     	   log.debug("Parameter PhoneNumber erfolgreich ueberprueft");
-     	  return true;
-        }
-        else {
-     	   log.error("Fehler Ueberpruefung Parameter PhoneNumber. PhoneNumber entspricht nicht den Kriterien ^ [a-zA-Z .,;:/\\-]* [ ]* [(]{0,1}[ ]*[+]{0,1}[ ]*[0-9]{0,2}[ ]*[)]{0,1} [ ]* [0-9]*[ ]*[/\\-]{0,1} [ ]*[ ]* [0-9]* [ ]* [a-zA-Z .,;:\\/-]* $");
-     	  return false;  
-        }  
-        
-		
-	}
-	
-	public static boolean validateURL(String urlString) {
-		
-		log.debug("Validate URL " + urlString);
-		
-		if (urlString.startsWith("http") || urlString.startsWith("https")) {
-  		  try {
-			new URL(urlString);
-			return true;
-			
-  		  } catch (MalformedURLException e) {
-  		  }
-		}
-		
-		return false;
-	}
-	
-//	public static boolean validateGeneralURL(String urlString) {
-//		
-//		log.debug("Validate URL " + urlString);
-//		
-//  		  try {
-//			new URL(urlString);
-//			return true;
-//			
-//  		  } catch (MalformedURLException e) {
-//  			  
-//  		  }
-//		
-//		return false;
-//	}
-	
-	public static boolean isValidAdminTarget(String target) {
-		   
-	   log.debug("Ueberpruefe Parameter Target");
-	            
-       Pattern pattern = Pattern.compile("[a-zA-Z-]{1,5}");
-       Matcher matcher = pattern.matcher(target);
-       boolean b = matcher.matches();
-       if (b) {
-    	   log.debug("Parameter SSO-Target erfolgreich ueberprueft. SSO Target is PublicService.");
-    	  return true;
-       }
-       else {
-    	   log.info("Parameter SSO-Target entspricht nicht den Kriterien " +
-    	   		"(nur Zeichen a-z, A-Z und -, sowie 1-5 Zeichen lang) fuer den oeffentlichen Bereich. " +
-    	   		"Valiere SSO-Target fuer privatwirtschaftliche Bereiche.");
-    	  return false;  
-       }           
-	}
-	
-	public static boolean isValidTarget(String target) {
-		   
-		   log.debug("Ueberpruefe Parameter Target");
-		            
-	       if (TargetValidator.isValidTarget(target)) {
-	    	   log.debug("Parameter Target erfolgreich ueberprueft");
-	    	  return true;
-	       }
-	       else {
-	    	   log.error("Fehler Ueberpruefung Parameter Target. Target entspricht nicht den Kriterien (nur Zeichen a-z, A-Z und -, sowie 1-5 Zeichen lang)");
-	    	  return false;  
-	       }
-		            
-		}
-	
-	public static boolean isValidSourceID(String sourceID) {
-		   
-	   log.debug("Ueberpruefe Parameter sourceID");
-
-	   Pattern pattern = Pattern.compile("[\\w-_]{1,20}");
-	   Matcher matcher = pattern.matcher(sourceID);
-	   boolean b = matcher.matches();
-	   if (b) {
-	 	  log.debug("Parameter sourceID erfolgreich ueberprueft");
-	 	  return true;
-      }
-      else {
-    	  log.error("Fehler Ueberpruefung Parameter sourceID. SourceID entspricht nicht den Kriterien (nur Zeichen a-z, A-Z, - und _, sowie 1-20 Zeichen lang)");
-    	  return false;  
-      }            
-	}
-	
-	public static boolean isDateFormat(String dateString) {
-		if (dateString.length() > TEMPLATE_DATEFORMAT.length())
-			return false;
-		
-		SimpleDateFormat sdf = new SimpleDateFormat(TEMPLATE_DATEFORMAT);
-		try {
-			sdf.parse(dateString);
-			return true;
-			
-		} catch (ParseException e) {
-			return false;
-		}
-	}
-
-	public static boolean isEmailAddressFormat(String address) {
-		if (address == null) {
-			return false;
-		}
-		return Pattern.compile("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,6}$").matcher(address).matches();
-	}
-	
-	public static boolean isValidOAIdentifier(String param) {
-		if (param == null) {
-			return false;
-		}
-		return param.indexOf(";") != -1 ||
-					 param.indexOf("%") != -1 ||
-					 param.indexOf("\"") != -1 ||
-					 param.indexOf("'") != -1 ||
-					 param.indexOf("?") != -1 ||
-					 param.indexOf("`") != -1 ||
-					 param.indexOf(",") != -1 ||
-					 param.indexOf("<") != -1 ||
-					 param.indexOf(">") != -1 ||
-					 param.indexOf("\\") != -1;	
-		
-	}
-	
-	public static String getNotValidOAIdentifierCharacters() {
-		
-		return "; % \" ' ` , < > \\";
-	}	
-	
-	public static boolean containsPotentialCSSCharacter(String param, boolean commaallowed) {
-		
-		if (param == null) {
-			return false;
-		}
-		return param.indexOf(";") != -1 ||
-					 param.indexOf("%") != -1 ||
-					 param.indexOf("\"") != -1 ||
-					 param.indexOf("'") != -1 ||
-					 param.indexOf("?") != -1 ||
-					 param.indexOf("`") != -1 ||
-					 ( param.indexOf(",") != -1 && !commaallowed ) ||
-					 param.indexOf("<") != -1 ||
-					 param.indexOf(">") != -1 ||
-					 param.indexOf("\\") != -1 ||
-					 param.indexOf("/") != -1;					 					
-	}
-	
-	public static String getPotentialCSSCharacter(boolean commaallowed) {
-		
-		if (commaallowed)
-			return "; % \" ' ` < > \\ /";
-		else
-			return "; % \" ' ` , < > \\ /";
-	}
-	
-	public static boolean isNotValidIdentityLinkSigner(String param) {
-		if (param == null) {
-			return false;
-		}
-		return param.indexOf(";") != -1 ||
-					 param.indexOf("%") != -1 ||
-					 param.indexOf("\"") != -1 ||
-					 param.indexOf("'") != -1 ||
-					 param.indexOf("?") != -1 ||
-					 param.indexOf("`") != -1 ||
-					 param.indexOf("<") != -1 ||
-					 param.indexOf(">") != -1;	
-		
-	}
-	
-	public static String getNotValidIdentityLinkSignerCharacters() {
-		
-		return "; % \" ' ` < >";
-	}
-	
-	public static boolean isValidHexValue(String param) {
-		
-		try {
-			if (param.startsWith("#") && param.length() <= 7) {			
-				Long.decode(param);
-				return true;
-			}
-			
-		} catch (Exception e) {
-			
-		}
-		return false;
-		
-	}
-	
-}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
index cfa00f0e1..c64ae35d3 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
@@ -34,13 +34,13 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
 
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.data.GeneralMOAIDConfig;
 import at.gv.egovernment.moa.id.configuration.data.pvp2.ContactForm;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.helper.StringHelper;
 import at.gv.egovernment.moa.id.configuration.validation.CompanyNumberValidator;
-import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
 import at.gv.egovernment.moa.util.Base64Utils;
 import at.gv.egovernment.moa.util.MiscUtil;
 
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java
index f7adc1a67..e4a091c7e 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java
@@ -30,9 +30,9 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
 
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.data.pvp2.ContactForm;
 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;
 
 
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
index a63b3a7b1..8bc916e5a 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
@@ -9,9 +9,9 @@ import org.apache.log4j.Logger;
 
 import at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS;
 import at.gv.egovernment.moa.id.commons.db.dao.config.StorkAttribute;
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.data.GeneralStorkConfig;
 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 StorkConfigValidator {
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java
index bee2ba06c..de32d31c7 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java
@@ -36,9 +36,9 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
 
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
-import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
 import at.gv.egovernment.moa.util.Base64Utils;
 import at.gv.egovernment.moa.util.MiscUtil;
 
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 7b68f04d8..5f563ac49 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
@@ -30,11 +30,11 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
 
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.validation.CompanyNumberValidator;
-import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
 import at.gv.egovernment.moa.util.MiscUtil;
 
 public class OAGeneralConfigValidation {
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
index b26f2d9d5..7da3eb0b7 100644
--- 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
@@ -31,9 +31,9 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
 
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.data.oa.OAPVP2Config;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
-import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
 import at.gv.egovernment.moa.util.FileUtils;
 import at.gv.egovernment.moa.util.MiscUtil;
 
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
index 6de966b8d..971e11cc4 100644
--- 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
@@ -29,9 +29,9 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
 
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.data.oa.OASSOConfig;
 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 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
index 7bdcb65cf..d18c34458 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
@@ -30,9 +30,9 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.log4j.Logger;
 
 import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin;
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 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 {