refactore code to use EAAF core components

14 files changed, 36 insertions, 755 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDAuthConstants.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDAuthConstants.java
index 6f6735d48..5b3379ae7 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDAuthConstants.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDAuthConstants.java
@@ -35,8 +35,8 @@ public class MOAIDAuthConstants extends MOAIDConstants{
   public static final String PARAM_ACTION = "ACTION";
   public static final String PARAM_SSO = "SSO";
   public static final String INTERFEDERATION_IDP = "interIDP";
-  public static final String PARAM_TARGET_PENDINGREQUESTID = "pendingid";
   
+ 
   public static final String PARAM_SLOSTATUS = "status";
   public static final String PARAM_SLORESTART = "restart";
   public static final String SLOSTATUS_SUCCESS = "success";
@@ -171,12 +171,7 @@ public class MOAIDAuthConstants extends MOAIDConstants{
   public static final String COUNTRYCODE_AUSTRIA = "AT";
   
   public static final String REGEX_PATTERN_TARGET = "^[A-Za-z]{2}(-.*)?$";
-  
-  //MDC variables for logging
-  public static final String MDC_TRANSACTION_ID = "transactionId";
-  public static final String MDC_SESSION_ID = "sessionId";
-  public static final String MDC_SERVICEPROVIDER_ID = "oaId";
-  
+    
   //AuthnRequest IssueInstant validation
   public static final int TIME_JITTER = 5;  //all 5 minutes time jitter 
 
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java
index 436dcc91d..958fb25ce 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java
@@ -28,6 +28,7 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
+import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
 import at.gv.egovernment.moa.util.Constants;
 
 /**
@@ -38,18 +39,18 @@ public class MOAIDConstants {
 
 	//general configuration constants
 	
-	public static final String DEFAULT_CONTENT_TYPE_HTML_UTF8 = "text/html; charset=UTF-8";
+	public static final String DEFAULT_CONTENT_TYPE_HTML_UTF8 = EAAFConstants.CONTENTTYPE_HTML_UTF8;
 	
 	public static final String FILE_URI_PREFIX = "file:/";
 	
-	public static final String PREFIX_BASEID = Constants.URN_PREFIX_BASEID;	
-	public static final String PREFIX_PBK    = Constants.URN_PREFIX_BPK;
+	public static final String PREFIX_BASEID = EAAFConstants.URN_PREFIX_BASEID;	
+	public static final String PREFIX_PBK    = EAAFConstants.URN_PREFIX_BPK;
 	public static final String PREFIX_HPI    = Constants.URN_PREFIX_HPI;
 	
-	public static final String PREFIX_CDID   = Constants.URN_PREFIX_CDID + "+";
-	public static final String PREFIX_WPBK   = Constants.URN_PREFIX_WBPK + "+";
+	public static final String PREFIX_CDID   = EAAFConstants.URN_PREFIX_CDID;
+	public static final String PREFIX_WPBK   = EAAFConstants.URN_PREFIX_WBPK;
     public static final String PREFIX_STORK  = Constants.URN_PREFIX_STORK + "+";
-    public static final String PREFIX_EIDAS  = Constants.URN_PREFIX_EIDAS + "+";
+    public static final String PREFIX_EIDAS  = EAAFConstants.URN_PREFIX_EIDAS;
     
 	
 	public static final String IDENIFICATIONTYPE_FN = "FN";
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/AuthConfiguration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/AuthConfiguration.java
index 4dda4c736..541285219 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/AuthConfiguration.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/AuthConfiguration.java
@@ -29,35 +29,7 @@ public interface AuthConfiguration extends ConfigurationProvider{
 	public Map<String, String> getConfigurationWithPrefix(final String Prefix);
 	
 	public String getConfigurationWithKey(final String key);
-	
-	/**
-	 * Get a configuration value from basic file based MOA-ID configuration
-	 * 
-	 * @param key configuration key 
-	 * @return configuration value or null if it is not found
-	 */
-	public String getBasicMOAIDConfiguration(final String key);
-	
-	
-	/**
-	 * Get a configuration value from basic file based MOA-ID configuration
-	 * 
-	 * @param key configuration key 
-	 * @param defaultValue Default value if no value with this key is found
-	 * @return configuration value 
-	 */
-	public String getBasicMOAIDConfiguration(final String key, final String defaultValue);
-	
-	/**
-	 * Get a set of configuration values from basic file based MOA-ID configuration that starts with this prefix
-	 * <br><br>
-	 * <b>Important:</b> The configuration values must be of type String! 
-	 * 
-	 * @param prefix Prefix of the configuration key
-	 * @return Map<String, String> without prefix, but never null
-	 */
-	public Map<String, String> getBasicMOAIDConfigurationWithPrefix(final String prefix);
-	
+		
 	public int getTransactionTimeOut();
 	public int getSSOCreatedTimeOut();
 	public int getSSOUpdatedTimeOut();
@@ -66,8 +38,6 @@ public interface AuthConfiguration extends ConfigurationProvider{
 
 	public List<String> getLegacyAllowedProtocols();
 
-	public IOAAuthParameters getOnlineApplicationParameter(String oaURL);
-
 	public String getMoaSpAuthBlockTrustProfileID(boolean useTestTrustStore) throws ConfigurationException;
 
 	public List<String> getMoaSpAuthBlockVerifyTransformsInfoIDs() throws ConfigurationException;
@@ -205,12 +175,4 @@ public interface AuthConfiguration extends ConfigurationProvider{
 	 */
 	public String[] getRevocationMethodOrder();
 
-	/**
-	 * Get a boolean value from basic MOA-ID configuration file
-	 * 
-	 * @param key Configuration key
-	 * @param defaultValue Default result
-	 * @return returns the value of the configuration key, or the default value if the key is not set
-	 */
-	public boolean getBasicMOAIDConfigurationBoolean(String key, boolean defaultValue);
 }
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/ConfigurationProvider.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/ConfigurationProvider.java
index e14f9c9ce..12b9517a6 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/ConfigurationProvider.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/ConfigurationProvider.java
@@ -22,11 +22,14 @@
  */
 package at.gv.egovernment.moa.id.commons.api;
 
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
+
 /**
  * @author tlenz
  *
  */
-public interface ConfigurationProvider {
+public interface ConfigurationProvider extends IConfiguration{
 
 	  /** 
 	   * The name of the system property which contains the file name of the 
@@ -54,14 +57,15 @@ public interface ConfigurationProvider {
 		public static final String TRUST_MANAGER_REVOCATION_CHECKING =
 			"TrustManager.RevocationChecking";   
 		
-		public String getRootConfigFileDir();
-		
 		public String getDefaultChainingMode();
 	
 		public String getTrustedCACertificates();
 		
 		public boolean isTrustmanagerrevoationchecking();
 		
+		
+		public String getRootConfigFileDir() throws ConfigurationException;
+		
 		/**
 		 * Get active Spring profiles from file based configuration
 		 * 
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/IOAAuthParameters.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/IOAAuthParameters.java
index 1e1bfa94b..8ca65e745 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/IOAAuthParameters.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/IOAAuthParameters.java
@@ -25,8 +25,9 @@ package at.gv.egovernment.moa.id.commons.api;
 import java.security.PrivateKey;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 
+import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
 import at.gv.egovernment.moa.id.commons.api.data.CPEPS;
 import at.gv.egovernment.moa.id.commons.api.data.SAML1ConfigurationParameters;
 import at.gv.egovernment.moa.id.commons.api.data.StorkAttribute;
@@ -37,10 +38,7 @@ import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
  * @author tlenz
  *
  */
-public interface IOAAuthParameters {
-
-	public static final String CONFIG_KEY_RESTRICTIONS_BASEID_INTERNAL = "configuration.restrictions.baseID.idpProcessing";
-	public static final String CONFIG_KEY_RESTRICTIONS_BASEID_TRANSMISSION = "configuration.restrictions.baseID.spTransmission";
+public interface IOAAuthParameters extends ISPConfiguration{
 	
 	public static final String THIRDBKU = "thirdBKU";
 	public static final String HANDYBKU = "handy";
@@ -53,20 +51,6 @@ public interface IOAAuthParameters {
 	public static final String EIDAS = "eIDAS";
 	public static final String AUTHTYPE_OTHERS = "others";
 
-	/**
-	 * Get the full key/value configuration for this online application
-	 * 
-	 * @return an unmodifiable map of key/value pairs
-	 */
-	public Map<String, String> getFullConfiguration();
-	
-	  /**
-	   * Get a configuration value from online application key/value configuration
-	   * 
-	   * @param key: The key identifier of a configuration value   * 
-	   * @return The configuration value {String} or null if the key does not exist
-	   */  
-	public String getConfigurationValue(String key);
 	
 	public String getFriendlyName();
 	
@@ -82,7 +66,8 @@ public interface IOAAuthParameters {
 	 * @return true if there is a restriction, otherwise false
 	 * @throws ConfigurationException In case of online-application configuration has public and private identifies
 	 */
-	public boolean hasBaseIdInternalProcessingRestriction() throws ConfigurationException;
+	@Override
+	public boolean hasBaseIdInternalProcessingRestriction() throws EAAFConfigurationException;
 	
 	
 	/**
@@ -95,7 +80,8 @@ public interface IOAAuthParameters {
 	 * @return true if there is a restriction, otherwise false
 	 * @throws ConfigurationException In case of online-application configuration has public and private identifies
 	 */
-	public boolean hasBaseIdTransferRestriction() throws ConfigurationException;
+	@Override
+	public boolean hasBaseIdTransferRestriction() throws EAAFConfigurationException;
 	
 	
 	/**
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/IRequest.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/IRequest.java
deleted file mode 100644
index 88cd89319..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/IRequest.java
+++ /dev/null
@@ -1,221 +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.commons.api;
-
-import java.util.Collection;
-
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-
-import at.gv.egovernment.moa.id.commons.api.data.IAuthenticationSession;
-import at.gv.egovernment.moa.id.commons.api.exceptions.SessionDataStorageException;
-
-public interface IRequest {
-		
-	/**
-	 * Indicates the module, which implements this authentication protocol.
-	 * The class, which is referenced, had to implement the 'IModulInfo' interface.
-	 * 
-	 * @return Full-qualified name of the class which implements this protocol
-	 */
-	public String requestedModule();
-	
-	/**
-	 * Indicates the protocol specific action, which should executed if the request is processed. 
-	 * The class, which is referenced, had to implement the 'IAction' interface.
-	 * 
-	 * @return Full-qualified name of the class which implements the action  
-	 */
-	public String requestedAction();
-	
-	/**
-	 * Unique identifier, which indicates the service provider. 
-	 * In case of SAML1 protocol, it is the OA http-GET parameter
-	 * 
-	 * @return Unique identifier for the service provider
-	 */
-	public String getOAURL();
-	
-	/**
-	 * Indicates the passive flag in authentication requests.
-	 * If the passive flag is set, the identification and authentication process 
-	 * failed if no active SSO session is found. 
-	 * 
-	 * @return true, if the is passive flag is set in authentication request, otherwise false
-	 */
-	public boolean isPassiv();
-	
-	/**
-	 * Indicates the force authentication flag in authentication request
-	 * If this flag is set, a new identification and authentication process
-	 * is carried out in any case.
-	 * 
-	 * @return true, if the force authentication flag is set, otherwise false
-	 */
-	public boolean forceAuth();
-	
-	
-	/**
-	 * Returns a generic request-data object with is stored with a specific identifier 
-	 * 
-	 * @param key The specific identifier of the request-data object
-	 * @return The request-data object or null if no data is found with this key
-	 */
-	public Object getGenericData(String key);
-	
-	/**
-	 * Returns a generic request-data object with is stored with a specific identifier 
-	 * 
-	 * @param key The specific identifier of the request-data object
-	 * @param clazz The class type which is stored with this key
-	 * @return The request-data object or null if no data is found with this key
-	 */
-	public <T> T getGenericData(String key, final Class<T> clazz);
-	
-	/** 
-	 * Store a generic data-object to request with a specific identifier
-	 * 
-	 * @param key Identifier for this data-object
-	 * @param object Generic data-object which should be stored. This data-object had to be implement the 'java.io.Serializable' interface
-	 * @throws SessionDataStorageException Error message if the data-object can not stored to generic request-data storage
-	 */
-	public void setGenericDataToSession(String key, Object object) throws SessionDataStorageException;
-		
-	/**
-	 * Hold the identifier of this request object. 
-	 * This identifier can be used to load the request from request storage 
-	 * 
-	 * @return Request identifier
-	 */
-	public String getRequestID();
-	
-
-	/**
-	 * Hold the identifier of the SSO MOASession which is associated with this request
-	 * 
-	 * @return SSO MOASession identifier if a associated session exists, otherwise null
-	 */
-	public String getInternalSSOSessionIdentifier();
-
-	
-	/**
-	 * Hold the MOASession object of a pending request
-	 * This MOASession object is NOT stored to AuthenticationSession database, because it is only part of the pending request 
-	 * 
-	 * @return {@link IAuthenticationSession} AuthenticationSession data object of this pending request
-	 */
-	public IAuthenticationSession getMOASession();
-	
-	
-	/**
-	 * Populate the MOASession object of a pending request with information from an SSO session database
-	 * 
-	 * @param ssoSession
-	 */
-	public void populateMOASessionWithSSOInformation(IAuthenticationSession ssoSession);
-		
-	/**
-	 * Holds a unique transaction identifier, which could be used for looging
-	 * This transaction identifier is unique for a single identification and authentication process
-	 * 
-	 * @return Unique transaction identifier. 
-	 */
-	public String getUniqueTransactionIdentifier();
-	
-	/**
-	 * Holds a unique session identifier, which could be used for logging 
-	 * This session identifier is unique for the full Single Sign-On session time
-	 * 
-	 * @return Unique session identifier
-	 */
-	public String getUniqueSessionIdentifier();
-	
-	
-	/**
-	 * Hold the identifier if the process instance, which is associated with this request 
-	 * 
-	 * @return ProcessInstanceID if this request is associated with a authentication process, otherwise null
-	 */
-	public String getProcessInstanceId();
-	
-	
-	/**
-	 * get the IDP URL PreFix, which was used for authentication request
-	 * 
-	 * @return IDP URL PreFix <String>. The URL prefix always ends without /
-	 */
-	public String getAuthURL();
-	public String getAuthURLWithOutSlash();
-	
-	/**
-	 * Indicates if this pending request needs authentication
-	 * 
-	 * @return true if this request needs authentication, otherwise false
-	 */
-	public boolean isNeedAuthentication();
-	
-	/**
-	 * Indicates, if this pending request needs Single Sign-On (SSO) functionality 
-	 * 
-	 * @return true if this request needs SSO, otherwise false
-	 */
-	public boolean needSingleSignOnFunctionality();
-	public void setNeedSingleSignOnFunctionality(boolean needSSO);
-	
-	/**
-	 * Indicates, if this pending request is already authenticated
-	 * 
-	 * @return true if this request is already authenticated, otherwise false
-	 */
-	public boolean isAuthenticated();
-	public void setAuthenticated(boolean isAuthenticated);
-	
-	/**
-	 * Get get Service-Provider configuration which is associated with this request.
-	 * 
-	 * @return Service-Provider configuration
-	 */
-	public IOAAuthParameters getOnlineApplicationConfiguration();
-
-	/**
-	 * Indicates, if this pending-request is aborted by the user
-	 * 
-	 * @return true, if it is aborted, otherwise false
-	 */
-	public boolean isAbortedByUser();
-
-	/**
-	 * Set the 'isAboredByUser' flag of this pending-request
-	 * 
-	 * @param b true, if the user has abort the authentication process, otherwise false
-	 */
-	public void setAbortedByUser(boolean isAborted);
-	
-	/**
-	 * This method get a Set of PVP 2.1 attribute, which are request by this pending-request.
-	 * @param metadataProvider SAML2 Metadata Provider, or null if no metadata provider is required
-	 * 
-	 * @return A set of PVP attribute names or null if no attributes are requested 
-	 * 			or the Service Provider, which sends this request needs no attributes
-	 */
-	public Collection<String> getRequestedAttributes(MetadataProvider metadataProvider);
-}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/exceptions/MOAIDException.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/exceptions/MOAIDException.java
index 6841be92b..75f466f0a 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/exceptions/MOAIDException.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/exceptions/MOAIDException.java
@@ -49,7 +49,8 @@ package at.gv.egovernment.moa.id.commons.api.exceptions;
 import java.io.PrintStream;
 import java.io.PrintWriter;
 
-import at.gv.egovernment.moa.id.commons.utils.MOAIDMessageProvider;
+import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
 
 /**
  * Base class of technical MOA exceptions.
@@ -60,7 +61,7 @@ import at.gv.egovernment.moa.id.commons.utils.MOAIDMessageProvider;
  * @author Patrick Peck, Ivancsics Paul
  * @version $Id$
  */
-public class MOAIDException extends Exception {
+public class MOAIDException extends EAAFException {
   /**
 	 * 
 	 */
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
index 93f26051c..de120fd9c 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
@@ -32,6 +32,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
 import at.gv.egovernment.moa.id.commons.MOAIDConstants;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AuthComponentGeneral;
@@ -82,7 +83,6 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.TimeOuts;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.TransformsInfoType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.VerifyAuthBlock;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.VerifyIdentityLink;
-import at.gv.egovernment.moa.id.commons.utils.KeyValueUtils;
 import at.gv.egovernment.moa.id.commons.validation.TargetValidator;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Base64Utils;
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
index 695df3123..bb7bcfd0f 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
@@ -1,5 +1,6 @@
 package at.gv.egovernment.moa.id.commons.config;
 
+import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
 import at.gv.egovernment.moa.id.commons.MOAIDConstants;
 
 /**
@@ -33,7 +34,8 @@ public final class MOAIDConfigurationConstants extends MOAIDConstants {
 	public static final String PREFIX_MOAID_SERVICES_GATEWAY = PREFIX_MOAID_SERVICES + "." + PREFIX_GATEWAY;
 	
 	//Namespaces for online applications
-	public static final String SERVICE_UNIQUEIDENTIFIER = "uniqueID";   	//publicURLPrefix
+	public static final String SERVICE_UNIQUEIDENTIFIER 
+						= EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER;   	//publicURLPrefix
 	public static final String SERVICE_FRIENDLYNAME = "friendlyName";   	//friendlyName
 	public static final String SERVICE_BUSINESSSERVICE = "businessservice";	//type
 	public static final String SERVICE_ISACTIVE = "isActive";		   		//isActive
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/MOAIDConfigurationImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/MOAIDConfigurationImpl.java
index 4944813ad..6ef7a00cd 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/MOAIDConfigurationImpl.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/MOAIDConfigurationImpl.java
@@ -14,11 +14,11 @@ import org.springframework.transaction.annotation.Transactional;
 
 import at.gv.egiz.components.configuration.api.Configuration;
 import at.gv.egiz.components.configuration.api.ConfigurationException;
+import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
 import at.gv.egovernment.moa.id.commons.config.MOAIDConfigurationConstants;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AbstractConfigProperty;
 //import at.gv.egovernment.moa.id.commons.db.dao.config.ConfigProperty;
 import at.gv.egovernment.moa.id.commons.db.dao.config.DatabaseConfigPropertyImpl;
-import at.gv.egovernment.moa.id.commons.utils.KeyValueUtils;
 import at.gv.egovernment.moa.logging.Logger;
 
 /**
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java
index a3d01024c..cada51b9a 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java
@@ -9,11 +9,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import at.gv.egiz.components.configuration.api.ConfigurationException;
+import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
 import at.gv.egovernment.moa.id.commons.config.ConfigurationMigrationUtils;
 import at.gv.egovernment.moa.id.commons.config.MOAIDConfigurationConstants;
 import at.gv.egovernment.moa.id.commons.config.persistence.MOAIDConfiguration;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OnlineApplication;
-import at.gv.egovernment.moa.id.commons.utils.KeyValueUtils;
 import at.gv.egovernment.moa.logging.Logger;
 
 /**
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ex/MOADatabaseException.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ex/MOADatabaseException.java
index 46484879d..d2d411074 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ex/MOADatabaseException.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ex/MOADatabaseException.java
@@ -22,13 +22,12 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.commons.db.ex;
 
-public class MOADatabaseException extends Exception {
+import at.gv.egiz.eaaf.core.exceptions.EAAFStorageException;
+
+public class MOADatabaseException extends EAAFStorageException {
 
   private static final long serialVersionUID = 1L;
 
-	public MOADatabaseException() {
-	  super();
-  }
 
 	public MOADatabaseException(String message, Throwable cause) {
 	  super(message, cause);
@@ -38,7 +37,4 @@ public class MOADatabaseException extends Exception {
 	  super(message);
   }
 
-	public MOADatabaseException(Throwable cause) {
-	  super(cause);
-  }
 }
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/KeyValueUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/KeyValueUtils.java
deleted file mode 100644
index 40ef5a23a..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/KeyValueUtils.java
+++ /dev/null
@@ -1,341 +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.commons.utils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.commons.lang3.StringUtils;
-
-import at.gv.egovernment.moa.util.MiscUtil;
-
-/**
- * @author tlenz
- *
- */
-public class KeyValueUtils {
-	
-	public static final String KEY_DELIMITER = ".";
-	public static final String CSV_DELIMITER = ",";
-	
-	/**
-	 * Convert Java properties into a Map<String, String>
-	 * <br><br>
-	 * <b>Important:</b> The key/values from properties must be of type String! 
-	 * 
-	 * @param properties
-	 * @return
-	 */
-	public static Map<String, String> concertPropertiesToMap(Properties properties) {
-		return new HashMap<String, String>((Map) properties);
-				
-		//INFO Java8 solution ;)
-		//		return properties.entrySet().stream().collect(
-//			    Collectors.toMap(
-//			            e -> e.getKey().toString(),
-//			            e -> e.getValue().toString()
-//			       )
-//			   );
-		
-	}
-	
-	/**
-	 * Extract the first child of an input key after a the prefix
-	 * 
-	 * @param key Full input key 
-	 * @param prefix Prefix 
-	 * @return Child key {String} if it exists or null
-	 */
-	public static String getFirstChildAfterPrefix(String key, String prefix) {		
-		String idAfterPrefix = removePrefixFromKey(key, prefix);
-		if (idAfterPrefix != null) {
-			int index = idAfterPrefix.indexOf(KEY_DELIMITER);
-			if (index > 0) {
-				String adding = idAfterPrefix.substring(0, index);
-				if (!(adding.isEmpty())) {
-					return adding;
-					
-				}
-			} else if (!(idAfterPrefix.isEmpty())) {
-				return idAfterPrefix;
-				
-			}
-			
-		}					
-		return null;
-	}
-	
-	/**
-	 * Extract the prefix from an input key
-	 * 
-	 * @param key Full input key
-	 * @param suffix Suffix of this key
-	 * @return Prefix {String} of the key or null if input key does not ends with postfix string 
-	 */
-	public static String getPrefixFromKey(String key, String suffix) {
-		if (key != null && key.endsWith(suffix)) {
-			String idPreforeSuffix = key.substring(0, key.length()-suffix.length());			
-			if (idPreforeSuffix.endsWith(KEY_DELIMITER))
-				return idPreforeSuffix.substring(0, idPreforeSuffix.length()-1);
-			else
-				return idPreforeSuffix;
-		}
-		return null;
-		
-	}
-	
-	/**
-	 * Remove a prefix string from a key
-	 * 
-	 * @param key Full input key
-	 * @param prefix Prefix, which should be removed
-	 * @return The suffix of the input key or null if the input does not starts with the prefix
-	 */
-	public static String removePrefixFromKey(String key, String prefix) {
-		if (prefix == null)
-			prefix = new String();
-		
-		if (key!=null && key.startsWith(prefix)) {
-			String afterPrefix = key.substring(prefix.length()); 
-			int index = afterPrefix.indexOf(KEY_DELIMITER);
-
-			if (index == 0) {
-				afterPrefix = afterPrefix.substring(1);
-				
-			}
-			return afterPrefix;
-			
-		}		
-		return null;
-	}
-	
-	/**
-	 * Remove a prefix string from all keys in {Map<String, String>} of key/value pairs
-	 * 
-	 * @param keys Input data of key/value pairs
-	 * @param prefix Prefix which should be removed
-	 * @return {Map<String, String>} of key/value pairs without prefix in key, but never null
-	 */
-	public static Map<String, String> removePrefixFromKeys(Map<String, String> keys, String prefix) {
-		Map<String, String> result = new HashMap<String, String>();
-		Iterator<Entry<String, String>> interator = keys.entrySet().iterator();
-		while(interator.hasNext()) {
-			Entry<String, String> el = interator.next();
-			String newKey = removePrefixFromKey(el.getKey(), prefix); 
-			if (MiscUtil.isNotEmpty(newKey)) {
-				result.put(newKey, el.getValue());
-			}			
-		}
-		
-		return result;
-	}
-
-	/**
-	 * Get a subset of key/value pairs which starts with a prefix string
-	 * The Prefix is removed from the key
-	 * 
-	 * @param keys Input data of key/value pairs
-	 * @param prefix Prefix string
-	 * @return {Map<String, String>} of key/value pairs without prefix in key, but never null
-	 */
-	public static Map<String, String> getSubSetWithPrefix(Map<String, String> keys, String prefix) {
-		return removePrefixFromKeys(keys, prefix);
-	}
-	
-	
-	/**
-	 * Add a prefix to key/value pairs to make the key absolute according to key namespace convention
-	 * 
-	 * @param input Input key/value pairs which should be updated
-	 * @param prefix Key prefix, which should be added if the key is not absolute
-	 * @param absolutIdentifier Key identifier, which indicates an absolute key
-	 * @return {Map<String, String>} of key/value pairs in which all keys are absolute but never null
-	 */
-	public static Map<String, String> makeKeysAbsolut(Map<String, String> input, String prefix, String absolutIdentifier) {
-		Map<String, String> result = new HashMap<String, String>();
-		Iterator<Entry<String, String>> interator = input.entrySet().iterator();
-		while(interator.hasNext()) {
-			Entry<String, String> el = interator.next();
-			if (!el.getKey().startsWith(absolutIdentifier)) {
-				//key is not absolute -> add prefix
-				result.put(prefix 
-						+ KEY_DELIMITER
-						+ el.getKey(), 
-						el.getValue());
-								
-			} else {
-				//key is absolute
-				result.put(el.getKey(), el.getValue());
-			}
-		}
-		return result;
-	}
-	
-	/**
-	 * Get the parent key string from an input key
-	 * 
-	 * @param key input key
-	 * @return parent key or the empty String if no parent exists
-	 */
-	public static String getParentKey(String key) {
-		if (MiscUtil.isNotEmpty(key)) {
-			int index = key.lastIndexOf(KEY_DELIMITER);
-			if (index > 0) {
-				return key.substring(0, index);
-				
-			}			
-		}
-		
-		return new String();
-	}
-
-	/**
-	 * Find the highest free list counter
-	 * 
-	 * @param input Array of list keys
-	 * @param listPrefix {String} prefix of the list
-	 * @return {int} highest free list counter
-	 */
-	public static int findNextFreeListCounter(String[] input,
-			String listPrefix) {
-		List<Integer> counters = new ArrayList<Integer>();
-		if (input == null || input.length == 0)
-			return 0;
-		
-		else {
-			for (String key : input) {
-				String listIndex = getFirstChildAfterPrefix(key, listPrefix);
-				counters.add(Integer.parseInt(listIndex));
-			
-			}		
-			Collections.sort(counters);		
-			return counters.get(counters.size()-1) + 1;
-		}
-	}
-
-	/**
-	 * Find the highest free list counter
-	 * 
-	 * @param keySet {Set<String>} of list keys
-	 * @param listPrefix {String} prefix of the list
-	 * @return {int} highest free list counter
-	 */
-	public static int findNextFreeListCounter(Set<String> keySet,
-			String listPrefix) {
-		if (keySet.isEmpty())
-			return 0;
-		
-		String[] array = new String[keySet.size()];
-		keySet.toArray(array);
-		return findNextFreeListCounter(array, listPrefix);
-	}
-	
-	
-	/**
-	 * Normalize a CSV encoded list of value of an key/value pair
-	 * 
-	 * This method removes all whitespace at the begin or the 
-	 * end of CSV values and remove newLine signs at the end of value.
-	 * The ',' is used as list delimiter
-	 * 
-	 * @param value CSV encoded input data
-	 * @return normalized CSV encoded data or null if {value} is null or empty
-	 */
-	public static String normalizeCSVValueString(String value) {
-		String normalizedCodes = null;
-		if (MiscUtil.isNotEmpty(value)) {			
-			String[] codes = value.split(CSV_DELIMITER);
-			for (String el: codes) {
-				if (normalizedCodes == null)
-					normalizedCodes = StringUtils.chomp(el.trim());
-				else
-					normalizedCodes += "," + StringUtils.chomp(el.trim());
-				
-			}
-		}
-		return normalizedCodes;
-	}
-	
-	
-	/**
-	 * Check a String if it is a comma separated list of values
-	 * 
-	 * This method uses the ',' as list delimiter.
-	 * 
-	 * @param value CSV encoded input data
-	 * @return true if the input data contains a ',' and has more then 1 list element, otherwise false
-	 */
-	public static boolean isCSVValueString(String value) {
-		if (MiscUtil.isNotEmpty(value)) {			
-			String[] codes = value.split(CSV_DELIMITER);
-			if (codes.length >= 2) {
-				if (MiscUtil.isNotEmpty(codes[1].trim()))
-					return true;
-				
-			}			
-		}
-		
-		return false;
-	}
-	
-	/**
-	 * Convert a CSV list to a List of CSV values
-	 * <br><br>
-	 * This method removes all whitespace at the begin or the 
-	 * end of CSV values and remove newLine signs at the end of value.
-	 * The ',' is used as list delimiter
-	 * 
-	 * @param csv CSV encoded input data
-	 * @return List of CSV normalized values, but never null
-	 */
-	public static List<String> getListOfCSVValues(String csv) {
-		List<String> list = new ArrayList<String>();
-		if (MiscUtil.isNotEmpty(csv)) {		
-			String[] values = csv.split(CSV_DELIMITER);
-			for (String el: values)
-				list.add(el.trim());
-		
-		}
-		
-		return list;
-	}
-	
-	/**
-	 * This method remove all newline delimiter (\n or \r\n) from input data
-	 * 
-	 * @param value Input String
-	 * @return Input String without newline characters
-	 */
-	public static String removeAllNewlineFromString(String value) {
-		return value.replaceAll("(\\t|\\r?\\n)+", "");
-		
-	}
-	
-}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAIDMessageProvider.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAIDMessageProvider.java
deleted file mode 100644
index 4d8a07a55..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAIDMessageProvider.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.
- ******************************************************************************/
-/*
- * Copyright 2003 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.commons.utils;
-
-import java.util.Locale;
-
-import at.gv.egovernment.moa.util.Messages;
-
-/**
- * A singleton wrapper around a <code>Message</code> object, providing the messages used in MOA-ID.
- * 
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class MOAIDMessageProvider {
-  
-  /** DEFAULT_MESSAGE_RESOURCES are resources/properties/id_messages */
-  private static final String[] DEFAULT_MESSAGE_RESOURCES =
-    { "resources/properties/id_messages" };
-  /** DEFAULT_MESSAGE_LOCALES are "de", "AT" */  
-  private static final Locale[] DEFAULT_MESSAGE_LOCALES =
-    new Locale[] { new Locale("de", "AT") };
-   /** The instance for our singleton */  
-  private static MOAIDMessageProvider instance;
-  /** The Messages */
-  private Messages messages;
-  
-  /**
-   * Returns the single instance of <code>MOAIDMessageProvider</code>.
-   * 
-   * @return the single instance of <code>MOAIDMessageProvider</code>
-   */
-  public static MOAIDMessageProvider getInstance() {
-    if (instance == null)
-      instance = new MOAIDMessageProvider(DEFAULT_MESSAGE_RESOURCES, DEFAULT_MESSAGE_LOCALES);
-    return instance;
-  }
-  
-  /**
-   * Create a <code>MOAIDMessageProvider</code>.
-   * 
-   * @param resourceNames The names of the resources containing the messages.
-   * @param locales The corresponding locales.
-   */
-  protected MOAIDMessageProvider(String[] resourceNames, Locale[] locales) {
-    this.messages = new Messages(resourceNames, locales);
-  }
-  
-  /**
-   * Get the message corresponding to a given message ID.
-   *
-   * @param messageId The ID of the message.
-   * @param parameters The parameters to fill in into the message arguments.
-   * @return The formatted message. 
-   */
-  public String getMessage(String messageId, Object[] parameters) {
-    return messages.getMessage(messageId, parameters);
-  }
-
-}