some code code-style modifications

active code-quality checks!

11 files changed, 851 insertions, 941 deletions

diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EAAFConfigConstants.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafConfigConstants.java
index d3529592..99537ffa 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EAAFConfigConstants.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafConfigConstants.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
  * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a
  * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology.
  *
@@ -11,18 +11,15 @@
  * 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.egiz.eaaf.core.api.data;
 
-public class EAAFConfigConstants {
+public class EaafConfigConstants {
 
   public static final String SERVICE_UNIQUEIDENTIFIER = "uniqueID"; // publicURLPrefix
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EAAFConstants.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafConstants.java
index dda3703a..8a5c9cb1 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EAAFConstants.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafConstants.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
  * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a
  * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology.
  *
@@ -11,19 +11,15 @@
  * 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.egiz.eaaf.core.api.data;
+*/
 
+package at.gv.egiz.eaaf.core.api.data;
 
-public class EAAFConstants {
+public class EaafConstants {
 
   public static final String CONTENTTYPE_HTML_UTF8 = "text/html; charset=UTF-8";
 
@@ -32,7 +28,6 @@ public class EAAFConstants {
   public static final String PARAM_HTTP_ERROR_CODE = "errorid";
   public static final String PARAM_HTTP_STOP_PROCESS = "stopAuthProcess";
 
-
   public static final String EIDAS_LOA_PREFIX = "http://eidas.europa.eu/LoA/";
   public static final String EIDAS_LOA_LOW = EIDAS_LOA_PREFIX + "low";
   public static final String EIDAS_LOA_SUBSTANTIAL = EIDAS_LOA_PREFIX + "substantial";
@@ -45,7 +40,6 @@ public class EAAFConstants {
   public static final String URN_PART_WBPK = "wbpk+";
   public static final String URN_PART_EIDAS = "eidasid+";
 
-
   public static final String URN_PREFIX = "urn:publicid:gv.at";
   public static final String URN_PREFIX_BASEID = URN_PREFIX + ":baseid";
   public static final String URN_PREFIX_CDID = URN_PREFIX + ":cdid+";
@@ -54,21 +48,17 @@ public class EAAFConstants {
   public static final String URN_PREFIX_EIDAS = URN_PREFIX + ":" + URN_PART_EIDAS;
   public static final String URN_PREFIX_OW_BPK = URN_PREFIX_CDID + "OW";
 
-
   // Authentication process data_constants
   public static final String UNIQUESESSIONIDENTIFIER = "eaaf_uniqueSessionIdentifier";
   public static final String AUTH_DATA_CREATED = "eaaf_authdata_created";
 
-
   public static final String PROCESS_ENGINE_PREFIX = "PARAMS_";
-  public static final String PROCESS_ENGINE_PENDINGREQUESTID =
-      PROCESS_ENGINE_PREFIX + PARAM_HTTP_TARGET_PENDINGREQUESTID;
-  public static final String PROCESS_ENGINE_SERVICE_PROVIDER_ENTITYID =
-      PROCESS_ENGINE_PREFIX + "uniqueSPId";
-  public static final String PROCESS_ENGINE_SSL_CLIENT_CERTIFICATE =
-      PROCESS_ENGINE_PREFIX + "holderofkey_cert";
-  public static final String PROCESS_ENGINE_REQUIRES_NO_POSTAUTH_REDIRECT =
-      PROCESS_ENGINE_PREFIX + "requireNoPostAuthRedirect";
+  public static final String PROCESS_ENGINE_PENDINGREQUESTID = PROCESS_ENGINE_PREFIX
+      + PARAM_HTTP_TARGET_PENDINGREQUESTID;
+  public static final String PROCESS_ENGINE_SERVICE_PROVIDER_ENTITYID = PROCESS_ENGINE_PREFIX + "uniqueSPId";
+  public static final String PROCESS_ENGINE_SSL_CLIENT_CERTIFICATE = PROCESS_ENGINE_PREFIX + "holderofkey_cert";
+  public static final String PROCESS_ENGINE_REQUIRES_NO_POSTAUTH_REDIRECT = PROCESS_ENGINE_PREFIX
+      + "requireNoPostAuthRedirect";
   public static final String PROCESSCONTEXT_SWITCH_LANGUAGE = "changeLanguage";
 
   public static final int ALLOWED_TIME_JITTER = 5; // minutes
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EAAFEventCodes.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafEventCodes.java
index e25c05b5..74f79239 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EAAFEventCodes.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafEventCodes.java
@@ -1,5 +1,5 @@
 package at.gv.egiz.eaaf.core.api.data;
 
-public class EAAFEventCodes {
+public class EaafEventCodes {
   public static final int PROCESS_STOPPED_BY_USER = 4102;
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExceptionContainer.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExceptionContainer.java
index 69268562..80c7094c 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExceptionContainer.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExceptionContainer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
  * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a
  * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology.
  *
@@ -11,15 +11,12 @@
  * 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.egiz.eaaf.core.api.data;
 
 import java.io.Serializable;
@@ -27,6 +24,8 @@ import java.io.Serializable;
 import at.gv.egiz.eaaf.core.api.IRequest;
 
 /**
+ * AuthProcess exception containter for Front-Channel exception handling.
+ *
  * @author tlenz
  *
  */
@@ -36,9 +35,11 @@ public class ExceptionContainer implements Serializable {
   private Throwable exceptionThrown = null;
   private IRequest pendingReq = null;
 
-
   /**
+   * Create an exception container.
    * 
+   * @param pendingReq Pending request that has an exception
+   * @param exception  error
    */
   public ExceptionContainer(final IRequest pendingReq, final Throwable exception) {
     this.pendingReq = pendingReq;
@@ -47,6 +48,8 @@ public class ExceptionContainer implements Serializable {
   }
 
   /**
+   * Get the error.
+   *
    * @return the exceptionThrown
    */
   public Throwable getExceptionThrown() {
@@ -59,6 +62,8 @@ public class ExceptionContainer implements Serializable {
   }
 
   /**
+   * Get the unique sessionId for this error.
+   *
    * @return the uniqueSessionID
    */
   public String getUniqueSessionID() {
@@ -70,6 +75,8 @@ public class ExceptionContainer implements Serializable {
   }
 
   /**
+   * Get the unique transactionId for this error.
+   *
    * @return the uniqueTransactionID
    */
   public String getUniqueTransactionID() {
@@ -81,6 +88,8 @@ public class ExceptionContainer implements Serializable {
   }
 
   /**
+   * Get the service-provider identifier.
+   *
    * @return the uniqueServiceProviderId
    */
   public String getUniqueServiceProviderId() {
@@ -91,6 +100,4 @@ public class ExceptionContainer implements Serializable {
     }
   }
 
-
-
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPVPAttributeDefinitions.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPVPAttributeDefinitions.java
deleted file mode 100644
index b895ab7d..00000000
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPVPAttributeDefinitions.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a
- * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 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:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * 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.egiz.eaaf.core.api.data;
-
-public interface ExtendedPVPAttributeDefinitions extends PVPAttributeDefinitions {
-
-   String SP_UNIQUEID_NAME = "urn:eidgvat:attributes.ServiceProviderUniqueId";
-   String SP_UNIQUEID_FRIENDLY_NAME = "ServiceProvider-UniqueId";
-
-   String SP_FRIENDLYNAME_NAME =
-      "urn:eidgvat:attributes.ServiceProviderFriendlyName";
-   String SP_FRIENDLYNAME_FRIENDLY_NAME = "ServiceProvider-FriendlyName";
-
-   String SP_COUNTRYCODE_NAME =
-      "urn:eidgvat:attributes.ServiceProviderCountryCode";
-   String SP_COUNTRYCODE_FRIENDLY_NAME = "ServiceProvider-CountryCode";
-
-   String SP_USESMANDATES_NAME =
-      "urn:eidgvat:attributes.ServiceProviderMandateProfiles";
-   String SP_USESMANDATES_FRIENDLY_NAME = "ServiceProvider-MandateProfiles";
-
-  /* Attributes for E-ID */
-   String EID_ENCRYPTED_SOURCEID_NAME = "urn:eidgvat:attributes.vsz.value";
-   String EID_ENCRYPTED_SOURCEID_FRIENDLY_NAME = "vSZ";
-
-   String EID_ENCRYPTED_SOURCEID_TYPE_NAME = "urn:eidgvat:attributes.vsz.type";
-   String EID_ENCRYPTED_SOURCEID_TYPE_FRIENDLY_NAME = "vSZ-Type";
-
-
-}
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPvpAttributeDefinitions.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPvpAttributeDefinitions.java
new file mode 100644
index 00000000..f5865067
--- /dev/null
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPvpAttributeDefinitions.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a
+ * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 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:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * 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.egiz.eaaf.core.api.data;
+
+public interface ExtendedPvpAttributeDefinitions extends PvpAttributeDefinitions {
+
+  String SP_UNIQUEID_NAME = "urn:eidgvat:attributes.ServiceProviderUniqueId";
+  String SP_UNIQUEID_FRIENDLY_NAME = "ServiceProvider-UniqueId";
+
+  String SP_FRIENDLYNAME_NAME = "urn:eidgvat:attributes.ServiceProviderFriendlyName";
+  String SP_FRIENDLYNAME_FRIENDLY_NAME = "ServiceProvider-FriendlyName";
+
+  String SP_COUNTRYCODE_NAME = "urn:eidgvat:attributes.ServiceProviderCountryCode";
+  String SP_COUNTRYCODE_FRIENDLY_NAME = "ServiceProvider-CountryCode";
+
+  String SP_USESMANDATES_NAME = "urn:eidgvat:attributes.ServiceProviderMandateProfiles";
+  String SP_USESMANDATES_FRIENDLY_NAME = "ServiceProvider-MandateProfiles";
+
+  /* Attributes for E-ID */
+  String EID_ENCRYPTED_SOURCEID_NAME = "urn:eidgvat:attributes.vsz.value";
+  String EID_ENCRYPTED_SOURCEID_FRIENDLY_NAME = "vSZ";
+
+  String EID_ENCRYPTED_SOURCEID_TYPE_NAME = "urn:eidgvat:attributes.vsz.type";
+  String EID_ENCRYPTED_SOURCEID_TYPE_FRIENDLY_NAME = "vSZ-Type";
+
+}
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ILoALevelMapper.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ILoALevelMapper.java
index 3abf39e7..91fb1bf7 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ILoALevelMapper.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ILoALevelMapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
  * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a
  * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology.
  *
@@ -11,42 +11,38 @@
  * 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.egiz.eaaf.core.api.data;
 
 public interface ILoALevelMapper {
 
   /**
-   * Map an arbitrary QAA level to eIDAS LoA
-   * 
-   * @param qaa, but not null
+   * Map an arbitrary QAA level to eIDAS LoA.
+   *
+   * @param qaa but not null
    * @return An eIDAS LoA if there is a mapping, otherwise null
    */
-  String mapToeIDASLoA(String qaa);
+  String mapToEidasLoa(String qaa);
 
   /**
-   * Map an arbitrary QAA level to PVP SecClass
-   * 
-   * @param qaa, but not null
+   * Map an arbitrary QAA level to PVP SecClass.
+   *
+   * @param qaa but not null
    * @return A PVP SecClass if there is a mapping, otherwise null
    */
   String mapToSecClass(String qaa);
 
-
   /**
-   * Map an an arbitrary eIDAS LoA to STORK QAA Level
-   * 
-   * @param eidasqaaLevel
+   * Map an an arbitrary eIDAS LoA to STORK QAA Level.
+   *
+   * @param eidasqaaLevel eIDAS LoA for mapping
    * @return A STORK QAA level
    */
   @Deprecated
-  String mapeIDASQAAToSTORKQAA(String eidasqaaLevel);
+  String mapEidasQaaToStorkQaa(String eidasqaaLevel);
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/PVPAttributeDefinitions.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/PVPAttributeDefinitions.java
deleted file mode 100644
index 7604299e..00000000
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/PVPAttributeDefinitions.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*******************************************************************************
- * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a
- * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 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:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * 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.egiz.eaaf.core.api.data;
-
-public interface PVPAttributeDefinitions {
-
-   String URN_OID_PREFIX = "urn:oid:";
-
-   String PVP_VERSION_OID = "1.2.40.0.10.2.1.1.261.10";
-   String PVP_VERSION_NAME = URN_OID_PREFIX + PVP_VERSION_OID;
-   String PVP_VERSION_FRIENDLY_NAME = "PVP-VERSION";
-   String PVP_VERSION_2_1 = "2.2";
-
-
-   String SECCLASS_OID = "1.2.40.0.10.2.1.1.261.110";
-   String SECCLASS_FRIENDLY_NAME = "SECCLASS";
-   String SECCLASS_NAME = URN_OID_PREFIX + SECCLASS_OID;
-   int SECCLASS_MAX_LENGTH = 128;
-
-   String PRINCIPAL_NAME_OID = "1.2.40.0.10.2.1.1.261.20";
-   String PRINCIPAL_NAME_NAME = URN_OID_PREFIX + PRINCIPAL_NAME_OID;
-   String PRINCIPAL_NAME_FRIENDLY_NAME = "PRINCIPAL-NAME";
-   int PRINCIPAL_NAME_MAX_LENGTH = 128;
-
-   String GIVEN_NAME_OID = "2.5.4.42";
-   String GIVEN_NAME_NAME = URN_OID_PREFIX + GIVEN_NAME_OID;
-   String GIVEN_NAME_FRIENDLY_NAME = "GIVEN-NAME";
-   int GIVEN_NAME_MAX_LENGTH = 128;
-
-   String BIRTHDATE_OID = "1.2.40.0.10.2.1.1.55";
-   String BIRTHDATE_NAME = URN_OID_PREFIX + BIRTHDATE_OID;
-   String BIRTHDATE_FRIENDLY_NAME = "BIRTHDATE";
-   String BIRTHDATE_FORMAT_PATTERN = "yyyy-MM-dd";
-
-   String USERID_OID = "0.9.2342.19200300.100.1.1";
-   String USERID_NAME = URN_OID_PREFIX + USERID_OID;
-   String USERID_FRIENDLY_NAME = "USERID";
-   int USERID_MAX_LENGTH = 128;
-
-   String GID_OID = "1.2.40.0.10.2.1.1.1";
-   String GID_NAME = URN_OID_PREFIX + GID_OID;
-   String GID_FRIENDLY_NAME = "GID";
-   int GID_MAX_LENGTH = 128;
-
-   String BPK_OID = "1.2.40.0.10.2.1.1.149";
-   String BPK_NAME = URN_OID_PREFIX + BPK_OID;
-   String BPK_FRIENDLY_NAME = "BPK";
-   int BPK_MAX_LENGTH = 1024;
-   String BPK_R_PROFILE21_HEADER = "X-PVP-BPK";
-
-   String BPK_LIST_OID = "1.2.40.0.10.2.1.1.261.28";
-   String BPK_LIST_NAME = URN_OID_PREFIX + BPK_LIST_OID;
-   String BPK_LIST_FRIENDLY_NAME = "BPK-LIST";
-   int BPK_LIST_MAX_LENGTH = 32767;
-
-   String ENC_BPK_LIST_OID = "1.2.40.0.10.2.1.1.261.22";
-   String ENC_BPK_LIST_NAME = URN_OID_PREFIX + ENC_BPK_LIST_OID;
-   String ENC_BPK_LIST_FRIENDLY_NAME = "ENC-BPK-LIST";
-   int ENC_BPK_LIST_MAX_LENGTH = 32767;
-
-   String MAIL_OID = "0.9.2342.19200300.100.1.3";
-   String MAIL_NAME = URN_OID_PREFIX + MAIL_OID;
-   String MAIL_FRIENDLY_NAME = "MAIL";
-   int MAIL_MAX_LENGTH = 128;
-
-   String TEL_OID = "2.5.4.20";
-   String TEL_NAME = URN_OID_PREFIX + TEL_OID;
-   String TEL_FRIENDLY_NAME = "TEL";
-   int TEL_MAX_LENGTH = 32;
-
-   String PARTICIPANT_ID_OID = "1.2.40.0.10.2.1.1.71";
-   String PARTICIPANT_ID_NAME = URN_OID_PREFIX + PARTICIPANT_ID_OID;
-   String PARTICIPANT_ID_FRIENDLY_NAME = "PARTICIPANT-ID";
-   int PARTICIPANT_MAX_LENGTH = 39;
-
-   String PARTICIPANT_OKZ_OID = "1.2.40.0.10.2.1.1.261.24";
-   String PARTICIPANT_OKZ_NAME = URN_OID_PREFIX + PARTICIPANT_OKZ_OID;
-   String PARTICIPANT_OKZ_FRIENDLY_NAME = "PARTICIPANT-OKZ";
-   int PARTICIPANT_OKZ_MAX_LENGTH = 32;
-
-   String OU_OKZ_OID = "1.2.40.0.10.2.1.1.153";
-   String OU_OKZ_NAME = URN_OID_PREFIX + OU_OKZ_OID;
-   int OU_OKZ_MAX_LENGTH = 32;
-
-   String OU_GV_OU_ID_OID = "1.2.40.0.10.2.1.1.3";
-   String OU_GV_OU_ID_NAME = URN_OID_PREFIX + OU_GV_OU_ID_OID;
-   String OU_GV_OU_ID_FRIENDLY_NAME = "OU-GV-OU-ID";
-   int OU_GV_OU_ID_MAX_LENGTH = 39;
-
-   String OU_OID = "2.5.4.11";
-   String OU_NAME = URN_OID_PREFIX + OU_OID;
-   String OU_FRIENDLY_NAME = "OU";
-   int OU_MAX_LENGTH = 64;
-
-   String FUNCTION_OID = "1.2.40.0.10.2.1.1.33";
-   String FUNCTION_NAME = URN_OID_PREFIX + FUNCTION_OID;
-   String FUNCTION_FRIENDLY_NAME = "FUNCTION";
-   int FUNCTION_MAX_LENGTH = 32;
-
-   String ROLES_OID = "1.2.40.0.10.2.1.1.261.30";
-   String ROLES_NAME = URN_OID_PREFIX + ROLES_OID;
-   String ROLES_FRIENDLY_NAME = "ROLES";
-   int ROLES_MAX_LENGTH = 32767;
-
-  @Deprecated
-   String EID_CITIZEN_QAA_LEVEL_OID = "1.2.40.0.10.2.1.1.261.94";
-  @Deprecated
-   String EID_CITIZEN_QAA_LEVEL_NAME =
-      URN_OID_PREFIX + EID_CITIZEN_QAA_LEVEL_OID;
-  @Deprecated
-   String EID_CITIZEN_QAA_LEVEL_FRIENDLY_NAME = "EID-CITIZEN-QAA-LEVEL";
-
-   String EID_CITIZEN_EIDAS_QAA_LEVEL_OID = "1.2.40.0.10.2.1.1.261.108";
-   String EID_CITIZEN_EIDAS_QAA_LEVEL_NAME =
-      URN_OID_PREFIX + EID_CITIZEN_EIDAS_QAA_LEVEL_OID;
-   String EID_CITIZEN_EIDAS_QAA_LEVEL_FRIENDLY_NAME =
-      "EID-CITIZEN-QAA-EIDAS-LEVEL";
-
-   String EID_IDENTITY_STATUS_LEVEL_OID = "1.2.40.0.10.2.1.1.261.109";
-   String EID_IDENTITY_STATUS_LEVEL_NAME =
-      URN_OID_PREFIX + EID_IDENTITY_STATUS_LEVEL_OID;
-   String EID_IDENTITY_STATUS_LEVEL_FRIENDLY_NAME = "EID-IDENTITY-STATUS-LEVEL";
-
-  enum EID_IDENTITY_STATUS_LEVEL_VALUES {
-    IDENTITY("http://eid.gv.at/eID/status/identity"), TESTIDENTITY(
-        "http://eid.gv.at/eID/status/testidentity"), SYSTEM("http://eid.gv.at/eID/status/system");
-
-    private final String uri;
-
-    EID_IDENTITY_STATUS_LEVEL_VALUES(final String uri) {
-      this.uri = uri;
-    }
-
-    /**
-     * Get the URI based status identifier of an E-ID
-     * 
-     * @return
-     */
-    public String getURI() {
-      return this.uri;
-    }
-  }
-
-   String EID_ISSUING_NATION_OID = "1.2.40.0.10.2.1.1.261.32";
-   String EID_ISSUING_NATION_NAME = URN_OID_PREFIX + EID_ISSUING_NATION_OID;
-   String EID_ISSUING_NATION_FRIENDLY_NAME = "EID-ISSUING-NATION";
-   int EID_ISSUING_NATION_MAX_LENGTH = 2;
-
-   String EID_SECTOR_FOR_IDENTIFIER_OID = "1.2.40.0.10.2.1.1.261.34";
-   String EID_SECTOR_FOR_IDENTIFIER_NAME =
-      URN_OID_PREFIX + EID_SECTOR_FOR_IDENTIFIER_OID;
-   String EID_SECTOR_FOR_IDENTIFIER_FRIENDLY_NAME = "EID-SECTOR-FOR-IDENTIFIER";
-   int EID_SECTOR_FOR_IDENTIFIER_MAX_LENGTH = 255;
-
-  @Deprecated
-   String EID_SOURCE_PIN_OID = "1.2.40.0.10.2.1.1.261.36";
-  @Deprecated
-   String EID_SOURCE_PIN_NAME = URN_OID_PREFIX + EID_SOURCE_PIN_OID;
-  @Deprecated
-   String EID_SOURCE_PIN_FRIENDLY_NAME = "EID-SOURCE-PIN";
-  @Deprecated
-   int EID_SOURCE_PIN_MAX_LENGTH = 128;
-
-  @Deprecated
-   String EID_SOURCE_PIN_TYPE_OID = "1.2.40.0.10.2.1.1.261.104";
-  @Deprecated
-   String EID_SOURCE_PIN_TYPE_NAME = URN_OID_PREFIX + EID_SOURCE_PIN_TYPE_OID;
-  @Deprecated
-   String EID_SOURCE_PIN_TYPE_FRIENDLY_NAME = "EID-SOURCE-PIN-TYPE";
-  @Deprecated
-   int EID_SOURCE_PIN_TYPE_MAX_LENGTH = 128;
-
-  @Deprecated
-   String EID_IDENTITY_LINK_OID = "1.2.40.0.10.2.1.1.261.38";
-  @Deprecated
-   String EID_IDENTITY_LINK_NAME = URN_OID_PREFIX + EID_IDENTITY_LINK_OID;
-  @Deprecated
-   String EID_IDENTITY_LINK_FRIENDLY_NAME = "EID-IDENTITY-LINK";
-  @Deprecated
-   int EID_IDENTITY_LINK_MAX_LENGTH = 32767;
-
-   String EID_E_ID_TOKEN_OID = "1.2.40.0.10.2.1.1.261.39";
-   String EID_E_ID_TOKEN_NAME = URN_OID_PREFIX + EID_E_ID_TOKEN_OID;
-   String EID_E_ID_TOKEN_FRIENDLY_NAME = "EID-E-ID-TOKEN";
-   int EID_E_ID_TOKEN_MAX_LENGTH = 32767;
-
-  @Deprecated
-   String EID_AUTH_BLOCK_OID = "1.2.40.0.10.2.1.1.261.62";
-  @Deprecated
-   String EID_AUTH_BLOCK_NAME = URN_OID_PREFIX + EID_AUTH_BLOCK_OID;
-  @Deprecated
-   String EID_AUTH_BLOCK_FRIENDLY_NAME = "EID-AUTH-BLOCK";
-  @Deprecated
-   int EID_AUTH_BLOCK_MAX_LENGTH = 32767;
-
-   String EID_CCS_URL_OID = "1.2.40.0.10.2.1.1.261.64";
-   String EID_CCS_URL_NAME = URN_OID_PREFIX + EID_CCS_URL_OID;
-   String EID_CCS_URL_FRIENDLY_NAME = "EID-CCS-URL";
-   int EID_CCS_URL_MAX_LENGTH = 1024;
-
-   String EID_SIGNER_CERTIFICATE_OID = "1.2.40.0.10.2.1.1.261.66";
-   String EID_SIGNER_CERTIFICATE_NAME =
-      URN_OID_PREFIX + EID_SIGNER_CERTIFICATE_OID;
-   String EID_SIGNER_CERTIFICATE_FRIENDLY_NAME = "EID-SIGNER-CERTIFICATE";
-   int EID_SIGNER_CERTIFICATE_MAX_LENGTH = 32767;
-
-  @Deprecated
-   String EID_STORK_TOKEN_OID = "1.2.40.0.10.2.1.1.261.96";
-  @Deprecated
-   String EID_STORK_TOKEN_NAME = URN_OID_PREFIX + EID_STORK_TOKEN_OID;
-  @Deprecated
-   String EID_STORK_TOKEN_FRIENDLY_NAME = "EID-STORK-TOKEN";
-  @Deprecated
-   int EID_STORK_TOKEN_MAX_LENGTH = 32767;
-
-   String MANDATE_TYPE_OID = "1.2.40.0.10.2.1.1.261.68";
-   String MANDATE_TYPE_NAME = URN_OID_PREFIX + MANDATE_TYPE_OID;
-   String MANDATE_TYPE_FRIENDLY_NAME = "MANDATE-TYPE";
-   int MANDATE_TYPE_MAX_LENGTH = 256;
-
-   String MANDATE_TYPE_OID_OID = "1.2.40.0.10.2.1.1.261.106";
-   String MANDATE_TYPE_OID_NAME = URN_OID_PREFIX + MANDATE_TYPE_OID_OID;
-   String MANDATE_TYPE_OID_FRIENDLY_NAME = "MANDATE-TYPE-OID";
-   int MANDATE_TYPE_OID_MAX_LENGTH = 256;
-
-  @Deprecated
-   String MANDATE_NAT_PER_SOURCE_PIN_OID = "1.2.40.0.10.2.1.1.261.70";
-  @Deprecated
-   String MANDATE_NAT_PER_SOURCE_PIN_NAME =
-      URN_OID_PREFIX + MANDATE_NAT_PER_SOURCE_PIN_OID;
-  @Deprecated
-   String MANDATE_NAT_PER_SOURCE_PIN_FRIENDLY_NAME =
-      "MANDATOR-NATURAL-PERSON-SOURCE-PIN";
-  @Deprecated
-   int MANDATE_NAT_PER_SOURCE_PIN_MAX_LENGTH = 128;
-
-   String MANDATE_LEG_PER_SOURCE_PIN_OID = "1.2.40.0.10.2.1.1.261.100";
-   String MANDATE_LEG_PER_SOURCE_PIN_NAME =
-      URN_OID_PREFIX + MANDATE_LEG_PER_SOURCE_PIN_OID;
-   String MANDATE_LEG_PER_SOURCE_PIN_FRIENDLY_NAME =
-      "MANDATOR-LEGAL-PERSON-SOURCE-PIN";
-   int MANDATE_LEG_PER_SOURCE_PIN_MAX_LENGTH = 128;
-
-  @Deprecated
-   String MANDATE_NAT_PER_SOURCE_PIN_TYPE_OID = "1.2.40.0.10.2.1.1.261.102";
-  @Deprecated
-   String MANDATE_NAT_PER_SOURCE_PIN_TYPE_NAME =
-      URN_OID_PREFIX + MANDATE_NAT_PER_SOURCE_PIN_TYPE_OID;
-  @Deprecated
-   String MANDATE_NAT_PER_SOURCE_PIN_TYPE_FRIENDLY_NAME =
-      "MANDATOR-NATURAL-PERSON-SOURCE-PIN-TYPE";
-  @Deprecated
-   int MANDATE_NAT_PER_SOURCE_PIN_TYPE_MAX_LENGTH = 128;
-
-   String MANDATE_LEG_PER_SOURCE_PIN_TYPE_OID = "1.2.40.0.10.2.1.1.261.76";
-   String MANDATE_LEG_PER_SOURCE_PIN_TYPE_NAME =
-      URN_OID_PREFIX + MANDATE_LEG_PER_SOURCE_PIN_TYPE_OID;
-   String MANDATE_LEG_PER_SOURCE_PIN_TYPE_FRIENDLY_NAME =
-      "MANDATOR-LEGAL-PERSON-SOURCE-PIN-TYPE";
-   int MANDATE_LEG_PER_SOURCE_PIN_TYPE_MAX_LENGTH = 128;
-
-   String MANDATE_NAT_PER_BPK_OID = "1.2.40.0.10.2.1.1.261.98";
-   String MANDATE_NAT_PER_BPK_NAME = URN_OID_PREFIX + MANDATE_NAT_PER_BPK_OID;
-   String MANDATE_NAT_PER_BPK_FRIENDLY_NAME = "MANDATOR-NATURAL-PERSON-BPK";
-   int MANDATE_NAT_PER_BPK_MAX_LENGTH = 1024;
-
-   String MANDATE_NAT_PER_BPK_LIST_OID = "1.2.40.0.10.2.1.1.261.73";
-   String MANDATE_NAT_PER_BPK_LIST_NAME =
-      URN_OID_PREFIX + MANDATE_NAT_PER_BPK_LIST_OID;
-   String MANDATE_NAT_PER_BPK_LIST_FRIENDLY_NAME =
-      "MANDATOR-NATURAL-PERSON-BPK-LIST";
-   int MANDATE_NAT_PER_ENC_LIST_MAX_LENGTH = 32767;
-
-   String MANDATE_NAT_PER_ENC_BPK_LIST_OID = "1.2.40.0.10.2.1.1.261.72";
-   String MANDATE_NAT_PER_ENC_BPK_LIST_NAME =
-      URN_OID_PREFIX + MANDATE_NAT_PER_ENC_BPK_LIST_OID;
-   String MANDATE_NAT_PER_ENC_BPK_LIST_FRIENDLY_NAME =
-      "MANDATOR-NATURAL-PERSON-ENC-BPK-LIST";
-   int MANDATE_NAT_PER_ENC_BPK_LIST_MAX_LENGTH = 32767;
-
-   String MANDATE_NAT_PER_GIVEN_NAME_OID = "1.2.40.0.10.2.1.1.261.78";
-   String MANDATE_NAT_PER_GIVEN_NAME_NAME =
-      URN_OID_PREFIX + MANDATE_NAT_PER_GIVEN_NAME_OID;
-   String MANDATE_NAT_PER_GIVEN_NAME_FRIENDLY_NAME =
-      "MANDATOR-NATURAL-PERSON-GIVEN-NAME";
-   int MANDATE_NAT_PER_GIVEN_NAME_MAX_LENGTH = 128;
-
-   String MANDATE_NAT_PER_FAMILY_NAME_OID = "1.2.40.0.10.2.1.1.261.80";
-   String MANDATE_NAT_PER_FAMILY_NAME_NAME =
-      URN_OID_PREFIX + MANDATE_NAT_PER_FAMILY_NAME_OID;
-   String MANDATE_NAT_PER_FAMILY_NAME_FRIENDLY_NAME =
-      "MANDATOR-NATURAL-PERSON-FAMILY-NAME";
-   int MANDATE_NAT_PER_FAMILY_NAME_MAX_LENGTH = 128;
-
-   String MANDATE_NAT_PER_BIRTHDATE_OID = "1.2.40.0.10.2.1.1.261.82";
-   String MANDATE_NAT_PER_BIRTHDATE_NAME =
-      URN_OID_PREFIX + MANDATE_NAT_PER_BIRTHDATE_OID;
-   String MANDATE_NAT_PER_BIRTHDATE_FRIENDLY_NAME =
-      "MANDATOR-NATURAL-PERSON-BIRTHDATE";
-   String MANDATE_NAT_PER_BIRTHDATE_FORMAT_PATTERN = BIRTHDATE_FORMAT_PATTERN;
-
-   String MANDATE_LEG_PER_FULL_NAME_OID = "1.2.40.0.10.2.1.1.261.84";
-   String MANDATE_LEG_PER_FULL_NAME_NAME =
-      URN_OID_PREFIX + MANDATE_LEG_PER_FULL_NAME_OID;
-   String MANDATE_LEG_PER_FULL_NAME_FRIENDLY_NAME =
-      "MANDATOR-LEGAL-PERSON-FULL-NAME";
-   int MANDATE_LEG_PER_FULL_NAME_MAX_LENGTH = 256;
-
-   String MANDATE_PROF_REP_OID_OID = "1.2.40.0.10.2.1.1.261.86";
-   String MANDATE_PROF_REP_OID_NAME = URN_OID_PREFIX + MANDATE_PROF_REP_OID_OID;
-   String MANDATE_PROF_REP_OID_FRIENDLY_NAME = "MANDATE-PROF-REP-OID";
-   int MANDATE_PROF_REP_OID_MAX_LENGTH = 256;
-
-   String MANDATE_PROF_REP_DESC_OID = "1.2.40.0.10.2.1.1.261.88";
-   String MANDATE_PROF_REP_DESC_NAME =
-      URN_OID_PREFIX + MANDATE_PROF_REP_DESC_OID;
-   String MANDATE_PROF_REP_DESC_FRIENDLY_NAME = "MANDATE-PROF-REP-DESCRIPTION";
-   int MANDATE_PROF_REP_DESC_MAX_LENGTH = 1024;
-
-   String MANDATE_REFERENCE_VALUE_OID = "1.2.40.0.10.2.1.1.261.90";
-   String MANDATE_REFERENCE_VALUE_NAME =
-      URN_OID_PREFIX + MANDATE_REFERENCE_VALUE_OID;
-   String MANDATE_REFERENCE_VALUE_FRIENDLY_NAME = "MANDATE-REFERENCE-VALUE";
-   int MANDATE_REFERENCE_VALUE_MAX_LENGTH = 100;
-
-   String MANDATE_IDENTIFIER_OID = "1.2.40.0.10.2.1.1.261.91";
-   String MANDATE_IDENTIFIER_FRIENDLY_NAME = "MANDATE-IDENTIFIER";
-   String MANDATE_IDENTIFIER_NAME = URN_OID_PREFIX + MANDATE_IDENTIFIER_OID;
-   int MANDATE_IDENTIFIER_MAX_LENGTH = 256;
-
-
-  @Deprecated
-   String MANDATE_FULL_MANDATE_OID = "1.2.40.0.10.2.1.1.261.92";
-  @Deprecated
-   String MANDATE_FULL_MANDATE_NAME = URN_OID_PREFIX + MANDATE_FULL_MANDATE_OID;
-  @Deprecated
-   String MANDATE_FULL_MANDATE_FRIENDLY_NAME = "MANDATE-FULL-MANDATE";
-  @Deprecated
-   int MANDATE_FULL_MANDATE_MAX_LENGTH = 32767;
-
-   String INVOICE_RECPT_ID_OID = "1.2.40.0.10.2.1.1.261.40";
-   String INVOICE_RECPT_ID_NAME = URN_OID_PREFIX + INVOICE_RECPT_ID_OID;
-   String INVOICE_RECPT_ID_FRIENDLY_NAME = "INVOICE-RECPT-ID";
-   int INVOICE_RECPT_ID_MAX_LENGTH = 64;
-
-   String COST_CENTER_ID_OID = "1.2.40.0.10.2.1.1.261.50";
-   String COST_CENTER_ID_NAME = URN_OID_PREFIX + COST_CENTER_ID_OID;
-   String COST_CENTER_ID_FRIENDLY_NAME = "COST-CENTER-ID";
-   int COST_CENTER_ID_MAX_LENGTH = 32767;
-
-   String CHARGE_CODE_OID = "1.2.40.0.10.2.1.1.261.60";
-   String CHARGE_CODE_NAME = URN_OID_PREFIX + CHARGE_CODE_OID;
-   String CHARGE_CODE_FRIENDLY_NAME = "CHARGE-CODE";
-   int CHARGE_CODE_MAX_LENGTH = 32767;
-
-   String PVP_HOLDEROFKEY_OID = "1.2.40.0.10.2.1.1.261.xx.xx";
-   String PVP_HOLDEROFKEY_NAME = URN_OID_PREFIX + PVP_HOLDEROFKEY_OID;
-   String PVP_HOLDEROFKEY_FRIENDLY_NAME = "HOLDER-OF-KEY-CERTIFICATE";
-
-}
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/PvpAttributeDefinitions.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/PvpAttributeDefinitions.java
new file mode 100644
index 00000000..2a9a8317
--- /dev/null
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/PvpAttributeDefinitions.java
@@ -0,0 +1,347 @@
+/*
+ * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a
+ * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 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:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * 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.egiz.eaaf.core.api.data;
+
+public interface PvpAttributeDefinitions {
+
+  String URN_OID_PREFIX = "urn:oid:";
+
+  String PVP_VERSION_OID = "1.2.40.0.10.2.1.1.261.10";
+  String PVP_VERSION_NAME = URN_OID_PREFIX + PVP_VERSION_OID;
+  String PVP_VERSION_FRIENDLY_NAME = "PVP-VERSION";
+  String PVP_VERSION_2_1 = "2.2";
+
+  String SECCLASS_OID = "1.2.40.0.10.2.1.1.261.110";
+  String SECCLASS_FRIENDLY_NAME = "SECCLASS";
+  String SECCLASS_NAME = URN_OID_PREFIX + SECCLASS_OID;
+  int SECCLASS_MAX_LENGTH = 128;
+
+  String PRINCIPAL_NAME_OID = "1.2.40.0.10.2.1.1.261.20";
+  String PRINCIPAL_NAME_NAME = URN_OID_PREFIX + PRINCIPAL_NAME_OID;
+  String PRINCIPAL_NAME_FRIENDLY_NAME = "PRINCIPAL-NAME";
+  int PRINCIPAL_NAME_MAX_LENGTH = 128;
+
+  String GIVEN_NAME_OID = "2.5.4.42";
+  String GIVEN_NAME_NAME = URN_OID_PREFIX + GIVEN_NAME_OID;
+  String GIVEN_NAME_FRIENDLY_NAME = "GIVEN-NAME";
+  int GIVEN_NAME_MAX_LENGTH = 128;
+
+  String BIRTHDATE_OID = "1.2.40.0.10.2.1.1.55";
+  String BIRTHDATE_NAME = URN_OID_PREFIX + BIRTHDATE_OID;
+  String BIRTHDATE_FRIENDLY_NAME = "BIRTHDATE";
+  String BIRTHDATE_FORMAT_PATTERN = "yyyy-MM-dd";
+
+  String USERID_OID = "0.9.2342.19200300.100.1.1";
+  String USERID_NAME = URN_OID_PREFIX + USERID_OID;
+  String USERID_FRIENDLY_NAME = "USERID";
+  int USERID_MAX_LENGTH = 128;
+
+  String GID_OID = "1.2.40.0.10.2.1.1.1";
+  String GID_NAME = URN_OID_PREFIX + GID_OID;
+  String GID_FRIENDLY_NAME = "GID";
+  int GID_MAX_LENGTH = 128;
+
+  String BPK_OID = "1.2.40.0.10.2.1.1.149";
+  String BPK_NAME = URN_OID_PREFIX + BPK_OID;
+  String BPK_FRIENDLY_NAME = "BPK";
+  int BPK_MAX_LENGTH = 1024;
+  String BPK_R_PROFILE21_HEADER = "X-PVP-BPK";
+
+  String BPK_LIST_OID = "1.2.40.0.10.2.1.1.261.28";
+  String BPK_LIST_NAME = URN_OID_PREFIX + BPK_LIST_OID;
+  String BPK_LIST_FRIENDLY_NAME = "BPK-LIST";
+  int BPK_LIST_MAX_LENGTH = 32767;
+
+  String ENC_BPK_LIST_OID = "1.2.40.0.10.2.1.1.261.22";
+  String ENC_BPK_LIST_NAME = URN_OID_PREFIX + ENC_BPK_LIST_OID;
+  String ENC_BPK_LIST_FRIENDLY_NAME = "ENC-BPK-LIST";
+  int ENC_BPK_LIST_MAX_LENGTH = 32767;
+
+  String MAIL_OID = "0.9.2342.19200300.100.1.3";
+  String MAIL_NAME = URN_OID_PREFIX + MAIL_OID;
+  String MAIL_FRIENDLY_NAME = "MAIL";
+  int MAIL_MAX_LENGTH = 128;
+
+  String TEL_OID = "2.5.4.20";
+  String TEL_NAME = URN_OID_PREFIX + TEL_OID;
+  String TEL_FRIENDLY_NAME = "TEL";
+  int TEL_MAX_LENGTH = 32;
+
+  String PARTICIPANT_ID_OID = "1.2.40.0.10.2.1.1.71";
+  String PARTICIPANT_ID_NAME = URN_OID_PREFIX + PARTICIPANT_ID_OID;
+  String PARTICIPANT_ID_FRIENDLY_NAME = "PARTICIPANT-ID";
+  int PARTICIPANT_MAX_LENGTH = 39;
+
+  String PARTICIPANT_OKZ_OID = "1.2.40.0.10.2.1.1.261.24";
+  String PARTICIPANT_OKZ_NAME = URN_OID_PREFIX + PARTICIPANT_OKZ_OID;
+  String PARTICIPANT_OKZ_FRIENDLY_NAME = "PARTICIPANT-OKZ";
+  int PARTICIPANT_OKZ_MAX_LENGTH = 32;
+
+  String OU_OKZ_OID = "1.2.40.0.10.2.1.1.153";
+  String OU_OKZ_NAME = URN_OID_PREFIX + OU_OKZ_OID;
+  int OU_OKZ_MAX_LENGTH = 32;
+
+  String OU_GV_OU_ID_OID = "1.2.40.0.10.2.1.1.3";
+  String OU_GV_OU_ID_NAME = URN_OID_PREFIX + OU_GV_OU_ID_OID;
+  String OU_GV_OU_ID_FRIENDLY_NAME = "OU-GV-OU-ID";
+  int OU_GV_OU_ID_MAX_LENGTH = 39;
+
+  String OU_OID = "2.5.4.11";
+  String OU_NAME = URN_OID_PREFIX + OU_OID;
+  String OU_FRIENDLY_NAME = "OU";
+  int OU_MAX_LENGTH = 64;
+
+  String FUNCTION_OID = "1.2.40.0.10.2.1.1.33";
+  String FUNCTION_NAME = URN_OID_PREFIX + FUNCTION_OID;
+  String FUNCTION_FRIENDLY_NAME = "FUNCTION";
+  int FUNCTION_MAX_LENGTH = 32;
+
+  String ROLES_OID = "1.2.40.0.10.2.1.1.261.30";
+  String ROLES_NAME = URN_OID_PREFIX + ROLES_OID;
+  String ROLES_FRIENDLY_NAME = "ROLES";
+  int ROLES_MAX_LENGTH = 32767;
+
+  @Deprecated
+  String EID_CITIZEN_QAA_LEVEL_OID = "1.2.40.0.10.2.1.1.261.94";
+  @Deprecated
+  String EID_CITIZEN_QAA_LEVEL_NAME = URN_OID_PREFIX + EID_CITIZEN_QAA_LEVEL_OID;
+  @Deprecated
+  String EID_CITIZEN_QAA_LEVEL_FRIENDLY_NAME = "EID-CITIZEN-QAA-LEVEL";
+
+  String EID_CITIZEN_EIDAS_QAA_LEVEL_OID = "1.2.40.0.10.2.1.1.261.108";
+  String EID_CITIZEN_EIDAS_QAA_LEVEL_NAME = URN_OID_PREFIX + EID_CITIZEN_EIDAS_QAA_LEVEL_OID;
+  String EID_CITIZEN_EIDAS_QAA_LEVEL_FRIENDLY_NAME = "EID-CITIZEN-QAA-EIDAS-LEVEL";
+
+  String EID_IDENTITY_STATUS_LEVEL_OID = "1.2.40.0.10.2.1.1.261.109";
+  String EID_IDENTITY_STATUS_LEVEL_NAME = URN_OID_PREFIX + EID_IDENTITY_STATUS_LEVEL_OID;
+  String EID_IDENTITY_STATUS_LEVEL_FRIENDLY_NAME = "EID-IDENTITY-STATUS-LEVEL";
+
+  enum EidIdentityStatusLevelValues {
+    IDENTITY("http://eid.gv.at/eID/status/identity"), TESTIDENTITY("http://eid.gv.at/eID/status/testidentity"),
+    SYSTEM("http://eid.gv.at/eID/status/system");
+
+    private String uri;
+
+    EidIdentityStatusLevelValues(final String uri) {
+      this.uri = uri;
+    }
+
+    /**
+     * Get the URI based status identifier of an E-ID.
+     *
+     * @return
+     */
+    public String getUri() {
+      return this.uri;
+    }
+  }
+
+  String EID_ISSUING_NATION_OID = "1.2.40.0.10.2.1.1.261.32";
+  String EID_ISSUING_NATION_NAME = URN_OID_PREFIX + EID_ISSUING_NATION_OID;
+  String EID_ISSUING_NATION_FRIENDLY_NAME = "EID-ISSUING-NATION";
+  int EID_ISSUING_NATION_MAX_LENGTH = 2;
+
+  String EID_SECTOR_FOR_IDENTIFIER_OID = "1.2.40.0.10.2.1.1.261.34";
+  String EID_SECTOR_FOR_IDENTIFIER_NAME = URN_OID_PREFIX + EID_SECTOR_FOR_IDENTIFIER_OID;
+  String EID_SECTOR_FOR_IDENTIFIER_FRIENDLY_NAME = "EID-SECTOR-FOR-IDENTIFIER";
+  int EID_SECTOR_FOR_IDENTIFIER_MAX_LENGTH = 255;
+
+  @Deprecated
+  String EID_SOURCE_PIN_OID = "1.2.40.0.10.2.1.1.261.36";
+  @Deprecated
+  String EID_SOURCE_PIN_NAME = URN_OID_PREFIX + EID_SOURCE_PIN_OID;
+  @Deprecated
+  String EID_SOURCE_PIN_FRIENDLY_NAME = "EID-SOURCE-PIN";
+  @Deprecated
+  int EID_SOURCE_PIN_MAX_LENGTH = 128;
+
+  @Deprecated
+  String EID_SOURCE_PIN_TYPE_OID = "1.2.40.0.10.2.1.1.261.104";
+  @Deprecated
+  String EID_SOURCE_PIN_TYPE_NAME = URN_OID_PREFIX + EID_SOURCE_PIN_TYPE_OID;
+  @Deprecated
+  String EID_SOURCE_PIN_TYPE_FRIENDLY_NAME = "EID-SOURCE-PIN-TYPE";
+  @Deprecated
+  int EID_SOURCE_PIN_TYPE_MAX_LENGTH = 128;
+
+  @Deprecated
+  String EID_IDENTITY_LINK_OID = "1.2.40.0.10.2.1.1.261.38";
+  @Deprecated
+  String EID_IDENTITY_LINK_NAME = URN_OID_PREFIX + EID_IDENTITY_LINK_OID;
+  @Deprecated
+  String EID_IDENTITY_LINK_FRIENDLY_NAME = "EID-IDENTITY-LINK";
+  @Deprecated
+  int EID_IDENTITY_LINK_MAX_LENGTH = 32767;
+
+  String EID_E_ID_TOKEN_OID = "1.2.40.0.10.2.1.1.261.39";
+  String EID_E_ID_TOKEN_NAME = URN_OID_PREFIX + EID_E_ID_TOKEN_OID;
+  String EID_E_ID_TOKEN_FRIENDLY_NAME = "EID-E-ID-TOKEN";
+  int EID_E_ID_TOKEN_MAX_LENGTH = 32767;
+
+  @Deprecated
+  String EID_AUTH_BLOCK_OID = "1.2.40.0.10.2.1.1.261.62";
+  @Deprecated
+  String EID_AUTH_BLOCK_NAME = URN_OID_PREFIX + EID_AUTH_BLOCK_OID;
+  @Deprecated
+  String EID_AUTH_BLOCK_FRIENDLY_NAME = "EID-AUTH-BLOCK";
+  @Deprecated
+  int EID_AUTH_BLOCK_MAX_LENGTH = 32767;
+
+  String EID_CCS_URL_OID = "1.2.40.0.10.2.1.1.261.64";
+  String EID_CCS_URL_NAME = URN_OID_PREFIX + EID_CCS_URL_OID;
+  String EID_CCS_URL_FRIENDLY_NAME = "EID-CCS-URL";
+  int EID_CCS_URL_MAX_LENGTH = 1024;
+
+  String EID_SIGNER_CERTIFICATE_OID = "1.2.40.0.10.2.1.1.261.66";
+  String EID_SIGNER_CERTIFICATE_NAME = URN_OID_PREFIX + EID_SIGNER_CERTIFICATE_OID;
+  String EID_SIGNER_CERTIFICATE_FRIENDLY_NAME = "EID-SIGNER-CERTIFICATE";
+  int EID_SIGNER_CERTIFICATE_MAX_LENGTH = 32767;
+
+  @Deprecated
+  String EID_STORK_TOKEN_OID = "1.2.40.0.10.2.1.1.261.96";
+  @Deprecated
+  String EID_STORK_TOKEN_NAME = URN_OID_PREFIX + EID_STORK_TOKEN_OID;
+  @Deprecated
+  String EID_STORK_TOKEN_FRIENDLY_NAME = "EID-STORK-TOKEN";
+  @Deprecated
+  int EID_STORK_TOKEN_MAX_LENGTH = 32767;
+
+  String MANDATE_TYPE_OID = "1.2.40.0.10.2.1.1.261.68";
+  String MANDATE_TYPE_NAME = URN_OID_PREFIX + MANDATE_TYPE_OID;
+  String MANDATE_TYPE_FRIENDLY_NAME = "MANDATE-TYPE";
+  int MANDATE_TYPE_MAX_LENGTH = 256;
+
+  String MANDATE_TYPE_OID_OID = "1.2.40.0.10.2.1.1.261.106";
+  String MANDATE_TYPE_OID_NAME = URN_OID_PREFIX + MANDATE_TYPE_OID_OID;
+  String MANDATE_TYPE_OID_FRIENDLY_NAME = "MANDATE-TYPE-OID";
+  int MANDATE_TYPE_OID_MAX_LENGTH = 256;
+
+  @Deprecated
+  String MANDATE_NAT_PER_SOURCE_PIN_OID = "1.2.40.0.10.2.1.1.261.70";
+  @Deprecated
+  String MANDATE_NAT_PER_SOURCE_PIN_NAME = URN_OID_PREFIX + MANDATE_NAT_PER_SOURCE_PIN_OID;
+  @Deprecated
+  String MANDATE_NAT_PER_SOURCE_PIN_FRIENDLY_NAME = "MANDATOR-NATURAL-PERSON-SOURCE-PIN";
+  @Deprecated
+  int MANDATE_NAT_PER_SOURCE_PIN_MAX_LENGTH = 128;
+
+  String MANDATE_LEG_PER_SOURCE_PIN_OID = "1.2.40.0.10.2.1.1.261.100";
+  String MANDATE_LEG_PER_SOURCE_PIN_NAME = URN_OID_PREFIX + MANDATE_LEG_PER_SOURCE_PIN_OID;
+  String MANDATE_LEG_PER_SOURCE_PIN_FRIENDLY_NAME = "MANDATOR-LEGAL-PERSON-SOURCE-PIN";
+  int MANDATE_LEG_PER_SOURCE_PIN_MAX_LENGTH = 128;
+
+  @Deprecated
+  String MANDATE_NAT_PER_SOURCE_PIN_TYPE_OID = "1.2.40.0.10.2.1.1.261.102";
+  @Deprecated
+  String MANDATE_NAT_PER_SOURCE_PIN_TYPE_NAME = URN_OID_PREFIX + MANDATE_NAT_PER_SOURCE_PIN_TYPE_OID;
+  @Deprecated
+  String MANDATE_NAT_PER_SOURCE_PIN_TYPE_FRIENDLY_NAME = "MANDATOR-NATURAL-PERSON-SOURCE-PIN-TYPE";
+  @Deprecated
+  int MANDATE_NAT_PER_SOURCE_PIN_TYPE_MAX_LENGTH = 128;
+
+  String MANDATE_LEG_PER_SOURCE_PIN_TYPE_OID = "1.2.40.0.10.2.1.1.261.76";
+  String MANDATE_LEG_PER_SOURCE_PIN_TYPE_NAME = URN_OID_PREFIX + MANDATE_LEG_PER_SOURCE_PIN_TYPE_OID;
+  String MANDATE_LEG_PER_SOURCE_PIN_TYPE_FRIENDLY_NAME = "MANDATOR-LEGAL-PERSON-SOURCE-PIN-TYPE";
+  int MANDATE_LEG_PER_SOURCE_PIN_TYPE_MAX_LENGTH = 128;
+
+  String MANDATE_NAT_PER_BPK_OID = "1.2.40.0.10.2.1.1.261.98";
+  String MANDATE_NAT_PER_BPK_NAME = URN_OID_PREFIX + MANDATE_NAT_PER_BPK_OID;
+  String MANDATE_NAT_PER_BPK_FRIENDLY_NAME = "MANDATOR-NATURAL-PERSON-BPK";
+  int MANDATE_NAT_PER_BPK_MAX_LENGTH = 1024;
+
+  String MANDATE_NAT_PER_BPK_LIST_OID = "1.2.40.0.10.2.1.1.261.73";
+  String MANDATE_NAT_PER_BPK_LIST_NAME = URN_OID_PREFIX + MANDATE_NAT_PER_BPK_LIST_OID;
+  String MANDATE_NAT_PER_BPK_LIST_FRIENDLY_NAME = "MANDATOR-NATURAL-PERSON-BPK-LIST";
+  int MANDATE_NAT_PER_ENC_LIST_MAX_LENGTH = 32767;
+
+  String MANDATE_NAT_PER_ENC_BPK_LIST_OID = "1.2.40.0.10.2.1.1.261.72";
+  String MANDATE_NAT_PER_ENC_BPK_LIST_NAME = URN_OID_PREFIX + MANDATE_NAT_PER_ENC_BPK_LIST_OID;
+  String MANDATE_NAT_PER_ENC_BPK_LIST_FRIENDLY_NAME = "MANDATOR-NATURAL-PERSON-ENC-BPK-LIST";
+  int MANDATE_NAT_PER_ENC_BPK_LIST_MAX_LENGTH = 32767;
+
+  String MANDATE_NAT_PER_GIVEN_NAME_OID = "1.2.40.0.10.2.1.1.261.78";
+  String MANDATE_NAT_PER_GIVEN_NAME_NAME = URN_OID_PREFIX + MANDATE_NAT_PER_GIVEN_NAME_OID;
+  String MANDATE_NAT_PER_GIVEN_NAME_FRIENDLY_NAME = "MANDATOR-NATURAL-PERSON-GIVEN-NAME";
+  int MANDATE_NAT_PER_GIVEN_NAME_MAX_LENGTH = 128;
+
+  String MANDATE_NAT_PER_FAMILY_NAME_OID = "1.2.40.0.10.2.1.1.261.80";
+  String MANDATE_NAT_PER_FAMILY_NAME_NAME = URN_OID_PREFIX + MANDATE_NAT_PER_FAMILY_NAME_OID;
+  String MANDATE_NAT_PER_FAMILY_NAME_FRIENDLY_NAME = "MANDATOR-NATURAL-PERSON-FAMILY-NAME";
+  int MANDATE_NAT_PER_FAMILY_NAME_MAX_LENGTH = 128;
+
+  String MANDATE_NAT_PER_BIRTHDATE_OID = "1.2.40.0.10.2.1.1.261.82";
+  String MANDATE_NAT_PER_BIRTHDATE_NAME = URN_OID_PREFIX + MANDATE_NAT_PER_BIRTHDATE_OID;
+  String MANDATE_NAT_PER_BIRTHDATE_FRIENDLY_NAME = "MANDATOR-NATURAL-PERSON-BIRTHDATE";
+  String MANDATE_NAT_PER_BIRTHDATE_FORMAT_PATTERN = BIRTHDATE_FORMAT_PATTERN;
+
+  String MANDATE_LEG_PER_FULL_NAME_OID = "1.2.40.0.10.2.1.1.261.84";
+  String MANDATE_LEG_PER_FULL_NAME_NAME = URN_OID_PREFIX + MANDATE_LEG_PER_FULL_NAME_OID;
+  String MANDATE_LEG_PER_FULL_NAME_FRIENDLY_NAME = "MANDATOR-LEGAL-PERSON-FULL-NAME";
+  int MANDATE_LEG_PER_FULL_NAME_MAX_LENGTH = 256;
+
+  String MANDATE_PROF_REP_OID_OID = "1.2.40.0.10.2.1.1.261.86";
+  String MANDATE_PROF_REP_OID_NAME = URN_OID_PREFIX + MANDATE_PROF_REP_OID_OID;
+  String MANDATE_PROF_REP_OID_FRIENDLY_NAME = "MANDATE-PROF-REP-OID";
+  int MANDATE_PROF_REP_OID_MAX_LENGTH = 256;
+
+  String MANDATE_PROF_REP_DESC_OID = "1.2.40.0.10.2.1.1.261.88";
+  String MANDATE_PROF_REP_DESC_NAME = URN_OID_PREFIX + MANDATE_PROF_REP_DESC_OID;
+  String MANDATE_PROF_REP_DESC_FRIENDLY_NAME = "MANDATE-PROF-REP-DESCRIPTION";
+  int MANDATE_PROF_REP_DESC_MAX_LENGTH = 1024;
+
+  String MANDATE_REFERENCE_VALUE_OID = "1.2.40.0.10.2.1.1.261.90";
+  String MANDATE_REFERENCE_VALUE_NAME = URN_OID_PREFIX + MANDATE_REFERENCE_VALUE_OID;
+  String MANDATE_REFERENCE_VALUE_FRIENDLY_NAME = "MANDATE-REFERENCE-VALUE";
+  int MANDATE_REFERENCE_VALUE_MAX_LENGTH = 100;
+
+  String MANDATE_IDENTIFIER_OID = "1.2.40.0.10.2.1.1.261.91";
+  String MANDATE_IDENTIFIER_FRIENDLY_NAME = "MANDATE-IDENTIFIER";
+  String MANDATE_IDENTIFIER_NAME = URN_OID_PREFIX + MANDATE_IDENTIFIER_OID;
+  int MANDATE_IDENTIFIER_MAX_LENGTH = 256;
+
+  @Deprecated
+  String MANDATE_FULL_MANDATE_OID = "1.2.40.0.10.2.1.1.261.92";
+  @Deprecated
+  String MANDATE_FULL_MANDATE_NAME = URN_OID_PREFIX + MANDATE_FULL_MANDATE_OID;
+  @Deprecated
+  String MANDATE_FULL_MANDATE_FRIENDLY_NAME = "MANDATE-FULL-MANDATE";
+  @Deprecated
+  int MANDATE_FULL_MANDATE_MAX_LENGTH = 32767;
+
+  String INVOICE_RECPT_ID_OID = "1.2.40.0.10.2.1.1.261.40";
+  String INVOICE_RECPT_ID_NAME = URN_OID_PREFIX + INVOICE_RECPT_ID_OID;
+  String INVOICE_RECPT_ID_FRIENDLY_NAME = "INVOICE-RECPT-ID";
+  int INVOICE_RECPT_ID_MAX_LENGTH = 64;
+
+  String COST_CENTER_ID_OID = "1.2.40.0.10.2.1.1.261.50";
+  String COST_CENTER_ID_NAME = URN_OID_PREFIX + COST_CENTER_ID_OID;
+  String COST_CENTER_ID_FRIENDLY_NAME = "COST-CENTER-ID";
+  int COST_CENTER_ID_MAX_LENGTH = 32767;
+
+  String CHARGE_CODE_OID = "1.2.40.0.10.2.1.1.261.60";
+  String CHARGE_CODE_NAME = URN_OID_PREFIX + CHARGE_CODE_OID;
+  String CHARGE_CODE_FRIENDLY_NAME = "CHARGE-CODE";
+  int CHARGE_CODE_MAX_LENGTH = 32767;
+
+  String PVP_HOLDEROFKEY_OID = "1.2.40.0.10.2.1.1.261.xx.xx";
+  String PVP_HOLDEROFKEY_NAME = URN_OID_PREFIX + PVP_HOLDEROFKEY_OID;
+  String PVP_HOLDEROFKEY_FRIENDLY_NAME = "HOLDER-OF-KEY-CERTIFICATE";
+
+}
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/XMLNamespaceConstants.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/XMLNamespaceConstants.java
deleted file mode 100644
index bda600f3..00000000
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/XMLNamespaceConstants.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a
- * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 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:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * 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.egiz.eaaf.core.api.data;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * Contains various constants used throughout the system.
- * 
- */
-public interface XMLNamespaceConstants {
-  /** Root location of the schema files. */
-   String SCHEMA_ROOT = "/schemas/";
-
-  /** URI of the Widerrufregister XML namespace. */
-   String WRR_NS_URI =
-      "http://reference.e-government.gv.at/namespace/moavv/20041223";
-
-  /** Prefix used for the Widerrufregister XML namespace */
-   String WRR_PREFIX = "wrr";
-
-  /** URI of the StandardTextBlock XML namespace. */
-   String STB_NS_URI =
-      "http://reference.e-government.gv.at/namespace/standardtextblock/20041105#";
-
-  /** Prefix used for the standard text block XML namespace */
-   String STB_PREFIX = "stb";
-
-  /** URI of the MOA XML namespace. */
-   String MOA_NS_URI =
-      "http://reference.e-government.gv.at/namespace/moa/20020822#";
-
-  /** Name of the mandates infobox */
-   String INFOBOXIDENTIFIER_MANDATES = "Mandates";
-
-  /** Prefix used for the Mandate XML namespace */
-   String MD_PREFIX = "md";
-
-  /** URI of the Mandate XML namespace. */
-   String MD_NS_URI =
-      "http://reference.e-government.gv.at/namespace/mandates/20040701#";
-
-  /** Prefix used for the Mandate XML namespace */
-   String MVV_PREFIX = "mvv";
-
-  /** URI of the Mandate XML namespace. */
-   String MVV_NS_URI =
-      "http://reference.e-government.gv.at/namespace/moavv/app2mvv/20041125";
-
-  /** Prefix used for the MandateCheckProfile XML namespace */
-   String MDP_PREFIX = "mdp";
-
-  /** URI of the Mandate XML namespace. */
-   String MDP_NS_URI =
-      "http://reference.e-government.gv.at/namespace/mandateprofile/20041105#";
-
-  /** Prefix used for the MOA XML namespace */
-   String MOA_PREFIX = "moa";
-
-  /** Local location of the MOA XML schema definition. */
-   String MOA_SCHEMA_LOCATION = SCHEMA_ROOT + "MOA-SPSS-2.0.0.xsd";
-
-  /** URI of the MOA configuration XML namespace. */
-   String MOA_CONFIG_NS_URI =
-      "http://reference.e-government.gv.at/namespace/moaconfig/20021122#";
-
-  /** URI of the MOA ID configuration XML namespace. */
-   String MOA_ID_CONFIG_NS_URI =
-      "http://www.buergerkarte.at/namespaces/moaconfig#";
-
-  /** Prefix used for the MOA configuration XML namespace */
-   String MOA_CONFIG_PREFIX = "conf";
-
-  /** Prefix used for the MOA configuration XML namespace */
-   String MOA_ID_CONFIG_PREFIX = "confID";
-
-  /** Local location of the MOA configuration XML schema definition. */
-   String MOA_CONFIG_SCHEMA_LOCATION = SCHEMA_ROOT + "MOA-SPSS-config-2.0.0.xsd";
-
-  /** Local location of the MOA ID configuration XML schema definition. */
-   String MOA_ID_CONFIG_SCHEMA_LOCATION =
-      SCHEMA_ROOT + "MOA-ID-Configuration-1.5.2.xsd";
-
-  /** URI of the Security Layer 1.0 namespace. */
-   String SL10_NS_URI =
-      "http://www.buergerkarte.at/namespaces/securitylayer/20020225#";
-
-  /** Prefix used for the Security Layer 1.0 XML namespace */
-   String SL10_PREFIX = "sl10";
-
-  /** Local location of the Security Layer 1.0 XML schema definition */
-   String SL10_SCHEMA_LOCATION = SCHEMA_ROOT + "Core.20020225.xsd";
-
-  /** URI of the Security Layer 1.1 XML namespace */
-   String SL11_NS_URI =
-      "http://www.buergerkarte.at/namespaces/securitylayer/20020831#";
-
-  /** Prefix used for the Security Layer 1.1 XML namespace */
-   String SL11_PREFIX = "sl11";
-
-  /** Local location of the Security Layer 1.1 XML schema definition */
-   String SL11_SCHEMA_LOCATION = SCHEMA_ROOT + "Core.20020831.xsd";
-
-  /** URI of the Security Layer 1.2 XML namespace */
-   String SL12_NS_URI =
-      "http://www.buergerkarte.at/namespaces/securitylayer/1.2#";
-
-  /** Prefix used for the Security Layer 1.2 XML namespace */
-   String SL12_PREFIX = "sl";
-
-  /** Local location of the Security Layer 1.2 XML schema definition */
-   String SL12_SCHEMA_LOCATION = SCHEMA_ROOT + "Core-1.2.xsd";
-
-  /** URI of the ECDSA XML namespace */
-   String ECDSA_NS_URI = "http://www.w3.org/2001/04/xmldsig-more#";
-
-  /** Prefix used for ECDSA namespace */
-   String ECDSA_PREFIX = "ecdsa";
-
-  /** Local location of ECDSA XML schema definition */
-   String ECDSA_SCHEMA_LOCATION = SCHEMA_ROOT + "ECDSAKeyValue.xsd";
-
-  /** URI of the PersonData XML namespace. */
-   String PD_NS_URI =
-      "http://reference.e-government.gv.at/namespace/persondata/20020228#";
-
-  /** Prefix used for the PersonData XML namespace */
-   String PD_PREFIX = "pr";
-
-  // /** Local location of the PersonData XML schema definition */
-  //  String PD_SCHEMA_LOCATION =
-  // SCHEMA_ROOT + "PersonData.xsd";
-
-  /** Local location of the PersonData XML schema definition */
-   String PD_SCHEMA_LOCATION = SCHEMA_ROOT + "PersonData_20_en_moaWID.xsd";
-
-  /** URI of the SAML namespace. */
-   String SAML_NS_URI = "urn:oasis:names:tc:SAML:1.0:assertion";
-
-  /** Prefix used for the SAML XML namespace */
-   String SAML_PREFIX = "saml";
-
-  /** Local location of the SAML XML schema definition. */
-   String SAML_SCHEMA_LOCATION = SCHEMA_ROOT + "cs-sstc-schema-assertion-01.xsd";
-
-  /** URI of the SAML request-response protocol namespace. */
-   String SAMLP_NS_URI = "urn:oasis:names:tc:SAML:1.0:protocol";
-
-  /** Prefix used for the SAML request-response protocol namespace */
-   String SAMLP_PREFIX = "samlp";
-
-  /** Local location of the SAML request-response protocol schema definition. */
-   String SAMLP_SCHEMA_LOCATION = SCHEMA_ROOT + "cs-sstc-schema-protocol-01.xsd";
-
-  /** URI of the XML namespace. */
-   String XML_NS_URI = "http://www.w3.org/XML/1998/namespace";
-
-  /** Prefix used for the XML namespace */
-   String XML_PREFIX = "xml";
-
-  /** Local location of the XML schema definition. */
-   String XML_SCHEMA_LOCATION = SCHEMA_ROOT + "xml.xsd";
-
-  /** URI of the XMLNS namespace */
-   String XMLNS_NS_URI = "http://www.w3.org/2000/xmlns/";
-
-  /** Prefix used for the XSI namespace */
-   String XSI_PREFIX = "xsi";
-
-  /** Local location of the XSI schema definition. */
-   String XSI_SCHEMA_LOCATION = SCHEMA_ROOT + "XMLSchema-instance.xsd";
-
-  /** URI of the XSI XMLNS namespace */
-   String XSI_NS_URI = "http://www.w3.org/2001/XMLSchema-instance";
-
-  /** URI of the XSLT XML namespace */
-   String XSLT_NS_URI = "http://www.w3.org/1999/XSL/Transform";
-
-  /** Prefix used for the XSLT XML namespace */
-   String XSLT_PREFIX = "xsl";
-
-  /** URI of the XMLDSig XML namespace. */
-   String DSIG_NS_URI = "http://www.w3.org/2000/09/xmldsig#";
-
-  /** Prefix used for the XMLDSig XML namespace */
-   String DSIG_PREFIX = "dsig";
-
-  /** Local location of the XMLDSig XML schema. */
-   String DSIG_SCHEMA_LOCATION = SCHEMA_ROOT + "xmldsig-core-schema.xsd";
-
-  /** URI of the XMLDSig XPath Filter XML namespace. */
-   String DSIG_FILTER2_NS_URI = "http://www.w3.org/2002/06/xmldsig-filter2";
-
-  /** Prefix used for the XMLDSig XPath Filter XML namespace */
-   String DSIG_FILTER2_PREFIX = "dsig-filter2";
-
-  /** Local location of the XMLDSig XPath Filter XML schema definition. */
-   String DSIG_FILTER2_SCHEMA_LOCATION = SCHEMA_ROOT + "xmldsig-filter2.xsd";
-
-  /** URI of the Exclusive Canonicalization XML namespace */
-   String DSIG_EC_NS_URI = "http://www.w3.org/2001/10/xml-exc-c14n#";
-
-  /** Prefix used for the Exclusive Canonicalization XML namespace */
-   String DSIG_EC_PREFIX = "ec";
-
-  /** Local location of the Exclusive Canonicalizaion XML schema definition */
-   String DSIG_EC_SCHEMA_LOCATION =
-      SCHEMA_ROOT + "exclusive-canonicalization.xsd";
-
-  /** URI of the XMLLoginParameterResolver Configuration XML namespace */
-   String XMLLPR_NS_URI =
-      "http://reference.e-government.gv.at/namespace/moa/20020822#/xmllpr20030814";
-
-  /** Local location of the XMLLoginParameterResolver Configuration XML schema definition */
-   String XMLLPR_SCHEMA_LOCATION = SCHEMA_ROOT + "MOAIdentities.xsd";
-
-  /** Local location of the XAdES v1.1.1 schema definition */
-   String XADES_1_1_1_SCHEMA_LOCATION = SCHEMA_ROOT + "XAdES-1.1.1.xsd";
-
-  /** URI of the XAdES v1.1.1 namespace */
-   String XADES_1_1_1_NS_URI = "http://uri.etsi.org/01903/v1.1.1#";
-
-   String XADES_1_1_1_NS_PREFIX = "xades111";
-
-  /** Local location of the XAdES v1.2.2 schema definition */
-   String XADES_1_2_2_SCHEMA_LOCATION = SCHEMA_ROOT + "XAdES-1.2.2.xsd";
-
-  /** URI of the XAdES v1.2.2 namespace */
-   String XADES_1_2_2_NS_URI = "http://uri.etsi.org/01903/v1.2.2#";
-
-   String XADES_1_2_2_NS_PREFIX = "xades122";
-
-  /** Local location of the XAdES v1.1.1 schema definition */
-   String XADES_1_3_2_SCHEMA_LOCATION = SCHEMA_ROOT + "XAdES-1.3.2.xsd";
-
-  /** URI of the XAdES v1.3.2 namespace */
-   String XADES_1_3_2_NS_URI = "http://uri.etsi.org/01903/v1.3.2#";
-
-   String XADES_1_3_2_NS_PREFIX = "xades132";
-
-  /** Local location of the XAdES v1.4.1 schema definition */
-   String XADES_1_4_1_SCHEMA_LOCATION = SCHEMA_ROOT + "XAdES-1.4.1.xsd";
-
-  /** URI of the XAdES v1.4.1 namespace */
-   String XADES_1_4_1_NS_URI = "http://uri.etsi.org/01903/v1.4.1#";
-
-   String XADES_1_4_1_NS_PREFIX = "xades141";
-  /** URI of the SAML 2.0 namespace. */
-   String SAML2_NS_URI = "urn:oasis:names:tc:SAML:2.0:assertion";
-
-  /** Prefix used for the SAML 2.0 XML namespace */
-   String SAML2_PREFIX = "saml2";
-
-  /** Local location of the SAML 2.0 XML schema definition. */
-   String SAML2_SCHEMA_LOCATION = SCHEMA_ROOT + "saml-schema-assertion-2.0.xsd";
-
-  /** URI of the SAML 2.0 protocol namespace. */
-   String SAML2P_NS_URI = "urn:oasis:names:tc:SAML:2.0:protocol";
-
-  /** Prefix used for the SAML 2.0 protocol XML namespace */
-   String SAML2P_PREFIX = "saml2p";
-
-  /** Local location of the SAML 2.0 protocol XML schema definition. */
-   String SAML2P_SCHEMA_LOCATION = SCHEMA_ROOT + "saml-schema-protocol-2.0.xsd";
-
-  /** URI of the STORK namespace. */
-   String STORK_NS_URI = "urn:eu:stork:names:tc:STORK:1.0:assertion";
-
-  /** Prefix used for the STORK XML namespace */
-   String STORK_PREFIX = "stork";
-
-  /** Local location of the STORK XML schema definition. */
-   String STORK_SCHEMA_LOCATION = SCHEMA_ROOT + "stork-schema-assertion-1.0.xsd";
-
-  /** URI of the STORK protocol namespace. */
-   String STORKP_NS_URI = "urn:eu:stork:names:tc:STORK:1.0:protocol";
-
-  /** Prefix used for the STORK protocol XML namespace */
-   String STORKP_PREFIX = "storkp";
-
-  /** Local location of the STORK protocol XML schema definition. */
-   String STORKP_SCHEMA_LOCATION = SCHEMA_ROOT + "stork-schema-protocol-1.0.xsd";
-
-  /** URI of the TSL namespace. */
-   String TSL_NS_URI = "http://uri.etsi.org/02231/v2#";
-
-  /** Prefix used for the TSL namespace */
-   String TSL_PREFIX = "tsl1";
-
-  /** Local location of the TSL schema definition. */
-   String TSL_SCHEMA_LOCATION = SCHEMA_ROOT + "ts_119612v010201_xsd.xsd";
-
-  /** URI of the TSL SIE namespace. */
-   String TSL_SIE_NS_URI =
-      "http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#";
-
-  /** Prefix used for the TSL SIE namespace */
-   String TSL_SIE_PREFIX = "tslsie";
-
-  /** Local location of the TSL SIE schema definition. */
-   String TSL_SIE_SCHEMA_LOCATION = SCHEMA_ROOT + "ts_119612v010201_sie_xsd.xsd";
-
-  /** URI of the TSL additional types namespace. */
-   String TSL_ADDTYPES_NS_URI = "http://uri.etsi.org/02231/v2/additionaltypes#";
-
-  /** Prefix used for the TSL additional types namespace */
-   String TSL_ADDTYPES_PREFIX = "tsltype";
-
-  /** Local location of the TSL additional types schema definition. */
-   String TSL_ADDTYPES_SCHEMA_LOCATION =
-      SCHEMA_ROOT + "ts_ts_119612v010201_additionaltypes_xsd.xsd";
-
-  /** URI of the XML Encryption namespace. */
-   String XENC_NS_URI = "http://www.w3.org/2001/04/xmlenc#";
-
-  /** Prefix used for the XML Encryption XML namespace */
-   String XENC_PREFIX = "xenc";
-
-  /** Local location of the XML Encryption XML schema definition. */
-   String XENC_SCHEMA_LOCATION = SCHEMA_ROOT + "xenc-schema.xsd";
-
-  /** Prefix used for the XML Encryption XML namespace */
-   String SAML2_METADATA_PREFIX = "md";
-
-  /** Prefix used for the XML Encryption XML namespace */
-   String SAML2_METADATA_URI = "urn:oasis:names:tc:SAML:2.0:metadata";
-
-  /** Local location of the XML Encryption XML schema definition. */
-   String SAML2_METADATA_SCHEMA_LOCATION =
-      SCHEMA_ROOT + "saml-schema-metadata-2.0.xsd";
-
-
-  /* Prefix and Schema definition for eIDAS specific SAML2 extensions */
-   String SAML2_eIDAS_EXTENSIONS_PREFIX = "eidas";
-   String SAML2_eIDAS_EXTENSIONS = "http://eidas.europa.eu/saml-extensions";
-   String SAML2_eIDAS_EXTENSIONS_SCHEMA_LOCATION =
-      SCHEMA_ROOT + "eIDAS_saml_extensions.xsd";
-
-
-  /* Prefix and Schema for SAML2 Entity Attributes */
-   String SAML2_MDATTR_EXTENSIONS_PREFIX = "mdattr";
-   String SAML2_MDATTR_EXTENSIONS = "urn:oasis:names:tc:SAML:metadata:attribute";
-   String SAML2_MDATTR_EXTENSIONS_SCHEMA_LOCATION =
-      SCHEMA_ROOT + "sstc-metadata-attr.xsd";
-
-  /**
-   * Contains all namespaces and local schema locations for XML schema definitions relevant for MOA.
-   * For use in validating XML parsers.
-   */
-   String ALL_SCHEMA_LOCATIONS = MOA_NS_URI + " " + MOA_SCHEMA_LOCATION + " "
-      + MOA_CONFIG_NS_URI + " " + MOA_CONFIG_SCHEMA_LOCATION + " "
-      + MOA_ID_CONFIG_NS_URI + " " + MOA_ID_CONFIG_SCHEMA_LOCATION + " "
-      + SL10_NS_URI + " " + SL10_SCHEMA_LOCATION + " "
-      + SL11_NS_URI + " " + SL11_SCHEMA_LOCATION + " "
-      + SL12_NS_URI + " " + SL12_SCHEMA_LOCATION + " "
-      + ECDSA_NS_URI + " " + ECDSA_SCHEMA_LOCATION + " "
-      + PD_NS_URI + " " + PD_SCHEMA_LOCATION + " "
-      + SAML_NS_URI + " " + SAML_SCHEMA_LOCATION + " "
-      + SAMLP_NS_URI + " " + SAMLP_SCHEMA_LOCATION + " "
-      + XML_NS_URI + " " + XML_SCHEMA_LOCATION + " "
-      + XSI_NS_URI + " " + XSI_SCHEMA_LOCATION + " "
-      + DSIG_NS_URI + " " + DSIG_SCHEMA_LOCATION + " "
-      + DSIG_FILTER2_NS_URI + " " + DSIG_FILTER2_SCHEMA_LOCATION + " "
-      + DSIG_EC_NS_URI + " " + DSIG_EC_SCHEMA_LOCATION + " "
-      + XMLLPR_NS_URI + " " + XMLLPR_SCHEMA_LOCATION + " "
-      + XADES_1_1_1_NS_URI + " " + XADES_1_1_1_SCHEMA_LOCATION + " "
-      + XADES_1_2_2_NS_URI + " " + XADES_1_2_2_SCHEMA_LOCATION + " "
-      + XADES_1_3_2_NS_URI + " " + XADES_1_3_2_SCHEMA_LOCATION + " "
-      + XADES_1_4_1_NS_URI + " " + XADES_1_4_1_SCHEMA_LOCATION + " "
-      + TSL_NS_URI + " " + TSL_SCHEMA_LOCATION + " "
-      + TSL_SIE_NS_URI + " " + TSL_SIE_SCHEMA_LOCATION + " "
-      + TSL_ADDTYPES_NS_URI + " " + TSL_ADDTYPES_SCHEMA_LOCATION + " "
-      + SAML2_NS_URI + " " + SAML2_SCHEMA_LOCATION + " "
-      + SAML2P_NS_URI + " " + SAML2P_SCHEMA_LOCATION + " "
-      + STORK_NS_URI + " " + STORK_SCHEMA_LOCATION + " "
-      + STORKP_NS_URI + " " + STORKP_SCHEMA_LOCATION + " "
-      + SAML2_METADATA_URI + " " + SAML2_METADATA_SCHEMA_LOCATION + " "
-      + XENC_NS_URI + " " + XENC_SCHEMA_LOCATION + " "
-      + SAML2_eIDAS_EXTENSIONS + " " + SAML2_eIDAS_EXTENSIONS_SCHEMA_LOCATION + " "
-      + SAML2_MDATTR_EXTENSIONS + " " + SAML2_MDATTR_EXTENSIONS_SCHEMA_LOCATION;
-
-
-  /** Security Layer manifest type URI. */
-   String SL_MANIFEST_TYPE_URI =
-      "http://www.buergerkarte.at/specifications/Security-Layer/20020225#SignatureManifest";
-
-  /** URI of the SHA1 digest algorithm */
-   String SHA1_URI = "http://www.w3.org/2000/09/xmldsig#sha1";
-
-  /** URI of the SHA1 digest algorithm */
-   String SHA256_URI = "http://www.w3.org/2000/09/xmldsig#sha256";
-
-  /** URI of the SHA1 digest algorithm */
-   String SHA384_URI = "http://www.w3.org/2000/09/xmldsig#sha384";
-
-  /** URI of the SHA1 digest algorithm */
-   String SHA512_URI = "http://www.w3.org/2000/09/xmldsig#sha512";
-
-   String SHA3_256_URI = "http://www.w3.org/2007/05/xmldsig-more#sha3-256";
-
-   String SHA3_512_URI = "http://www.w3.org/2007/05/xmldsig-more#sha3-512";
-
-
-
-  /** URI of the Canonical XML algorithm */
-   String C14N_URI = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315";
-
-  /** URI of the Canoncial XML with comments algorithm */
-   String C14N_WITH_COMMENTS_URI =
-      "http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments";
-
-  /** URI of the Exclusive Canonical XML algorithm */
-   String EXC_C14N_URI = "http://www.w3.org/2001/10/xml-exc-c14n#";
-
-  /** URI of the Exclusive Canonical XML with commments algorithm */
-   String EXC_C14N_WITH_COMMENTS_URI =
-      "http://www.w3.org/2001/10/xml-exc-c14n#WithComments";
-
-  /**
-   * A map used to map namespace prefixes to namespace URIs
-   */
-   Map<String, String> nSMap =
-      Collections.unmodifiableMap(new HashMap<String, String>() {
-        private static final  long serialVersionUID = 3845384324295136490L;
-        {
-          put(XMLNamespaceConstants.SAML_PREFIX, XMLNamespaceConstants.SAML_NS_URI);
-          put(XMLNamespaceConstants.ECDSA_PREFIX, "http://www.w3.org/2001/04/xmldsig-more#");
-          put(XMLNamespaceConstants.DSIG_PREFIX, XMLNamespaceConstants.DSIG_NS_URI);
-        }
-      });
-
-
-}
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/XmlNamespaceConstants.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/XmlNamespaceConstants.java
new file mode 100644
index 00000000..5c10fd1e
--- /dev/null
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/XmlNamespaceConstants.java
@@ -0,0 +1,412 @@
+/*
+ * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a
+ * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 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:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * 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.egiz.eaaf.core.api.data;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Contains various constants used throughout the system.
+ *
+ */
+public interface XmlNamespaceConstants {
+  /** Root location of the schema files. */
+  String SCHEMA_ROOT = "/schemas/";
+
+  /** URI of the Widerrufregister XML namespace. */
+  String WRR_NS_URI = "http://reference.e-government.gv.at/namespace/moavv/20041223";
+
+  /** Prefix used for the Widerrufregister XML namespace. */
+  String WRR_PREFIX = "wrr";
+
+  /** URI of the StandardTextBlock XML namespace. */
+  String STB_NS_URI = "http://reference.e-government.gv.at/namespace/standardtextblock/20041105#";
+
+  /** Prefix used for the standard text block XML namespace. */
+  String STB_PREFIX = "stb";
+
+  /** URI of the MOA XML namespace. */
+  String MOA_NS_URI = "http://reference.e-government.gv.at/namespace/moa/20020822#";
+
+  /** Name of the mandates infobox. */
+  String INFOBOXIDENTIFIER_MANDATES = "Mandates";
+
+  /** Prefix used for the Mandate XML namespace. */
+  String MD_PREFIX = "md";
+
+  /** URI of the Mandate XML namespace. */
+  String MD_NS_URI = "http://reference.e-government.gv.at/namespace/mandates/20040701#";
+
+  /** Prefix used for the Mandate XML namespace. */
+  String MVV_PREFIX = "mvv";
+
+  /** URI of the Mandate XML namespace. */
+  String MVV_NS_URI = "http://reference.e-government.gv.at/namespace/moavv/app2mvv/20041125";
+
+  /** Prefix used for the MandateCheckProfile XML namespace. */
+  String MDP_PREFIX = "mdp";
+
+  /** URI of the Mandate XML namespace. */
+  String MDP_NS_URI = "http://reference.e-government.gv.at/namespace/mandateprofile/20041105#";
+
+  /** Prefix used for the MOA XML namespace. */
+  String MOA_PREFIX = "moa";
+
+  /** Local location of the MOA XML schema definition. */
+  String MOA_SCHEMA_LOCATION = SCHEMA_ROOT + "MOA-SPSS-2.0.0.xsd";
+
+  /** URI of the MOA configuration XML namespace. */
+  String MOA_CONFIG_NS_URI = "http://reference.e-government.gv.at/namespace/moaconfig/20021122#";
+
+  /** URI of the MOA ID configuration XML namespace. */
+  String MOA_ID_CONFIG_NS_URI = "http://www.buergerkarte.at/namespaces/moaconfig#";
+
+  /** Prefix used for the MOA configuration XML namespace. */
+  String MOA_CONFIG_PREFIX = "conf";
+
+  /** Prefix used for the MOA configuration XML namespace. */
+  String MOA_ID_CONFIG_PREFIX = "confID";
+
+  /** Local location of the MOA configuration XML schema definition. */
+  String MOA_CONFIG_SCHEMA_LOCATION = SCHEMA_ROOT + "MOA-SPSS-config-2.0.0.xsd";
+
+  /** Local location of the MOA ID configuration XML schema definition. */
+  String MOA_ID_CONFIG_SCHEMA_LOCATION = SCHEMA_ROOT + "MOA-ID-Configuration-1.5.2.xsd";
+
+  /** URI of the Security Layer 1.0 namespace. */
+  String SL10_NS_URI = "http://www.buergerkarte.at/namespaces/securitylayer/20020225#";
+
+  /** Prefix used for the Security Layer 1.0 XML namespace */
+  String SL10_PREFIX = "sl10";
+
+  /** Local location of the Security Layer 1.0 XML schema definition */
+  String SL10_SCHEMA_LOCATION = SCHEMA_ROOT + "Core.20020225.xsd";
+
+  /** URI of the Security Layer 1.1 XML namespace */
+  String SL11_NS_URI = "http://www.buergerkarte.at/namespaces/securitylayer/20020831#";
+
+  /** Prefix used for the Security Layer 1.1 XML namespace */
+  String SL11_PREFIX = "sl11";
+
+  /** Local location of the Security Layer 1.1 XML schema definition */
+  String SL11_SCHEMA_LOCATION = SCHEMA_ROOT + "Core.20020831.xsd";
+
+  /** URI of the Security Layer 1.2 XML namespace */
+  String SL12_NS_URI = "http://www.buergerkarte.at/namespaces/securitylayer/1.2#";
+
+  /** Prefix used for the Security Layer 1.2 XML namespace */
+  String SL12_PREFIX = "sl";
+
+  /** Local location of the Security Layer 1.2 XML schema definition */
+  String SL12_SCHEMA_LOCATION = SCHEMA_ROOT + "Core-1.2.xsd";
+
+  /** URI of the ECDSA XML namespace .*/
+  String ECDSA_NS_URI = "http://www.w3.org/2001/04/xmldsig-more#";
+
+  /** Prefix used for ECDSA namespace. */
+  String ECDSA_PREFIX = "ecdsa";
+
+  /** Local location of ECDSA XML schema definition .*/
+  String ECDSA_SCHEMA_LOCATION = SCHEMA_ROOT + "ECDSAKeyValue.xsd";
+
+  /** URI of the PersonData XML namespace. */
+  String PD_NS_URI = "http://reference.e-government.gv.at/namespace/persondata/20020228#";
+
+  /** Prefix used for the PersonData XML namespace. */
+  String PD_PREFIX = "pr";
+
+  // /** Local location of the PersonData XML schema definition */
+  // String PD_SCHEMA_LOCATION =
+  // SCHEMA_ROOT + "PersonData.xsd";
+
+  /** Local location of the PersonData XML schema definition. */
+  String PD_SCHEMA_LOCATION = SCHEMA_ROOT + "PersonData_20_en_moaWID.xsd";
+
+  /** URI of the SAML namespace. */
+  String SAML_NS_URI = "urn:oasis:names:tc:SAML:1.0:assertion";
+
+  /** Prefix used for the SAML XML namespace. */
+  String SAML_PREFIX = "saml";
+
+  /** Local location of the SAML XML schema definition. */
+  String SAML_SCHEMA_LOCATION = SCHEMA_ROOT + "cs-sstc-schema-assertion-01.xsd";
+
+  /** URI of the SAML request-response protocol namespace. */
+  String SAMLP_NS_URI = "urn:oasis:names:tc:SAML:1.0:protocol";
+
+  /** Prefix used for the SAML request-response protocol namespace. */
+  String SAMLP_PREFIX = "samlp";
+
+  /** Local location of the SAML request-response protocol schema definition. */
+  String SAMLP_SCHEMA_LOCATION = SCHEMA_ROOT + "cs-sstc-schema-protocol-01.xsd";
+
+  /** URI of the XML namespace. */
+  String XML_NS_URI = "http://www.w3.org/XML/1998/namespace";
+
+  /** Prefix used for the XML namespace. */
+  String XML_PREFIX = "xml";
+
+  /** Local location of the XML schema definition. */
+  String XML_SCHEMA_LOCATION = SCHEMA_ROOT + "xml.xsd";
+
+  /** URI of the XMLNS namespace. */
+  String XMLNS_NS_URI = "http://www.w3.org/2000/xmlns/";
+
+  /** Prefix used for the XSI namespace. */
+  String XSI_PREFIX = "xsi";
+
+  /** Local location of the XSI schema definition. */
+  String XSI_SCHEMA_LOCATION = SCHEMA_ROOT + "XMLSchema-instance.xsd";
+
+  /** URI of the XSI XMLNS namespace. */
+  String XSI_NS_URI = "http://www.w3.org/2001/XMLSchema-instance";
+
+  /** URI of the XSLT XML namespace. */
+  String XSLT_NS_URI = "http://www.w3.org/1999/XSL/Transform";
+
+  /** Prefix used for the XSLT XML namespace.*/
+  String XSLT_PREFIX = "xsl";
+
+  /** URI of the XMLDSig XML namespace. */
+  String DSIG_NS_URI = "http://www.w3.org/2000/09/xmldsig#";
+
+  /** Prefix used for the XMLDSig XML namespace. */
+  String DSIG_PREFIX = "dsig";
+
+  /** Local location of the XMLDSig XML schema. */
+  String DSIG_SCHEMA_LOCATION = SCHEMA_ROOT + "xmldsig-core-schema.xsd";
+
+  /** URI of the XMLDSig XPath Filter XML namespace. */
+  String DSIG_FILTER2_NS_URI = "http://www.w3.org/2002/06/xmldsig-filter2";
+
+  /** Prefix used for the XMLDSig XPath Filter XML namespace. */
+  String DSIG_FILTER2_PREFIX = "dsig-filter2";
+
+  /** Local location of the XMLDSig XPath Filter XML schema definition. */
+  String DSIG_FILTER2_SCHEMA_LOCATION = SCHEMA_ROOT + "xmldsig-filter2.xsd";
+
+  /** URI of the Exclusive Canonicalization XML namespace. */
+  String DSIG_EC_NS_URI = "http://www.w3.org/2001/10/xml-exc-c14n#";
+
+  /** Prefix used for the Exclusive Canonicalization XML namespace. */
+  String DSIG_EC_PREFIX = "ec";
+
+  /** Local location of the Exclusive Canonicalizaion XML schema definition. */
+  String DSIG_EC_SCHEMA_LOCATION = SCHEMA_ROOT + "exclusive-canonicalization.xsd";
+
+  /** URI of the XMLLoginParameterResolver Configuration XML namespace. */
+  String XMLLPR_NS_URI = "http://reference.e-government.gv.at/namespace/moa/20020822#/xmllpr20030814";
+
+  /**
+   * Local location of the XMLLoginParameterResolver Configuration XML schema
+   * definition.
+   */
+  String XMLLPR_SCHEMA_LOCATION = SCHEMA_ROOT + "MOAIdentities.xsd";
+
+  /** Local location of the XAdES v1.1.1 schema definition */
+  String XADES_1_1_1_SCHEMA_LOCATION = SCHEMA_ROOT + "XAdES-1.1.1.xsd";
+
+  /** URI of the XAdES v1.1.1 namespace */
+  String XADES_1_1_1_NS_URI = "http://uri.etsi.org/01903/v1.1.1#";
+
+  String XADES_1_1_1_NS_PREFIX = "xades111";
+
+  /** Local location of the XAdES v1.2.2 schema definition */
+  String XADES_1_2_2_SCHEMA_LOCATION = SCHEMA_ROOT + "XAdES-1.2.2.xsd";
+
+  /** URI of the XAdES v1.2.2 namespace */
+  String XADES_1_2_2_NS_URI = "http://uri.etsi.org/01903/v1.2.2#";
+
+  String XADES_1_2_2_NS_PREFIX = "xades122";
+
+  /** Local location of the XAdES v1.1.1 schema definition */
+  String XADES_1_3_2_SCHEMA_LOCATION = SCHEMA_ROOT + "XAdES-1.3.2.xsd";
+
+  /** URI of the XAdES v1.3.2 namespace */
+  String XADES_1_3_2_NS_URI = "http://uri.etsi.org/01903/v1.3.2#";
+
+  String XADES_1_3_2_NS_PREFIX = "xades132";
+
+  /** Local location of the XAdES v1.4.1 schema definition */
+  String XADES_1_4_1_SCHEMA_LOCATION = SCHEMA_ROOT + "XAdES-1.4.1.xsd";
+
+  /** URI of the XAdES v1.4.1 namespace */
+  String XADES_1_4_1_NS_URI = "http://uri.etsi.org/01903/v1.4.1#";
+
+  String XADES_1_4_1_NS_PREFIX = "xades141";
+  /** URI of the SAML 2.0 namespace. */
+  String SAML2_NS_URI = "urn:oasis:names:tc:SAML:2.0:assertion";
+
+  /** Prefix used for the SAML 2.0 XML namespace */
+  String SAML2_PREFIX = "saml2";
+
+  /** Local location of the SAML 2.0 XML schema definition. */
+  String SAML2_SCHEMA_LOCATION = SCHEMA_ROOT + "saml-schema-assertion-2.0.xsd";
+
+  /** URI of the SAML 2.0 protocol namespace. */
+  String SAML2P_NS_URI = "urn:oasis:names:tc:SAML:2.0:protocol";
+
+  /** Prefix used for the SAML 2.0 protocol XML namespace */
+  String SAML2P_PREFIX = "saml2p";
+
+  /** Local location of the SAML 2.0 protocol XML schema definition. */
+  String SAML2P_SCHEMA_LOCATION = SCHEMA_ROOT + "saml-schema-protocol-2.0.xsd";
+
+  /** URI of the STORK namespace. */
+  String STORK_NS_URI = "urn:eu:stork:names:tc:STORK:1.0:assertion";
+
+  /** Prefix used for the STORK XML namespace. */
+  String STORK_PREFIX = "stork";
+
+  /** Local location of the STORK XML schema definition. */
+  String STORK_SCHEMA_LOCATION = SCHEMA_ROOT + "stork-schema-assertion-1.0.xsd";
+
+  /** URI of the STORK protocol namespace. */
+  String STORKP_NS_URI = "urn:eu:stork:names:tc:STORK:1.0:protocol";
+
+  /** Prefix used for the STORK protocol XML namespace. */
+  String STORKP_PREFIX = "storkp";
+
+  /** Local location of the STORK protocol XML schema definition. */
+  String STORKP_SCHEMA_LOCATION = SCHEMA_ROOT + "stork-schema-protocol-1.0.xsd";
+
+  /** URI of the TSL namespace. */
+  String TSL_NS_URI = "http://uri.etsi.org/02231/v2#";
+
+  /** Prefix used for the TSL namespace. */
+  String TSL_PREFIX = "tsl1";
+
+  /** Local location of the TSL schema definition. */
+  String TSL_SCHEMA_LOCATION = SCHEMA_ROOT + "ts_119612v010201_xsd.xsd";
+
+  /** URI of the TSL SIE namespace. */
+  String TSL_SIE_NS_URI = "http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#";
+
+  /** Prefix used for the TSL SIE namespace. */
+  String TSL_SIE_PREFIX = "tslsie";
+
+  /** Local location of the TSL SIE schema definition. */
+  String TSL_SIE_SCHEMA_LOCATION = SCHEMA_ROOT + "ts_119612v010201_sie_xsd.xsd";
+
+  /** URI of the TSL additional types namespace. */
+  String TSL_ADDTYPES_NS_URI = "http://uri.etsi.org/02231/v2/additionaltypes#";
+
+  /** Prefix used for the TSL additional types namespace. */
+  String TSL_ADDTYPES_PREFIX = "tsltype";
+
+  /** Local location of the TSL additional types schema definition. */
+  String TSL_ADDTYPES_SCHEMA_LOCATION = SCHEMA_ROOT + "ts_ts_119612v010201_additionaltypes_xsd.xsd";
+
+  /** URI of the XML Encryption namespace. */
+  String XENC_NS_URI = "http://www.w3.org/2001/04/xmlenc#";
+
+  /** Prefix used for the XML Encryption XML namespace. */
+  String XENC_PREFIX = "xenc";
+
+  /** Local location of the XML Encryption XML schema definition. */
+  String XENC_SCHEMA_LOCATION = SCHEMA_ROOT + "xenc-schema.xsd";
+
+  /** Prefix used for the XML Encryption XML namespace. */
+  String SAML2_METADATA_PREFIX = "md";
+
+  /** Prefix used for the XML Encryption XML namespace. */
+  String SAML2_METADATA_URI = "urn:oasis:names:tc:SAML:2.0:metadata";
+
+  /** Local location of the XML Encryption XML schema definition. */
+  String SAML2_METADATA_SCHEMA_LOCATION = SCHEMA_ROOT + "saml-schema-metadata-2.0.xsd";
+
+  /* Prefix and Schema definition for eIDAS specific SAML2 extensions */
+  String SAML2_eIDAS_EXTENSIONS_PREFIX = "eidas";
+  String SAML2_eIDAS_EXTENSIONS = "http://eidas.europa.eu/saml-extensions";
+  String SAML2_eIDAS_EXTENSIONS_SCHEMA_LOCATION = SCHEMA_ROOT + "eIDAS_saml_extensions.xsd";
+
+  /* Prefix and Schema for SAML2 Entity Attributes */
+  String SAML2_MDATTR_EXTENSIONS_PREFIX = "mdattr";
+  String SAML2_MDATTR_EXTENSIONS = "urn:oasis:names:tc:SAML:metadata:attribute";
+  String SAML2_MDATTR_EXTENSIONS_SCHEMA_LOCATION = SCHEMA_ROOT + "sstc-metadata-attr.xsd";
+
+  /**
+   * Contains all namespaces and local schema locations for XML schema definitions
+   * relevant for MOA. For use in validating XML parsers.
+   */
+  String ALL_SCHEMA_LOCATIONS = MOA_NS_URI + " " + MOA_SCHEMA_LOCATION + " " + MOA_CONFIG_NS_URI + " "
+      + MOA_CONFIG_SCHEMA_LOCATION + " " + MOA_ID_CONFIG_NS_URI + " " + MOA_ID_CONFIG_SCHEMA_LOCATION + " "
+      + SL10_NS_URI + " " + SL10_SCHEMA_LOCATION + " " + SL11_NS_URI + " " + SL11_SCHEMA_LOCATION + " " + SL12_NS_URI
+      + " " + SL12_SCHEMA_LOCATION + " " + ECDSA_NS_URI + " " + ECDSA_SCHEMA_LOCATION + " " + PD_NS_URI + " "
+      + PD_SCHEMA_LOCATION + " " + SAML_NS_URI + " " + SAML_SCHEMA_LOCATION + " " + SAMLP_NS_URI + " "
+      + SAMLP_SCHEMA_LOCATION + " " + XML_NS_URI + " " + XML_SCHEMA_LOCATION + " " + XSI_NS_URI + " "
+      + XSI_SCHEMA_LOCATION + " " + DSIG_NS_URI + " " + DSIG_SCHEMA_LOCATION + " " + DSIG_FILTER2_NS_URI + " "
+      + DSIG_FILTER2_SCHEMA_LOCATION + " " + DSIG_EC_NS_URI + " " + DSIG_EC_SCHEMA_LOCATION + " " + XMLLPR_NS_URI + " "
+      + XMLLPR_SCHEMA_LOCATION + " " + XADES_1_1_1_NS_URI + " " + XADES_1_1_1_SCHEMA_LOCATION + " " + XADES_1_2_2_NS_URI
+      + " " + XADES_1_2_2_SCHEMA_LOCATION + " " + XADES_1_3_2_NS_URI + " " + XADES_1_3_2_SCHEMA_LOCATION + " "
+      + XADES_1_4_1_NS_URI + " " + XADES_1_4_1_SCHEMA_LOCATION + " " + TSL_NS_URI + " " + TSL_SCHEMA_LOCATION + " "
+      + TSL_SIE_NS_URI + " " + TSL_SIE_SCHEMA_LOCATION + " " + TSL_ADDTYPES_NS_URI + " " + TSL_ADDTYPES_SCHEMA_LOCATION
+      + " " + SAML2_NS_URI + " " + SAML2_SCHEMA_LOCATION + " " + SAML2P_NS_URI + " " + SAML2P_SCHEMA_LOCATION + " "
+      + STORK_NS_URI + " " + STORK_SCHEMA_LOCATION + " " + STORKP_NS_URI + " " + STORKP_SCHEMA_LOCATION + " "
+      + SAML2_METADATA_URI + " " + SAML2_METADATA_SCHEMA_LOCATION + " " + XENC_NS_URI + " " + XENC_SCHEMA_LOCATION + " "
+      + SAML2_eIDAS_EXTENSIONS + " " + SAML2_eIDAS_EXTENSIONS_SCHEMA_LOCATION + " " + SAML2_MDATTR_EXTENSIONS + " "
+      + SAML2_MDATTR_EXTENSIONS_SCHEMA_LOCATION;
+
+  /** Security Layer manifest type URI. */
+  String SL_MANIFEST_TYPE_URI = "http://www.buergerkarte.at/specifications/Security-Layer/20020225#SignatureManifest";
+
+  /** URI of the SHA1 digest algorithm. */
+  String SHA1_URI = "http://www.w3.org/2000/09/xmldsig#sha1";
+
+  /** URI of the SHA1 digest algorithm. */
+  String SHA256_URI = "http://www.w3.org/2000/09/xmldsig#sha256";
+
+  /** URI of the SHA1 digest algorithm. */
+  String SHA384_URI = "http://www.w3.org/2000/09/xmldsig#sha384";
+
+  /** URI of the SHA1 digest algorithm. */
+  String SHA512_URI = "http://www.w3.org/2000/09/xmldsig#sha512";
+
+  String SHA3_256_URI = "http://www.w3.org/2007/05/xmldsig-more#sha3-256";
+
+  String SHA3_512_URI = "http://www.w3.org/2007/05/xmldsig-more#sha3-512";
+
+  /** URI of the Canonical XML algorithm. */
+  String C14N_URI = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315";
+
+  /** URI of the Canoncial XML with comments algorithm. */
+  String C14N_WITH_COMMENTS_URI = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments";
+
+  /** URI of the Exclusive Canonical XML algorithm. */
+  String EXC_C14N_URI = "http://www.w3.org/2001/10/xml-exc-c14n#";
+
+  /** URI of the Exclusive Canonical XML with commments algorithm. */
+  String EXC_C14N_WITH_COMMENTS_URI = "http://www.w3.org/2001/10/xml-exc-c14n#WithComments";
+
+  /**
+   * A map used to map namespace prefixes to namespace URIs.
+   */
+  Map<String, String> nSMap = Collections.unmodifiableMap(new HashMap<String, String>() {
+    private static final long serialVersionUID = -4750456733381176033L;
+
+    {
+      put(XmlNamespaceConstants.SAML_PREFIX, XmlNamespaceConstants.SAML_NS_URI);
+      put(XmlNamespaceConstants.ECDSA_PREFIX, "http://www.w3.org/2001/04/xmldsig-more#");
+      put(XmlNamespaceConstants.DSIG_PREFIX, XmlNamespaceConstants.DSIG_NS_URI);
+    }
+  });
+
+}