Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-idspss

66 files changed, 2921 insertions, 1559 deletions

diff --git a/.cisettings.xml b/.cisettings.xml
new file mode 100644
index 000000000..8556c6a85
--- /dev/null
+++ b/.cisettings.xml
@@ -0,0 +1,37 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
+  <servers>
+    <server>
+      <id>gitlab</id>
+      <configuration>
+        <httpHeaders>
+          <property>
+            <name>Job-Token</name>
+            <value>${env.CI_JOB_TOKEN}</value>
+          </property>
+        </httpHeaders>
+      </configuration>
+    </server>
+    <server>
+      <id>gitlab-localbuild</id>
+      <configuration>
+        <httpHeaders>
+          <property>
+            <name>Private-Token</name>
+            <value>${env.PRIVATE_TOKEN}</value>
+          </property>
+        </httpHeaders>
+      </configuration>
+    </server>    
+    <server>
+      <id>egizMaven</id>
+      <username>${env.EGIZ_MAVEN_USER}</username>
+      <password>${env.EGIZ_MAVEN_PASSWORD}</password>
+      <configuration>
+        <knownHostsProvider implementation="org.apache.maven.wagon.providers.ssh.knownhost.NullKnownHostProvider">
+          <hostKeyChecking>no</hostKeyChecking>
+        </knownHostsProvider>
+      </configuration>
+    </server>
+  </servers>
+</settings>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..a0d68b89a
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,79 @@
+image: maven:latest
+
+variables:
+  LC_ALL: "en_US.UTF-8"
+  LANG: "en_US.UTF-8"
+  LANGUAGE: "en_US"
+  LIB_NAME: "MOA-ID"
+  MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true --settings ${CI_PROJECT_DIR}/.cisettings.xml"
+  MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=${CI_PROJECT_DIR}/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
+  GIT_SUBMODULE_STRATEGY: recursive
+  GIT_DEPTH: "2"
+  SECURE_LOG_LEVEL: "debug"
+
+include:
+  - template: Dependency-Scanning.gitlab-ci.yml
+  - template: Security/SAST.gitlab-ci.yml
+  - template: Secret-Detection.gitlab-ci.yml
+  - template: Code-Quality.gitlab-ci.yml
+
+stages:
+  - assemble
+  - test
+  - package
+  - release
+
+cache:
+  paths:
+    - ".m2/repository"
+    
+assemble:
+  stage: assemble
+  except:
+    - tags
+  script: |
+    mvn $MAVEN_CLI_OPTS compile test
+  artifacts:
+    when: always
+    reports:
+      junit: "**/target/surefire-reports/TEST-*.xml"
+
+publishToGitlab:
+  stage: package
+  except:
+    - tags
+  before_script:
+    - mkdir -p ~/.ssh
+    - ssh-keyscan apps.egiz.gv.at >> ~/.ssh/known_hosts
+    - chmod 644 ~/.ssh/known_hosts    
+  script: |
+    export VERSION=$(mvn -B help:evaluate -Dexpression=project.version -B | grep -v "\[INFO\]" | grep -Po "\d+\.\d+\.\d+((-\w*)+)?")
+    echo "Publishing version $VERSION for $LIB_NAME to public EGIZ maven"
+    mvn $MAVEN_CLI_OPTS deploy -s .cisettings.xml -P jenkinsDeploy -DskipTests 
+    echo "VERSION=$VERSION" >> variables.env
+  artifacts:
+    when: always
+    reports:
+      dotenv: variables.env
+
+release:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  needs:
+    - job: publishToGitlab
+      artifacts: true
+  when: manual
+  only:
+    - master
+  before_script:
+    - mkdir -p ~/.ssh
+    - ssh-keyscan apps.egiz.gv.at >> ~/.ssh/known_hosts
+    - chmod 644 ~/.ssh/known_hosts   
+  script: |
+    echo "Releasing version $VERSION of $LIB_NAME"
+    echo "Publishing version $VERSION to public EGIZ maven"
+    mvn $MAVEN_CLI_OPTS deploy -s .cisettings.xml -P jenkinsDeploy  
+  release:
+    name: "$VERSION"
+    tag_name: "v$VERSION"
+    description: "$(cat README.md)"
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index ef058411f..4a8ba973a 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>id</artifactId>
-        <version>4.1.4</version>
+        <version>4.1.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/id/history.txt b/id/history.txt
index 4f375b0b2..cdcc56261 100644
--- a/id/history.txt
+++ b/id/history.txt
@@ -1,5 +1,31 @@
 Dieses Dokument zeigt die Veränderungen und Erweiterungen von MOA-ID auf.

 

+Version MOA-ID Release 4.1.5: Änderungen seit Version MOA-ID 4.1.4

+  - Änderungen

+    - Anpassung der E-ID Proxy Implementierung an eine zusätzliche Anforderungen an das E-ID System

+      - Formatanpassung des eindeutigen Identifiers für das Applikationsregister

+  - Update von Libraries

+     > org.springframework 5.2.11.RELEASE

+     > org.springframework.data.spring-data-jpa 2.3.2.RELEASE

+     > org.springframework.data.spring-data-redis 2.3.5.RELEASE

+     > org.hibernate:hibernate-core 5.4.25.Final

+     > commons-dbcp2 2.8.0

+     > com.google.guava 30.0-jre

+     > org.apache.santuario.xmlsec 2.1.5

+     > org.apache.cxf 3.3.8

+     > org.apache.struts2 2.5.26

+     > org.apache.httpcomponents.httpclient 4.5.13

+     > org.apache.httpcomponents.httpcore 4.5.14

+     > mysql-connector 8.0.22

+     > fasterxml:jackson 2.12.0

+     > commons-io 2.8.0

+     > commons-fileupload 1.4

+     > jodatime 2.10.8

+     > postgresql 42.2.18

+     > org.apache.commons-commons-pool2 2.9.0

+     > iaik_jce_full 5.61_moa

+     > moa-spss 3.1.3

+

 Version MOA-ID Release 4.1.4: Änderungen seit Version MOA-ID 4.1.3

   - Änderungen

     - HTTP Proxy Support zum Laden von SAML2 Metadaten hinzugefügt

diff --git a/id/moa-id-webgui/pom.xml b/id/moa-id-webgui/pom.xml
index 8f2d041c2..fa7694129 100644
--- a/id/moa-id-webgui/pom.xml
+++ b/id/moa-id-webgui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>id</artifactId>
-        <version>4.1.4</version>
+        <version>4.1.5</version>
     </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml
index 331154ad7..b60e62ac3 100644
--- a/id/moa-spss-container/pom.xml
+++ b/id/moa-spss-container/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>MOA</groupId>
     <artifactId>id</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   <groupId>MOA.id</groupId>
   <artifactId>moa-spss-container</artifactId>
@@ -28,7 +28,7 @@
       <layout>default</layout>
       <url>file://${repositoryPath}</url>
     </repository>
-        <repository>
+    <repository>
       <id>MOA_web</id> 
       <name>MOA Dependencies weblocation</name>
       <releases>
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>MOA.spss.server</groupId>
       <artifactId>moa-sig-lib</artifactId>
-      <version>3.1.2</version>
+      <version>3.1.3</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -77,12 +77,12 @@
     <dependency>
       <groupId>MOA.spss</groupId>
       <artifactId>common</artifactId>
-      <version>3.1.2</version>
+      <version>3.1.3</version>
     </dependency>
     <dependency>
       <groupId>MOA.spss</groupId>
       <artifactId>tsl_lib</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.3</version>
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>iaik.prod</groupId>
       <artifactId>iaik_cpades</artifactId>
-      <version>2.5.1_moa</version>
+      <version>2.4_moa</version>
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
@@ -102,19 +102,19 @@
     <dependency>
       <groupId>iaik.prod</groupId>
       <artifactId>iaik_eccelerate</artifactId>
-      <version>5.01</version>
+      <version>6.02</version>
     </dependency>
 
     <dependency>
       <groupId>iaik.prod</groupId>
       <artifactId>iaik_eccelerate_addon</artifactId>
-      <version>5.01</version>
+      <version>6.02</version>
     </dependency>
 
     <dependency>
       <groupId>iaik.prod</groupId>
       <artifactId>iaik_eccelerate_cms</artifactId>
-      <version>5.01</version>
+      <version>6.02</version>
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
@@ -134,12 +134,12 @@
     <dependency>
       <groupId>iaik.prod</groupId>
       <artifactId>iaik_pki_module</artifactId>
-      <version>2.01_moa</version>
+      <version>2.02_moa</version>
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
       <artifactId>iaik_sva</artifactId>
-      <version>1.0.2_moa</version>
+      <version>1.0.3_moa</version>
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
@@ -159,7 +159,7 @@
     <dependency>
       <groupId>iaik.prod</groupId>
       <artifactId>iaik_xsect</artifactId>
-      <version>2.13_moa</version>
+      <version>2.14_moa</version>
     </dependency>
 
 
diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index ebf7dd439..1522121d2 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -4,7 +4,7 @@
     <parent>
   		<groupId>MOA</groupId>
     	<artifactId>id</artifactId>
-    	<version>4.1.4</version>
+    	<version>4.1.5</version>
   	</parent>
     
     <modelVersion>4.0.0</modelVersion>
@@ -17,19 +17,6 @@
     <properties>
         <repositoryPath>${basedir}/../../repository</repositoryPath>
     </properties>
-
-		<repositories>
-			<repository>
-				<id>shibboleth.internet2.edu</id>
-				<name>Internet2</name>
-				<url>https://apps.egiz.gv.at/shibboleth_nexus/</url>
-			</repository>
-            <repository>
-                <id>IAIK Local</id>
-                <name>iaik/libs</name>
-                <url>https://apps.egiz.gv.at/maven/</url>
-            </repository>
-		</repositories>
     
     <build>
         <finalName>oa</finalName>
diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java
index d6c14fd07..07edb250d 100644
--- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java
+++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java
@@ -196,6 +196,11 @@ public class Configuration {
 		return props.getProperty("general.login.pvp2.sp.requesterId");
 	}
 	
+  public boolean isEidasProxySimulatorEnabled() {
+    return Boolean.parseBoolean(
+        props.getProperty("general.login.pvp2.sp.eidas.proxy.simulation", "false"));
+	}
+	
 	public boolean setNameIdPolicy() {
 			return Boolean.parseBoolean(props.getProperty("general.login.pvp2.req.set.nameIDPolicy", "true"));
 	}
diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java
index 4e8e12499..d4c67cfae 100644
--- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java
+++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java
@@ -23,7 +23,9 @@
 package at.gv.egovernment.moa.id.demoOA.servlet.pvp2;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyStore;
+import java.text.MessageFormat;
 import java.util.Map;
 
 import javax.servlet.ServletException;
@@ -34,6 +36,7 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.velocity.app.VelocityEngine;
@@ -45,6 +48,7 @@ import org.opensaml.common.impl.SecureRandomIdentifierGenerator;
 import org.opensaml.common.xml.SAMLConstants;
 import org.opensaml.saml2.binding.encoding.HTTPPostEncoder;
 import org.opensaml.saml2.binding.encoding.HTTPRedirectDeflateEncoder;
+import org.opensaml.saml2.common.Extensions;
 import org.opensaml.saml2.core.AuthnContextClassRef;
 import org.opensaml.saml2.core.AuthnContextComparisonTypeEnumeration;
 import org.opensaml.saml2.core.AuthnRequest;
@@ -60,13 +64,25 @@ import org.opensaml.saml2.metadata.SingleSignOnService;
 import org.opensaml.saml2.metadata.impl.SingleSignOnServiceBuilder;
 import org.opensaml.saml2.metadata.provider.HTTPMetadataProvider;
 import org.opensaml.ws.transport.http.HttpServletResponseAdapter;
+import org.opensaml.xml.XMLObject;
+import org.opensaml.xml.io.Marshaller;
+import org.opensaml.xml.io.MarshallingException;
+import org.opensaml.xml.io.Unmarshaller;
+import org.opensaml.xml.io.UnmarshallingException;
+import org.opensaml.xml.schema.XSAny;
 import org.opensaml.xml.security.x509.KeyStoreX509CredentialAdapter;
 import org.opensaml.xml.security.x509.X509Credential;
 import org.opensaml.xml.signature.Signature;
 import org.opensaml.xml.signature.SignatureConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
 
+import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
+import at.gv.egiz.eaaf.core.impl.utils.DOMUtils;
+import at.gv.egiz.eaaf.core.impl.utils.EAAFDomEntityResolver;
 import at.gv.egovernment.moa.id.demoOA.Configuration;
 import at.gv.egovernment.moa.id.demoOA.exception.ConfigurationException;
 import at.gv.egovernment.moa.id.demoOA.utils.SAML2Utils;
@@ -215,6 +231,11 @@ public class Authenticate extends HttpServlet {
 				
 			}
 			
+			if (config.isEidasProxySimulatorEnabled()) {
+			  authReq = injectEidasMsProxyAttributes(request, authReq);
+			  
+			}
+			
 			
 			//sign authentication request
 			KeyStore keyStore = config.getPVP2KeyStore();
@@ -284,7 +305,57 @@ public class Authenticate extends HttpServlet {
 		}
 	}
 
-	/**
+
+	private AuthnRequest injectEidasMsProxyAttributes(HttpServletRequest request, AuthnRequest authReq) 
+	    throws SAXException, IOException, ParserConfigurationException, MarshallingException, UnmarshallingException {
+	  
+	  //build extension from template
+	  String xmlTemplate = IOUtils.toString(
+	      Authenticate.class.getResourceAsStream("/templates/reqAttributes.xml"), 
+	      StandardCharsets.UTF_8);
+	  	  	
+	  String target = EAAFConstants.URN_PREFIX_EIDAS + "AT+" + getParameterOrDefault(request, "eidasCountry", "DE");
+    String loa = EAAFConstants.EIDAS_LOA_PREFIX + getParameterOrDefault(request, "loa", "high");
+    String eidasConnector = "https://simple.test/" + getParameterOrDefault(request, "eidasIdPostfix", "test");
+    String xmlString = MessageFormat.format(xmlTemplate, target, loa, eidasConnector);	  
+    log.debug("Formated requested attributes: " + xmlString);
+    
+    Document extension = DOMUtils.parseDocument(xmlString, false, null, null);	  
+	  
+    
+    //marshalle, inject, and unmarshalle request to set extension
+    //TODO: find better solution, be it is good enough for a first simple test
+    DocumentBuilder builder;
+    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();    
+    builder = factory.newDocumentBuilder();
+    Document document = builder.newDocument();
+    Marshaller out = org.opensaml.Configuration.getMarshallerFactory().getMarshaller(authReq);
+    out.marshall(authReq, document);
+    
+    Node extElement = document.importNode(extension.getDocumentElement(), true);    
+    //document.getDocumentElement().appendChild(extElement);
+    document.getDocumentElement().insertBefore(extElement, document.getChildNodes().item(2));
+    
+    Unmarshaller in = org.opensaml.Configuration.getUnmarshallerFactory().getUnmarshaller(document.getDocumentElement());
+    return (AuthnRequest) in.unmarshall(document.getDocumentElement());
+        
+  }
+	
+	
+  private String getParameterOrDefault(HttpServletRequest request, String paramName, String defaultValue) {
+    String reqParam = request.getParameter(paramName);
+    if (MiscUtil.isEmpty(reqParam)) {
+      return defaultValue;
+      
+    } else {
+      return reqParam;
+      
+    }
+    
+  }
+
+
+  /**
 	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
 	 *      response)
 	 */
diff --git a/id/pom.xml b/id/pom.xml
index 1e24df553..84506b71c 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>MOA</artifactId>
-        <version>4.1.4</version>
+        <version>4.1.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/id/readme_4.1.5.txt b/id/readme_4.1.5.txt
new file mode 100644
index 000000000..062bd3958
--- /dev/null
+++ b/id/readme_4.1.5.txt
@@ -0,0 +1,537 @@
+===============================================================================
+MOA ID Version Release 4.1.5 - Wichtige Informationen zur Installation
+===============================================================================
+
+-------------------------------------------------------------------------------
+A. Neuerungen/Änderungen
+-------------------------------------------------------------------------------
+
+Mit MOA ID Version 4.1.5 unterstützt MOA-ID nun wieder Authentifizierung mittels
+Bürgerkarte, Handy-Signatur oder eIDAS als auch den Betrieb als SAML1 Proxy zum 
+zentralen E-ID System entsprechend dem neuen elektronischen Identitätsnachweis. 
+Im Detail umfasst das folgende Neuerungen und Änderungen (siehe auch 
+history.txt im gleichen Verzeichnis).
+   
+ - Änderungen
+   - Anpassung der E-ID Proxy Implementierung um weiter Anforderungen durch das Applikationsregister
+     - Formatanpassung des eindeutigen Identifiers für das Applikationsregister
+
+Hinweis: Vor einem Parallelbetrieb von MOA-ID und MOA-SPSS als eigenständige Web-Applikationen in der gleichen
+         Apache Tomcat Instanz wird seit Java >= 9 abgeraten da es potentiell zu Problem mit dem Java Classloader
+         im Tomcat Appliactionsserver kommen kann. 
+               
+
+-------------------------------------------------------------------------------
+B. Durchführung eines Updates
+-------------------------------------------------------------------------------
+
+Es wird generell eine Neuinstallation lt. Handbuch empfohlen! Dennoch ist auch
+eine Aktualisierung bestehender Installationen möglich. Je nachdem von welcher
+MOA-ID Version ausgegangen wird ergibt sich eine Kombination der nachfolgend 
+angebebenen Updateschritte.
+
+Hinweis: Die bestehende Konfiguration von MOA-ID 3.x.x kann weitestgehend 
+übernommen werden da mit dem Update auf die Version 4.0.x viele Konfigurationsparameter 
+nicht mehr erforderlich sind und somit (sofern vorhanden) ignoriert werden. Somit ist 
+ein Löschen der bestehenden Konfiguration nicht zwingend notwendig.    
+Für den Betrieb als E-ID Proxy muss in diesem Fall nur die Konfiguration für das das neue 
+E-ID Proxy Authentifizierungsmodul hinzugefügt wurde.    
+
+Hinweis: Wenn Sie die bestehende Konfiguration von MOA-ID 2.x.x in MOA-ID 4.0.x
+reimportieren möchten, so muss diese vor dem Update mit Hilfe der import/export
+Funktion der grafischen Konfigurationsoberfläche in eine Datei exportiert werden.
+Diese Datei dient dann als Basis für den Import in MOA-ID 4.0.x. 
+
+...............................................................................
+B.0 Durchführung eines Updates von Version 4.1.2 auf Version 4.1.5
+...............................................................................
+1. Stoppen Sie den Tomcat, in dem Ihre bisherige Installation betrieben wird.
+   Fertigen Sie eine Sicherungskopie Ihrer kompletten Tomcat-Installation an.
+
+2. Entpacken Sie die Distribution von MOA-ID-Auth (moa-id-auth-4.1.5.zip) in
+   ein temporäres Verzeichnis, in weiterer Folge als MOA_ID_AUTH_INST 
+   bezeichnet.
+
+3. Wechseln Sie in jenes Verzeichnis, das die Webapplikation von MOA ID Auth
+   beinhaltet (für gewöhnlich ist dieses Verzeichnis CATALINA_HOME_ID/webapps,
+   wobei CATALINA_HOME_ID für das Basisverzeichnis der Tomcat-Installation 
+   für MOA ID steht). Löschen Sie darin sowohl die Dateien moa-id-auth.war 
+   als auch das komplette Verzeichnis moa-id-auth. 
+
+4 Umstellung auf Java JDK 9
+    Die 'JAVA_HOME\jre\lib\ext' und die 'CATALINA_HOME_ID\endorsed' wird in Java 9 
+    nicht mehr unterstützt und entsprechende Referenzen müssen aus den Start-Scripts
+    entfernt werden. Ab MOA-ID 3.3.2 sind die Bibliotheken, welche früher in 
+    den beiden Verzeichnissen hinterlegt waren, direkt in MOA-ID integriert. 
+    Falls sie eine Java Version < 9 verwenden und aktuell Bibliotheken in diesen
+    Verzeichnissen abgelegt haben müssen diese aktualisiert werden:
+      
+  4.1. Erstellen Sie eine Sicherungskopie aller "iaik*.jar"-Dateien im Verzeichnis
+	   JAVA_HOME\jre\lib\ext und loeschen Sie diese Dateien danach.
+	
+  4.2. Kopieren Sie alle Dateien aus dem Verzeichnis MOA_ID_AUTH_INST\ext in das 
+   Verzeichnis	JAVA_HOME\jre\lib\ext (Achtung: Java 1.4.x wird nicht mehr 
+   unterstuetzt).
+
+5. Kopieren Sie die Datei MOA_ID_AUTH_INST/moa-id-auth.war nach
+   CATALINA_HOME_ID/webapps.
+
+6. Hinzufügen der zusätzlichen Konfigurationsparameter in der MOA-ID-Auth
+   Konfigurationsdatei CATALINA_HOME\conf\moa-id\moa-id.properties
+6.1 SAML1 Requestparameter Validierung
+    >configuration.validate.saml1.parameter.strict
+6.2 HTTP Proxy Konfiguration via JAVA System-Properties
+    > -Dhttp.proxyHost=
+    > -Dhttp.proxyPort=
+    > -Dhttp.proxyUser=
+    > -Dhttp.proxyPassword=
+    > -Dhttp.nonProxyHosts=
+
+7. Neue Zertifikate für die Anbindung an das E-ID System
+7.1 Kopieren sie folgende Zertifikate in den jeweiligen TrustStore ihrer MOA-ID Konfiguration
+    > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/EID_metadata/E-ID_Testsystem_eid2.oesterreich.gv.at.crt
+    > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/EID_metadata/E-ID_Prodsystem_eid.oesterreich.gv.at.crt
+    
+    > MOA_ID_AUTH_INST/conf/moa-id/certs/ca-certs/Terena_SSL_CA3.crt
+    > MOA_ID_AUTH_INST/conf/moa-id/certs/ca-certs/DigiCert_Assured_ID_Root_CA.crt
+
+8. Starten Sie den Tomcat neu, achten Sie auf eventuelle Fehlermeldungen im
+    Logging von MOA ID beim Einlesen der Konfiguration.
+
+...............................................................................
+B.1 Durchführung eines Updates von Version 4.1.x auf Version 4.1.5
+...............................................................................
+1. Stoppen Sie den Tomcat, in dem Ihre bisherige Installation betrieben wird.
+   Fertigen Sie eine Sicherungskopie Ihrer kompletten Tomcat-Installation an.
+
+2. Entpacken Sie die Distribution von MOA-ID-Auth (moa-id-auth-4.1.5.zip) in
+   ein temporäres Verzeichnis, in weiterer Folge als MOA_ID_AUTH_INST 
+   bezeichnet.
+
+3. Wechseln Sie in jenes Verzeichnis, das die Webapplikation von MOA ID Auth
+   beinhaltet (für gewöhnlich ist dieses Verzeichnis CATALINA_HOME_ID/webapps,
+   wobei CATALINA_HOME_ID für das Basisverzeichnis der Tomcat-Installation 
+   für MOA ID steht). Löschen Sie darin sowohl die Dateien moa-id-auth.war 
+   als auch das komplette Verzeichnis moa-id-auth. 
+
+4 Umstellung auf Java JDK 9
+    Die 'JAVA_HOME\jre\lib\ext' und die 'CATALINA_HOME_ID\endorsed' wird in Java 9 
+    nicht mehr unterstützt und entsprechende Referenzen müssen aus den Start-Scripts
+    entfernt werden. Ab MOA-ID 3.3.2 sind die Bibliotheken, welche früher in 
+    den beiden Verzeichnissen hinterlegt waren, direkt in MOA-ID integriert. 
+    Falls sie eine Java Version < 9 verwenden und aktuell Bibliotheken in diesen
+    Verzeichnissen abgelegt haben müssen diese aktualisiert werden:
+      
+  4.1. Erstellen Sie eine Sicherungskopie aller "iaik*.jar"-Dateien im Verzeichnis
+	   JAVA_HOME\jre\lib\ext und loeschen Sie diese Dateien danach.
+	
+  4.2. Kopieren Sie alle Dateien aus dem Verzeichnis MOA_ID_AUTH_INST\ext in das 
+   Verzeichnis	JAVA_HOME\jre\lib\ext (Achtung: Java 1.4.x wird nicht mehr 
+   unterstuetzt).
+
+5. Kopieren Sie die Datei MOA_ID_AUTH_INST/moa-id-auth.war nach
+   CATALINA_HOME_ID/webapps.
+   
+6. Kopieren Sie die Datei MOA_ID_AUTH_INST/moa-id-configuration.war nach
+   CATALINA_HOME_ID/webapps.
+
+7. Hinzufügen der zusätzlichen Konfigurationsparameter in der MOA-ID-Auth
+   Konfigurationsdatei CATALINA_HOME\conf\moa-id\moa-id.properties
+7.1 Anbindung an das zentrale E-ID System   
+    > modules.eidproxyauth.endpoint.appreginfo.enable
+7.2 SAML1 Requestparameter Validierung
+    >configuration.validate.saml1.parameter.strict
+7.2 HTTP Proxy Konfiguration via JAVA System-Properties
+    > -Dhttp.proxyHost=
+    > -Dhttp.proxyPort=
+    > -Dhttp.proxyUser=
+    > -Dhttp.proxyPassword=
+
+8. Geänderte GUI Templates
+    > MOA_ID_AUTH_INST/conf/moa-id/htmlTemplates/css_template.css
+    > MOA_ID_AUTH_INST/conf/moa-id/htmlTemplates/javascript_tempalte.js
+   
+9. Neue A-Trust Zertifikate für Handy-Signatur Anmeldung und für die Anbindung an das E-ID System
+9.1 Kopieren sie folgende Zertifikate in den jeweiligen TrustStore ihrer MOA-ID Konfiguration
+    > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Root-07.cer
+    > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/a-sign-Premium-Sig-07.cer
+    > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/a-sign-Premium-Mobile-07.cer    
+    > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Root-07.cer
+    > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Sig-07.cer
+    > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Mobile-07.cer
+    > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/EID_metadata/E-ID_Testsystem_eid2.oesterreich.gv.at.crt
+    > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/EID_metadata/E-ID_Prodsystem_eid.oesterreich.gv.at.crt
+    > MOA_ID_AUTH_INST/conf/moa-id/certs/ca-certs/Terena_SSL_CA3.crt
+    > MOA_ID_AUTH_INST/conf/moa-id/certs/ca-certs/DigiCert_Assured_ID_Root_CA.crt
+        
+9.2 Kopieren sie folgende Zertifikate in den CertStore ihrer MOA-ID Konfiguration
+    > MOA_ID_AUTH_INST/conf/moa-spss/certstore/toBeAdded/A-Trust-Root-07.cer
+    > MOA_ID_AUTH_INST/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Sig-07.cer
+    > MOA_ID_AUTH_INST/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Mobile-07.cer
+
+10. Zusätzliche Funktionalität für den MOA E-ID Proxy Mode:
+     Mit der Version 4.1.2 des MOA E-ID Proxy wurde die eindeutigen Applikationsidentifier
+     von Onlineapplikationen am MOA E-ID Proxy, welche im zentralen Applikationsregister 
+     registriert werden müssen, geändert um die Eindeutigkeit im Applikationsregister gewährleisten
+     zu können. Somit können die Unique Identifier (PublicUrlPrefix) aus der MOA E-ID Proxy 
+     konfiguration nicht mehr direkt für die Registriergung am E-ID System verwendet werden.
+     Der MOA E-ID Proxy bietet unter der URL $MOA_EID_PROXY$/eid/getappregid (z.B. 
+     https://demo.egiz.gv.at/moa-id-auth/eid/getappregid?OA=https://labda.iaik.tugraz.at:5553/demologin/test1)
+     einen Endpunkt an über der eindeute Identifier für die Eintragung ins Applikationsregister abgefragt
+     werde kann. Als Abfrageparameter dienen die selben Parameter wie sie auch für einen SAML1 
+     Authentifizierungsrequest verwendet werden (siehe Handbuch 
+     https://apps.egiz.gv.at/handbooks/moa-id/handbook/protocol/protocol.html#saml1_startauth).
+     Eine Abfrage ist jedoch nur für am MOA E-ID Proxy registrierte Onlineapplikationen möglich. 
+    
+   
+11. Starten Sie den Tomcat neu, achten Sie auf eventuelle Fehlermeldungen im
+    Logging von MOA ID beim Einlesen der Konfiguration.
+
+...............................................................................
+B.2 Durchführung eines Updates von Version 4.0.0 auf Version 4.1.5
+...............................................................................
+1. Exportieren Sie die aktuelle Konfiguration von MOA-ID mit Hilfe der import/export
+   Funktion der grafischen Konfigurationsoberfläche in eine Datei. Dieser Export 
+   dient nur als Backup und wird für den Updateprozess nicht zwingend benötigt.
+
+2. Stoppen Sie den Tomcat, in dem Ihre bisherige Installation betrieben wird.
+   Fertigen Sie eine Sicherungskopie Ihrer kompletten Tomcat-Installation an.
+
+3. Entpacken Sie die Distribution von MOA-ID-Auth (moa-id-auth-4.1.5.zip) in
+   ein temporäres Verzeichnis, in weiterer Folge als MOA_ID_AUTH_INST 
+   bezeichnet.
+
+4. Wechseln Sie in jenes Verzeichnis, das die Webapplikation von MOA ID Auth
+   beinhaltet (für gewöhnlich ist dieses Verzeichnis CATALINA_HOME_ID/webapps,
+   wobei CATALINA_HOME_ID für das Basisverzeichnis der Tomcat-Installation 
+   für MOA ID steht). Löschen Sie darin sowohl die Dateien moa-id-auth.war 
+   als auch das komplette Verzeichnis moa-id-auth. 
+
+5 Umstellung auf Java JDK 9
+    Die 'JAVA_HOME\jre\lib\ext' und die 'CATALINA_HOME_ID\endorsed' wird in Java 9 
+    nicht mehr unterstützt und entsprechende Referenzen müssen aus den Start-Scripts
+    entfernt werden. Ab MOA-ID 3.3.2 sind die Bibliotheken, welche früher in 
+    den beiden Verzeichnissen hinterlegt waren, direkt in MOA-ID integriert. 
+    Falls sie eine Java Version < 9 verwenden und aktuell Bibliotheken in diesen
+    Verzeichnissen abgelegt haben müssen diese aktualisiert werden:
+      
+  5.1. Erstellen Sie eine Sicherungskopie aller "iaik*.jar"-Dateien im Verzeichnis
+	   JAVA_HOME\jre\lib\ext und loeschen Sie diese Dateien danach.
+	
+  5.2. Kopieren Sie alle Dateien aus dem Verzeichnis MOA_ID_AUTH_INST\ext in das 
+   Verzeichnis	JAVA_HOME\jre\lib\ext (Achtung: Java 1.6.x wird nicht mehr 
+   unterstuetzt).
+
+6. Kopieren Sie die Datei MOA_ID_AUTH_INST/moa-id-auth.war nach
+   CATALINA_HOME_ID/webapps.
+   
+7. Kopieren Sie die Datei MOA_ID_AUTH_INST/moa-id-configuration.war nach
+   CATALINA_HOME_ID/webapps.
+
+8. Hinzufügen der zusätzlichen Konfigurationsparameter in der MOA-ID-Auth
+   Konfigurationsdatei CATALINA_HOME\conf\moa-id\moa-id.properties
+8.1 Anbindung an das zentrale E-ID System   
+    > modules.eidproxyauth.endpoint.appreginfo.enable
+8.2 SAML1 Requestparameter Validierung
+    >configuration.validate.saml1.parameter.strict
+8.2 HTTP Proxy Konfiguration via JAVA System-Properties
+    > -Dhttp.proxyHost=
+    > -Dhttp.proxyPort=
+    > -Dhttp.proxyUser=
+    > -Dhttp.proxyPassword=
+    
+9. Geänderte GUI Templates
+    > MOA_ID_AUTH_INST/conf/moa-id/htmlTemplates/css_template.css
+    > MOA_ID_AUTH_INST/conf/moa-id/htmlTemplates/javascript_tempalte.js
+   
+10. Neue A-Trust Zertifikate für Handy-Signatur Anmeldung und die Anbindung an das E-ID System
+10.1 Kopieren sie folgende Zertifikate in den jeweiligen TrustStore ihrer MOA-ID Konfiguration
+     > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Root-07.cer
+     > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/a-sign-Premium-Sig-07.cer
+     > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/a-sign-Premium-Mobile-07.cer    
+     > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Root-07.cer
+     > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Sig-07.cer
+     > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Mobile-07.cer
+    > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/EID_metadata/E-ID_Testsystem_eid2.oesterreich.gv.at.crt
+    > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/EID_metadata/E-ID_Prodsystem_eid.oesterreich.gv.at.crt
+    > MOA_ID_AUTH_INST/conf/moa-id/certs/ca-certs/Terena_SSL_CA3.crt
+    > MOA_ID_AUTH_INST/conf/moa-id/certs/ca-certs/DigiCert_Assured_ID_Root_CA.crt
+        
+10.2 Kopieren sie folgende Zertifikate in den CertStore ihrer MOA-ID Konfiguration
+     > MOA_ID_AUTH_INST/conf/moa-spss/certstore/toBeAdded/A-Trust-Root-07.cer
+     > MOA_ID_AUTH_INST/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Sig-07.cer
+     > MOA_ID_AUTH_INST/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Mobile-07.cer
+       
+11. Zusätzliche Funktionalität für den MOA E-ID Proxy Mode:
+     Mit der Version 4.1.2 des MOA E-ID Proxy wurde die eindeutigen Applikationsidentifier
+     von Onlineapplikationen am MOA E-ID Proxy, welche im zentralen Applikationsregister 
+     registriert werden müssen, geändert um die Eindeutigkeit im Applikationsregister gewährleisten
+     zu können. Somit können die Unique Identifier (PublicUrlPrefix) aus der MOA E-ID Proxy 
+     konfiguration nicht mehr direkt für die Registriergung am E-ID System verwendet werden.
+     Der MOA E-ID Proxy bietet unter der URL $MOA_EID_PROXY$/eid/getappregid (z.B. 
+     https://demo.egiz.gv.at/moa-id-auth/eid/getappregid?OA=https://labda.iaik.tugraz.at:5553/demologin/test1)
+     einen Endpunkt an über der eindeute Identifier für die Eintragung ins Applikationsregister abgefragt
+     werde kann. Als Abfrageparameter dienen die selben Parameter wie sie auch für einen SAML1 
+     Authentifizierungsrequest verwendet werden (siehe Handbuch 
+     https://apps.egiz.gv.at/handbooks/moa-id/handbook/protocol/protocol.html#saml1_startauth).
+     Eine Abfrage ist jedoch nur für am MOA E-ID Proxy registrierte Onlineapplikationen möglich.    
+   
+12. Starten Sie den Tomcat neu, achten Sie auf eventuelle Fehlermeldungen im
+    Logging von MOA ID beim Einlesen der Konfiguration.
+
+
+...............................................................................
+B.3 Durchführung eines Updates von Version 3.4.x auf Version 4.1.5
+...............................................................................
+1. Exportieren Sie die aktuelle Konfiguration von MOA-ID mit Hilfe der import/export
+   Funktion der grafischen Konfigurationsoberfläche in eine Datei. Dieser Export 
+   dient nur als Backup und wird für den Updateprozess nicht zwingend benötigt.
+
+2. Stoppen Sie den Tomcat, in dem Ihre bisherige Installation betrieben wird.
+   Fertigen Sie eine Sicherungskopie Ihrer kompletten Tomcat-Installation an.
+
+3. Entpacken Sie die Distribution von MOA-ID-Auth (moa-id-auth-4.1.5.zip) in
+   ein temporäres Verzeichnis, in weiterer Folge als MOA_ID_AUTH_INST 
+   bezeichnet.
+
+4. Wechseln Sie in jenes Verzeichnis, das die Webapplikation von MOA ID Auth
+   beinhaltet (für gewöhnlich ist dieses Verzeichnis CATALINA_HOME_ID/webapps,
+   wobei CATALINA_HOME_ID für das Basisverzeichnis der Tomcat-Installation 
+   für MOA ID steht). Löschen Sie darin sowohl die Dateien moa-id-auth.war 
+   als auch das komplette Verzeichnis moa-id-auth. 
+
+5 Umstellung auf Java JDK 9
+    Die 'JAVA_HOME\jre\lib\ext' und die 'CATALINA_HOME_ID\endorsed' wird in Java 9 
+    nicht mehr unterstützt und entsprechende Referenzen müssen aus den Start-Scripts
+    entfernt werden. Ab MOA-ID 3.3.2 sind die Bibliotheken, welche früher in 
+    den beiden Verzeichnissen hinterlegt waren, direkt in MOA-ID integriert. 
+    Falls sie eine Java Version < 9 verwenden und aktuell Bibliotheken in diesen
+    Verzeichnissen abgelegt haben müssen diese aktualisiert werden:
+      
+  5.1. Erstellen Sie eine Sicherungskopie aller "iaik*.jar"-Dateien im Verzeichnis
+	   JAVA_HOME\jre\lib\ext und loeschen Sie diese Dateien danach.
+	
+  5.2. Kopieren Sie alle Dateien aus dem Verzeichnis MOA_ID_AUTH_INST\ext in das 
+   Verzeichnis	JAVA_HOME\jre\lib\ext (Achtung: Java 1.6.x wird nicht mehr 
+   unterstuetzt).
+
+6. Kopieren Sie die Datei MOA_ID_AUTH_INST/moa-id-auth.war nach
+   CATALINA_HOME_ID/webapps.
+   
+7. Kopieren Sie die Datei MOA_ID_AUTH_INST/moa-id-configuration.war nach
+   CATALINA_HOME_ID/webapps.
+   
+8. Hinzufügen der zusätzlichen Konfigurationsparameter in der MOA-ID-Auth
+   Konfigurationsdatei CATALINA_HOME\conf\moa-id\moa-id.properties
+8.1 Anbindung an das zentrale E-ID System   
+    > modules.eidproxyauth.keystore.path=
+    > modules.eidproxyauth.keystore.password=
+    > modules.eidproxyauth.metadata.sign.password=password
+    > modules.eidproxyauth.metadata.sign.alias=pvp_metadata 
+    > modules.eidproxyauth.request.sign.password=password
+    > modules.eidproxyauth.request.sign.alias=pvp_assertion  
+    > modules.eidproxyauth.response.encryption.password=password
+    > modules.eidproxyauth.response.encryption.alias=pvp_assertion  
+    > modules.eidproxyauth.EID.trustprofileID=eid_metadata
+    > modules.eidproxyauth.endpoint.appreginfo.enable=true
+8.2 SAML1 Requestparameter Validierung
+    >configuration.validate.saml1.parameter.strict
+8.3 HTTP Proxy Konfiguration via JAVA System-Properties
+    > -Dhttp.proxyHost=
+    > -Dhttp.proxyPort=
+    > -Dhttp.proxyUser=
+    > -Dhttp.proxyPassword=
+
+9. Update der MOA-SPSS Konfiguration
+    a.) Erstellen Sie eine Sicherungskopie der Verzeichnisse:
+       - CATALINA_HOME\conf\moa-spss     
+    b.) Kopieren Sie die Dateien aus dem Verzeichnis MOA_ID_INST_AUTH\conf\moa-spss\trustProfiles\EID_metadata
+         in das Verzeichnis CATALINA_HOME\conf\moa-spss\trustProfiles\EID_metadata           
+    c.) Kopieren Sie die Datei MOA_ID_INST_AUTH\conf\moa-spss\SampleMOASPSSConfiguration.xml 
+         in das Verzeichnis CATALINA_HOME\conf\moa-spss\ , oder aktualisieren Sie ihre aktuell
+         verwendete MOA-SPSS Konfiguration manuell. Folgende Teile wurden ergänzt:
+           ...
+           <cfg:Id>eid_metadata</cfg:Id>
+					    <cfg:TrustAnchorsLocation>trustProfiles/EID_metadata</cfg:TrustAnchorsLocation>
+				   </cfg:TrustProfile>
+           ...
+    d.) Kopieren sie folgende Zertifikate in den jeweiligen TrustStore ihrer MOA-ID Konfiguration
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Root-07.cer
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/a-sign-Premium-Sig-07.cer
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/a-sign-Premium-Mobile-07.cer    
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Root-07.cer
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Sig-07.cer
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Mobile-07.cer        
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/EID_metadata/E-ID_Testsystem_eid2.oesterreich.gv.at.crt
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/EID_metadata/E-ID_Prodsystem_eid.oesterreich.gv.at.crt
+        > MOA_ID_AUTH_INST/conf/moa-id/certs/ca-certs/Terena_SSL_CA3.crt
+        > MOA_ID_AUTH_INST/conf/moa-id/certs/ca-certs/DigiCert_Assured_ID_Root_CA.crt
+        
+    e.) Kopieren sie folgende Zertifikate in den CertStore ihrer MOA-ID Konfiguration
+        > MOA_ID_AUTH_INST/conf/moa-spss/certstore/toBeAdded/A-Trust-Root-07.cer
+        > MOA_ID_AUTH_INST/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Sig-07.cer
+        > MOA_ID_AUTH_INST/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Mobile-07.cer
+                      
+10.  Update the MOA-ID Konfiguration via Web-basierten Konfigurationstool
+     Diese Schitte können erst nach der Installation und dem Start der Applikation
+     moa-id-configuration.war durchgeführt werden
+10.1 Anbindung das zentrale E-ID System 
+    a.) Bekanntgabe von Endpunkten (Produktiv, Test, ... ) der zu verwendenten
+        IDPs des zentralen E-ID Systems
+        
+    b.) Auswahl des gewünschte EndPunkts je Online-Applikation
+        sofern im Schritt a. mehr als Ein Endpunkt konfiguriert wurde. 
+        Hinweis: Als Default wird immer der Erste im Schritt a. hinterlegte Endpunkt verwendet  
+
+11. Geänderte GUI Templates
+     > MOA_ID_AUTH_INST/conf/moa-id/htmlTemplates/css_template.css
+     > MOA_ID_AUTH_INST/conf/moa-id/htmlTemplates/javascript_tempalte.js        
+        
+12. Starten Sie den Tomcat neu, achten Sie auf eventuelle Fehlermeldungen im
+    Logging von MOA ID beim Einlesen der Konfiguration.
+
+
+...............................................................................
+B.4 Durchführung eines Updates von Version 3.x.x auf Version 4.1.5
+...............................................................................
+1. Exportieren Sie die aktuelle Konfiguration von MOA-ID mit Hilfe der import/export
+   Funktion der grafischen Konfigurationsoberfläche in eine Datei. Dieser Export 
+   dient nur als Backup und wird für den Updateprozess nicht zwingend benötigt.
+
+2. Stoppen Sie den Tomcat, in dem Ihre bisherige Installation betrieben wird.
+   Fertigen Sie eine Sicherungskopie Ihrer kompletten Tomcat-Installation an.
+
+3. Entpacken Sie die Distribution von MOA-ID-Auth (moa-id-auth-4.1.5.zip) in
+   ein temporäres Verzeichnis, in weiterer Folge als MOA_ID_AUTH_INST 
+   bezeichnet.
+
+4. Wechseln Sie in jenes Verzeichnis, das die Webapplikation von MOA ID Auth
+   beinhaltet (für gewöhnlich ist dieses Verzeichnis CATALINA_HOME_ID/webapps,
+   wobei CATALINA_HOME_ID für das Basisverzeichnis der Tomcat-Installation 
+   für MOA ID steht). Löschen Sie darin sowohl die Dateien moa-id-auth.war 
+   als auch das komplette Verzeichnis moa-id-auth. 
+
+5 Umstellung auf Java JDK 9
+    Die 'JAVA_HOME\jre\lib\ext' und die 'CATALINA_HOME_ID\endorsed' wird in Java 9 
+    nicht mehr unterstützt und entsprechende Referenzen müssen aus den Start-Scripts
+    entfernt werden. Ab MOA-ID 3.3.2 sind die Bibliotheken, welche früher in 
+    den beiden Verzeichnissen hinterlegt waren, direkt in MOA-ID integriert. 
+    Falls sie eine Java Version < 9 verwenden und aktuell Bibliotheken in diesen
+    Verzeichnissen abgelegt haben müssen diese aktualisiert werden:
+      
+  5.1. Erstellen Sie eine Sicherungskopie aller "iaik*.jar"-Dateien im Verzeichnis
+	   JAVA_HOME\jre\lib\ext und loeschen Sie diese Dateien danach.
+	
+  5.2. Kopieren Sie alle Dateien aus dem Verzeichnis MOA_ID_AUTH_INST\ext in das 
+   Verzeichnis	JAVA_HOME\jre\lib\ext (Achtung: Java 1.6.x wird nicht mehr 
+   unterstuetzt).
+  
+  5.3. Erstellen Sie eine Sicherungskopie aller "iaik*.jar"-Dateien im Verzeichnis
+	   CATALINA_HOME_ID\endorsed und loeschen Sie diese Dateien danach.
+   
+  5.4 Kopieren Sie alle Dateien aus dem Verzeichnis MOA_ID_AUTH_INST\endorsed in das 
+    Verzeichnis	CATALINA_HOME_ID\endorsed.   
+   
+6. Kopieren Sie die Datei MOA_ID_AUTH_INST/moa-id-auth.war nach
+   CATALINA_HOME_ID/webapps.
+   
+7. Kopieren Sie die Datei MOA_ID_AUTH_INST/moa-id-configuration.war nach
+   CATALINA_HOME_ID/webapps.
+   
+8. Hinzufügen der zusätzlichen Konfigurationsparameter in der MOA-ID-Auth
+   Konfigurationsdatei CATALINA_HOME\conf\moa-id\moa-id.properties
+8.1 Anbindung an das zentrale E-ID System   
+    > modules.eidproxyauth.keystore.path=
+    > modules.eidproxyauth.keystore.password=
+    > modules.eidproxyauth.metadata.sign.password=password
+    > modules.eidproxyauth.metadata.sign.alias=pvp_metadata 
+    > modules.eidproxyauth.request.sign.password=password
+    > modules.eidproxyauth.request.sign.alias=pvp_assertion  
+    > modules.eidproxyauth.response.encryption.password=password
+    > modules.eidproxyauth.response.encryption.alias=pvp_assertion  
+    > modules.eidproxyauth.EID.trustprofileID=eid_metadata
+    > modules.eidproxyauth.endpoint.appreginfo.enable=true
+8.2 SAML1 Requestparameter Validierung
+    >configuration.validate.saml1.parameter.strict
+8.3 HTTP Proxy Konfiguration via JAVA System-Properties
+    > -Dhttp.proxyHost=
+    > -Dhttp.proxyPort=
+    > -Dhttp.proxyUser=
+    > -Dhttp.proxyPassword=
+    
+9. Update der MOA-SPSS Konfiguration
+    a.) Erstellen Sie eine Sicherungskopie der Verzeichnisse:
+       - CATALINA_HOME\conf\moa-spss     
+    b.) Kopieren Sie die Dateien aus dem Verzeichnis MOA_ID_INST_AUTH\conf\moa-spss\trustProfiles\EID_metadata
+         in das Verzeichnis CATALINA_HOME\conf\moa-spss\trustProfiles\EID_metadata           
+    c.) Kopieren Sie die Datei MOA_ID_INST_AUTH\conf\moa-spss\SampleMOASPSSConfiguration.xml 
+         in das Verzeichnis CATALINA_HOME\conf\moa-spss\ , oder aktualisieren Sie ihre aktuell
+         verwendete MOA-SPSS Konfiguration manuell. Folgende Teile wurden ergänzt:
+           ...
+           <cfg:Id>eid_metadata</cfg:Id>
+					    <cfg:TrustAnchorsLocation>trustProfiles/EID_metadata</cfg:TrustAnchorsLocation>
+				   </cfg:TrustProfile>
+           ...
+    d.) Kopieren sie folgende Zertifikate in den jeweiligen TrustStore ihrer MOA-ID Konfiguration
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Root-07.cer
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/a-sign-Premium-Sig-07.cer
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/a-sign-Premium-Mobile-07.cer    
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Root-07.cer
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Sig-07.cer
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Mobile-07.cer        
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/EID_metadata/E-ID_Testsystem_eid2.oesterreich.gv.at.crt
+        > MOA_ID_AUTH_INST/conf/moa-spss/trustProfiles/EID_metadata/E-ID_Prodsystem_eid.oesterreich.gv.at.crt
+        > MOA_ID_AUTH_INST/conf/moa-id/certs/ca-certs/Terena_SSL_CA3.crt
+        > MOA_ID_AUTH_INST/conf/moa-id/certs/ca-certs/DigiCert_Assured_ID_Root_CA.crt
+        
+    e.) Kopieren sie folgende Zertifikate in den CertStore ihrer MOA-ID Konfiguration
+        > MOA_ID_AUTH_INST/conf/moa-spss/certstore/toBeAdded/A-Trust-Root-07.cer
+        > MOA_ID_AUTH_INST/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Sig-07.cer
+        > MOA_ID_AUTH_INST/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Mobile-07.cer
+           
+           
+10.  Update the MOA-ID Konfiguration via Web-basierten Konfigurationstool
+     Diese Schitte können erst nach der Installation und dem Start der Applikation
+     moa-id-configuration.war durchgeführt werden
+10.1 Anbindung das zentrale E-ID System 
+    a.) Bekanntgabe von Endpunkten (Produktiv, Test, ... ) der zu verwendenten
+        IDPs des zentralen E-ID Systems
+        
+    b.) Auswahl des gewünschte EndPunkts je Online-Applikation
+        sofern im Schritt a. mehr als Ein Endpunkt konfiguriert wurde. 
+        Hinweis: Als Default wird immer der Erste im Schritt a. hinterlegte Endpunkt verwendet  
+
+11. Geänderte GUI Templates
+     > MOA_ID_AUTH_INST/conf/moa-id/htmlTemplates/css_template.css
+     > MOA_ID_AUTH_INST/conf/moa-id/htmlTemplates/javascript_tempalte.js        
+                
+        
+12. Optionale Updates:
+12.1. Die mySQL Treiber 'com.mysql.jdbc.Drive' und 'org.hibernate.dialect.MySQLDialect'
+      sind deprecated für aktuelle mySQL DB Versionen. Der neue Treiber 
+      für mySQL Datenbanken lautet 'com.mysql.cj.jdbc.Driver' und ein aktuellerer
+      Hibernate Dialect lautet 'org.hibernate.dialect.MySQL5Dialect'. 
+      Sollte es zu Problemen kommen ersetzen Sie entsprechenden Zeilen durch:
+      a.) Konfigurationsdatei CATALINA_HOME\conf\moa-id\moa-id.properties
+          moasession.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+          moasession.hibernate.connection.driver_class=com.mysql.cj.jdbc.Driver
+          configuration.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+          configuration.hibernate.connection.driver_class=com.mysql.cj.jdbc.Driver
+          advancedlogging.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+          advancedlogging.hibernate.connection.driver_class=com.mysql.cj.jdbc.Driver
+      b.) Konfigurationsdatei CATALINA_HOME\conf\moa-id-configuration\moa-id-configtool.properties
+          hibernate.connection.driver_class=com.mysql.cj.jdbc.Driver
+
+13. Starten Sie den Tomcat neu, achten Sie auf eventuelle Fehlermeldungen im
+    Logging von MOA ID beim Einlesen der Konfiguration.
+
+
+
+...............................................................................
+B.5 Durchführung eines Updates von Version < 3.0.0
+...............................................................................
+
+Bitte führen Sie eine Neuinstallation von MOA ID laut Handbuch durch und passen
+Sie die mitgelieferte Musterkonfiguration entsprechend Ihren Bedürfnissen unter 
+Zuhilfenahme Ihrer bisherigen Konfiguration an.
+
diff --git a/id/server/auth-edu/pom.xml b/id/server/auth-edu/pom.xml
index 0f09a0c8a..5a743549b 100644
--- a/id/server/auth-edu/pom.xml
+++ b/id/server/auth-edu/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>4.1.4</version>
+		<version>4.1.5</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml
index 0a863b171..72d5b51d7 100644
--- a/id/server/auth-final/pom.xml
+++ b/id/server/auth-final/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>4.1.4</version>
+		<version>4.1.5</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/id/server/data/deploy/conf/moa-id/moa-id.properties b/id/server/data/deploy/conf/moa-id/moa-id.properties
index ba883d1a1..0a579a53d 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -66,6 +66,9 @@ modules.eidproxyauth.EID.trustprofileID=eid_metadata
 #modules.eidproxyauth.EID.entityId=https://eid.egiz.gv.at/idp/shibboleth
 #modules.eidproxyauth.EID.metadataUrl=
 
+
+#modules.eidproxyauth.appreg.id.layout.v2=true
+
 ######################## Protokolle am IDP ############################################
 
 ##Protocol configuration##
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index eed5f5669..28d0b3f68 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -4,7 +4,7 @@
 	<parent>

 		<groupId>MOA.id</groupId>

 		<artifactId>moa-id</artifactId>

-		<version>4.1.4</version>

+		<version>4.1.5</version>

 	</parent>

 

 	<groupId>MOA.id.server</groupId>

@@ -16,14 +16,6 @@
 		<repositoryPath>${basedir}/../../../repository</repositoryPath>

 	</properties>

 

-	<repositories>

-		<repository>

-			<id>shibboleth.internet2.edu</id>

-			<name>Internet2</name>

-			<url>https://apps.egiz.gv.at/shibboleth_nexus/</url>

-		</repository>

-	</repositories>

-

 	<dependencies>

 		<!-- TestNG -->

 		<dependency>

@@ -503,7 +495,7 @@
 	    <dependency>

 	    	<groupId>org.apache.commons</groupId>

 	    	<artifactId>commons-pool2</artifactId>

-	    	<version>2.8.1</version>

+	    	<version>2.9.0</version>

 	    </dependency>

 	    <dependency>

 	    	<groupId>redis.clients</groupId>

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
index b9c15e75e..d20ba5582 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
@@ -2,19 +2,19 @@
  * 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
@@ -43,7 +43,6 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.id.auth.validator;
 
 import java.security.InvalidKeyException;
@@ -58,6 +57,7 @@ import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
 import at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse;
 import at.gv.egovernment.moa.id.auth.exception.ValidateException;
 import at.gv.egovernment.moa.id.commons.MOAIDAuthConstants;
+import at.gv.egovernment.moa.id.commons.MOAIDConstants;
 import at.gv.egovernment.moa.id.commons.api.AuthConfiguration;
 import at.gv.egovernment.moa.id.commons.api.IOAAuthParameters;
 import at.gv.egovernment.moa.id.commons.api.data.IVerifiyXMLSignatureResponse;
@@ -71,19 +71,19 @@ import iaik.x509.X509Certificate;
 import iaik.x509.X509ExtensionInitException;
 
 /**
- * This class is used to validate an {@link VerifyXMLSignatureResponse} 
- * returned by MOA-SPSS
- * 
+ * This class is used to validate an {@link VerifyXMLSignatureResponse} returned
+ * by MOA-SPSS
+ *
  * @author Stefan Knirsch
  * @version $Id$
  */
 public class VerifyXMLSignatureResponseValidator {
-  
+
   /** Identification string for checking identity link */
   public static final String CHECK_IDENTITY_LINK = "IdentityLink";
   /** Identification string for checking authentication block */
   public static final String CHECK_AUTH_BLOCK = "AuthBlock";
-  
+
   /** Singleton instance. <code>null</code>, if none has been created. */
   private static VerifyXMLSignatureResponseValidator instance;
 
@@ -91,7 +91,7 @@ public class VerifyXMLSignatureResponseValidator {
    * Constructor for a singleton VerifyXMLSignatureResponseValidator.
    */
   public static synchronized VerifyXMLSignatureResponseValidator getInstance()
-    throws ValidateException {
+      throws ValidateException {
     if (instance == null) {
       instance = new VerifyXMLSignatureResponseValidator();
     }
@@ -99,121 +99,139 @@ public class VerifyXMLSignatureResponseValidator {
   }
 
   /**
-   * Validates a {@link VerifyXMLSignatureResponse} returned by MOA-SPSS. 
-   * 
-   * @param verifyXMLSignatureResponse the <code>&lt;VerifyXMLSignatureResponse&gt;</code>
+   * Validates a {@link VerifyXMLSignatureResponse} returned by MOA-SPSS.
+   *
+   * @param verifyXMLSignatureResponse        the
+   *                                          <code>&lt;VerifyXMLSignatureResponse&gt;</code>
    * @param identityLinkSignersSubjectDNNames subject names configured
-   * @param whatToCheck is used to identify whether the identityLink or the Auth-Block is validated
-   * @param oaParam specifies whether the validation result of the 
-   *                                       manifest has to be ignored (identityLink validation if
-   *                                       the OA is a business service) or not
-   * @throws ValidateException on any validation error
- * @throws ConfigurationException 
+   * @param whatToCheck                       is used to identify whether the
+   *                                          identityLink or the Auth-Block is
+   *                                          validated
+   * @param oaParam                           specifies whether the validation
+   *                                          result of the manifest has to be
+   *                                          ignored (identityLink validation if
+   *                                          the OA is a business service) or not
+   * @throws ValidateException      on any validation error
+   * @throws ConfigurationException
    */
   public void validate(IVerifiyXMLSignatureResponse verifyXMLSignatureResponse,
-                       List<String> identityLinkSignersSubjectDNNames, 
-                       String whatToCheck,
-                       IOAAuthParameters oaParam,
-                       AuthConfiguration authConfig)
-    throws ValidateException, ConfigurationException {
-
-    if (verifyXMLSignatureResponse.getSignatureCheckCode() != 0)
-      throw new ValidateException("validator.06", new Object[] {whatToCheck});
-      
+      List<String> identityLinkSignersSubjectDNNames,
+      String whatToCheck,
+      IOAAuthParameters oaParam,
+      AuthConfiguration authConfig)
+      throws ValidateException, ConfigurationException {
+
+    if (verifyXMLSignatureResponse.getSignatureCheckCode() != 0) {
+      throw new ValidateException("validator.06", new Object[] { whatToCheck });
+    }
+
     if (verifyXMLSignatureResponse.getCertificateCheckCode() != 0) {
-			String checkFailedReason ="";
-			if (verifyXMLSignatureResponse.getCertificateCheckCode() == 1) 
-				checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.21", null);
-			if (verifyXMLSignatureResponse.getCertificateCheckCode() == 2) 
-				checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.22", null);
-			if (verifyXMLSignatureResponse.getCertificateCheckCode() == 3) 
-				checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.23", null);
-			if (verifyXMLSignatureResponse.getCertificateCheckCode() == 4) 
-				checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.24", null);
-			if (verifyXMLSignatureResponse.getCertificateCheckCode() == 5) 
-				checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.25", null);
+      String checkFailedReason = "";
+      if (verifyXMLSignatureResponse.getCertificateCheckCode() == 1) {
+        checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.21", null);
+      }
+      if (verifyXMLSignatureResponse.getCertificateCheckCode() == 2) {
+        checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.22", null);
+      }
+      if (verifyXMLSignatureResponse.getCertificateCheckCode() == 3) {
+        checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.23", null);
+      }
+      if (verifyXMLSignatureResponse.getCertificateCheckCode() == 4) {
+        checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.24", null);
+      }
+      if (verifyXMLSignatureResponse.getCertificateCheckCode() == 5) {
+        checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.25", null);
+      }
 
 //     TEST CARDS
-      if (whatToCheck.equals(CHECK_IDENTITY_LINK))
-        throw new ValidateException("validator.07", new Object[] { checkFailedReason } );
-      else
-        throw new ValidateException("validator.19", new Object[] { checkFailedReason } );
+      if (whatToCheck.equals(CHECK_IDENTITY_LINK)) {
+        throw new ValidateException("validator.07", new Object[] { checkFailedReason });
+      } else {
+        throw new ValidateException("validator.19", new Object[] { checkFailedReason });
+      }
     }
-    
-    //check QC 
+
+    // check QC
     if (authConfig.isCertifiacteQCActive() &&
-    		!whatToCheck.equals(CHECK_IDENTITY_LINK) &&
-    		!verifyXMLSignatureResponse.isQualifiedCertificate()) {
-    	    	
-    	//check if testcards are active and certificate has an extension for test credentials
-    	if (oaParam.isTestCredentialEnabled()) {
-        	boolean foundTestCredentialOID = false;
-        	try {
-        		X509Certificate signerCert = verifyXMLSignatureResponse.getX509certificate();
-    		
-        		List<String> validOIDs = new ArrayList<String>();
-        		if (oaParam.getTestCredentialOIDs() != null)
-        			validOIDs.addAll(oaParam.getTestCredentialOIDs());
-        		else
-        			validOIDs.add(MOAIDAuthConstants.TESTCREDENTIALROOTOID);
-    		
-        		Set<String> extentsions = signerCert.getCriticalExtensionOIDs();
-        		extentsions.addAll(signerCert.getNonCriticalExtensionOIDs());
-        		Iterator<String> extit = extentsions.iterator();
-        		while(extit.hasNext()) {
-        			String certOID = extit.next();
-        			for (String el : validOIDs) {
-        				if (certOID.startsWith(el))
-        					foundTestCredentialOID = true;
-        			}    			
-        		}
-        		
-        	} catch (Exception e) {
-        		Logger.warn("Test credential OID extraction FAILED.", e);
-        		
-        	}
-        	//throw Exception if not TestCredentialOID is found
-        	if (!foundTestCredentialOID)
-        		throw new ValidateException("validator.72", null);
-    		
-    	} else    	
-    		throw new ValidateException("validator.71", null);        
+        !whatToCheck.equals(CHECK_IDENTITY_LINK) &&
+        !verifyXMLSignatureResponse.isQualifiedCertificate()) {
+
+      // check if testcards are active and certificate has an extension for test
+      // credentials
+      if (oaParam.isTestCredentialEnabled()) {
+        boolean foundTestCredentialOID = false;
+        try {
+          final X509Certificate signerCert = verifyXMLSignatureResponse.getX509certificate();
+
+          final List<String> validOIDs = new ArrayList<>();
+          if (oaParam.getTestCredentialOIDs() != null) {
+            validOIDs.addAll(oaParam.getTestCredentialOIDs());
+          } else {
+            validOIDs.add(MOAIDConstants.TESTCREDENTIALROOTOID);
+          }
+
+          final Set<String> extentsions = signerCert.getCriticalExtensionOIDs();
+          extentsions.addAll(signerCert.getNonCriticalExtensionOIDs());
+          final Iterator<String> extit = extentsions.iterator();
+          while (extit.hasNext()) {
+            final String certOID = extit.next();
+            for (final String el : validOIDs) {
+              if (certOID.startsWith(el)) {
+                foundTestCredentialOID = true;
+              }
+            }
+          }
+
+        } catch (final Exception e) {
+          Logger.warn("Test credential OID extraction FAILED.", e);
+
+        }
+        // throw Exception if not TestCredentialOID is found
+        if (!foundTestCredentialOID) {
+          throw new ValidateException("validator.72", null);
+        }
+
+      } else {
+        throw new ValidateException("validator.71", null);
+      }
     }
-    
+
     // if OA is type is business service the manifest validation result has
     // to be ignored
     boolean ignoreManifestValidationResult = false;
-    if (whatToCheck.equals(CHECK_IDENTITY_LINK))    	
-    	ignoreManifestValidationResult = (oaParam.hasBaseIdInternalProcessingRestriction()) ? true
-            : false;
-    
+    if (whatToCheck.equals(CHECK_IDENTITY_LINK)) {
+      ignoreManifestValidationResult = oaParam.hasBaseIdInternalProcessingRestriction() ? true
+          : false;
+    }
+
     if (ignoreManifestValidationResult) {
       Logger.debug("OA type is business service, thus ignoring DSIG manifest validation result");
     } else {
-      if (verifyXMLSignatureResponse.isXmlDSIGManigest())
-        if (verifyXMLSignatureResponse.getXmlDSIGManifestCheckCode() != 0)
+      if (verifyXMLSignatureResponse.isXmlDSIGManigest()) {
+        if (verifyXMLSignatureResponse.getXmlDSIGManifestCheckCode() != 0) {
           throw new ValidateException("validator.08", null);
+        }
+      }
     }
-    
-    
+
     // Check the signature manifest only when verifying the signed AUTHBlock
     if (whatToCheck.equals(CHECK_AUTH_BLOCK)) {
       if (verifyXMLSignatureResponse.getSignatureManifestCheckCode() > 0) {
         throw new ValidateException("validator.50", null);
       }
     }
-        
-    //Check whether the returned X509 SubjectName is in the MOA-ID configuration or not
+
+    // Check whether the returned X509 SubjectName is in the MOA-ID configuration or
+    // not
     if (identityLinkSignersSubjectDNNames != null) {
       String subjectDN = "";
-      X509Certificate x509Cert = verifyXMLSignatureResponse.getX509certificate();
+      final X509Certificate x509Cert = verifyXMLSignatureResponse.getX509certificate();
       try {
         subjectDN = ((Name) x509Cert.getSubjectDN()).getRFC2253String();
-      }
-      catch (RFC2253NameParserException e) {
+      } catch (final RFC2253NameParserException e) {
         throw new ValidateException("validator.17", null);
       }
-      //System.out.println("subjectDN: " + subjectDN);
+      // System.out.println("subjectDN: " + subjectDN);
       // check the authorisation to sign the identity link
       if (!identityLinkSignersSubjectDNNames.contains(subjectDN)) {
         // subject DN check failed, try OID check:
@@ -222,86 +240,86 @@ public class VerifyXMLSignatureResponseValidator {
             throw new ValidateException("validator.18", new Object[] { subjectDN });
           } else {
             Logger.debug("Identity link signer cert accepted for signing identity link: " +
-                         "subjectDN check failed, but OID check successfully passed.");
+                "subjectDN check failed, but OID check successfully passed.");
           }
-        } catch (X509ExtensionInitException e) {
+        } catch (final X509ExtensionInitException e) {
           throw new ValidateException("validator.49", null);
         }
       } else {
         Logger.debug("Identity link signer cert accepted for signing identity link: " +
-                     "subjectDN check successfully passed.");
+            "subjectDN check successfully passed.");
       }
-      
+
     }
   }
-  
+
   /**
    * Method validateCertificate.
+   *
    * @param verifyXMLSignatureResponse The VerifyXMLSignatureResponse
-   * @param idl The Identitylink
+   * @param idl                        The Identitylink
    * @throws ValidateException
    */
   public void validateCertificate(
-    IVerifiyXMLSignatureResponse verifyXMLSignatureResponse,
-    IIdentityLink idl)
-    throws ValidateException {
+      IVerifiyXMLSignatureResponse verifyXMLSignatureResponse,
+      IIdentityLink idl)
+      throws ValidateException {
 
-    X509Certificate x509Response = verifyXMLSignatureResponse.getX509certificate();
-    PublicKey[] pubKeysIdentityLink = (PublicKey[]) idl.getPublicKey();
+    final X509Certificate x509Response = verifyXMLSignatureResponse.getX509certificate();
+    final PublicKey[] pubKeysIdentityLink = idl.getPublicKey();
 
-    PublicKey pubKeySignature = x509Response.getPublicKey();
+    final PublicKey pubKeySignature = x509Response.getPublicKey();
     checkIDLAgainstSignatureCertificate(pubKeysIdentityLink, pubKeySignature);
-    
+
   }
-  
-  
-  public void checkIDLAgainstSignatureCertificate( PublicKey[] pubKeysIdentityLink, PublicKey pubKeySignature) throws ValidateException {
+
+  public void checkIDLAgainstSignatureCertificate(PublicKey[] pubKeysIdentityLink, PublicKey pubKeySignature)
+      throws ValidateException {
     boolean found = false;
-    for (int i = 0; i < pubKeysIdentityLink.length; i++) {
-      PublicKey idlPubKey = pubKeysIdentityLink[i];
-      //compare RSAPublicKeys
-      if ((idlPubKey instanceof java.security.interfaces.RSAPublicKey) &&  
-      		(pubKeySignature instanceof java.security.interfaces.RSAPublicKey)) {
-
-          RSAPublicKey rsaPubKeySignature = (RSAPublicKey) pubKeySignature;
-          RSAPublicKey rsakey = (RSAPublicKey) pubKeysIdentityLink[i];
-          
-          if (rsakey.getModulus().equals(rsaPubKeySignature.getModulus())
-              && rsakey.getPublicExponent().equals(rsaPubKeySignature.getPublicExponent()))
-          found = true;      
+    for (final PublicKey idlPubKey : pubKeysIdentityLink) {
+      // compare RSAPublicKeys
+      if (idlPubKey instanceof java.security.interfaces.RSAPublicKey &&
+          pubKeySignature instanceof java.security.interfaces.RSAPublicKey) {
+
+        final RSAPublicKey rsaPubKeySignature = (RSAPublicKey) pubKeySignature;
+        final RSAPublicKey rsakey = (RSAPublicKey) idlPubKey;
+
+        if (rsakey.getModulus().equals(rsaPubKeySignature.getModulus())
+            && rsakey.getPublicExponent().equals(rsaPubKeySignature.getPublicExponent())) {
+          found = true;
+        }
       }
-      
-      //compare ECDSAPublicKeys
-      if( ( (idlPubKey instanceof java.security.interfaces.ECPublicKey) || 
-    		  (idlPubKey instanceof ECPublicKey)) && 
-         ( (pubKeySignature instanceof java.security.interfaces.ECPublicKey) || 
-        		(pubKeySignature instanceof ECPublicKey) ) ) {
-
-		try {
-			ECPublicKey ecdsaPubKeySignature = new ECPublicKey(pubKeySignature.getEncoded());
-			ECPublicKey ecdsakey = new ECPublicKey(pubKeysIdentityLink[i].getEncoded());
-			
-	        if(ecdsakey.equals(ecdsaPubKeySignature))
-	              found = true;
-			
-		} catch (InvalidKeyException e) {
-			Logger.warn("ECPublicKey can not parsed into a iaik.ECPublicKey", e);
-			throw new ValidateException("validator.09", null);
-		}
-          
-          
+
+      // compare ECDSAPublicKeys
+      if ((idlPubKey instanceof java.security.interfaces.ECPublicKey ||
+          idlPubKey instanceof ECPublicKey) &&
+          (pubKeySignature instanceof java.security.interfaces.ECPublicKey ||
+              pubKeySignature instanceof ECPublicKey)) {
+
+        try {
+          final ECPublicKey ecdsaPubKeySignature = new ECPublicKey(pubKeySignature.getEncoded());
+          final ECPublicKey ecdsakey = new ECPublicKey(idlPubKey.getEncoded());
+
+          if (ecdsakey.equals(ecdsaPubKeySignature)) {
+            found = true;
+          }
+
+        } catch (final InvalidKeyException e) {
+          Logger.warn("ECPublicKey can not parsed into a iaik.ECPublicKey", e);
+          throw new ValidateException("validator.09", null);
+        }
 
       }
-      
+
 //  		Logger.debug("IDL-Pubkey=" + idl.getPublicKey()[i].getClass().getName()
 //  				+ "  Resp-Pubkey=" + pubKeySignature.getClass().getName());
-      
+
     }
 
     if (!found) {
-       	
+
       throw new ValidateException("validator.09", null);
-            
+
     }
   }
 
diff --git a/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java
index e79fa6aa4..721144106 100644
--- a/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java
@@ -67,7 +67,7 @@ public class MOASPSSTestCase extends UnitTestCase {
  
   protected void setupSSL() {
     System.setProperty("javax.net.debug", "all");
-    Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
+    //Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
     System.setProperty(
       "java.protocol.handler.pkgs",
       "com.sun.net.ssl.internal.www.protocol");
diff --git a/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/util/ParamValidatorUtilsTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/util/ParamValidatorUtilsTest.java
index d7cc2bd3a..74efff39f 100644
--- a/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/util/ParamValidatorUtilsTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/util/ParamValidatorUtilsTest.java
@@ -28,6 +28,7 @@ import javax.servlet.http.Part;
 
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.BlockJUnit4ClassRunner;
@@ -231,6 +232,7 @@ public class ParamValidatorUtilsTest {
     
   }
   
+  @Ignore
   @Test
   public void templateLazyWhitelistNine() {
     
@@ -247,6 +249,7 @@ public class ParamValidatorUtilsTest {
     
   }
   
+  @Ignore
   @Test
   public void templateLazyWhitelistTen() {
     
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 980390298..545a9d953 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -1,274 +1,276 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>MOA.id</groupId>
-        <artifactId>moa-id</artifactId>
-        <version>4.1.4</version>
-    </parent>
-    <artifactId>moa-id-commons</artifactId>
-    <name>moa-id-commons</name>
-    <groupId>MOA.id.server</groupId>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>moaid_local</id>
-                    <name>local</name>
-                    <url>file:${basedir}/../../../repository</url>
-                </repository>
-               	<repository>
-					<id>shibboleth.internet2.edu</id>
-					<name>Internet2</name>
-					<url>https://apps.egiz.gv.at/shibboleth_nexus/</url>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>MOA.id</groupId>
+		<artifactId>moa-id</artifactId>
+		<version>4.1.5</version>
+	</parent>
+	<artifactId>moa-id-commons</artifactId>
+	<name>moa-id-commons</name>
+	<groupId>MOA.id.server</groupId>
+
+	<profiles>
+		<profile>
+			<id>default</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<repositories>
+				<repository>
+					<id>moaid_local</id>
+					<name>local</name>
+					<url>file:${basedir}/../../../repository</url>
+				</repository>
+				<repository>
+					<id>jboss</id>
+					<url>https://repository.jboss.org/nexus/content/repositories/central/</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+				</repository>
+				<repository>
+					<id>egiz-commons</id>
+					<url>https://apps.egiz.gv.at/maven/</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>egiz-commons-snapshot</id>
+					<url>https://apps.egiz.gv.at/maven-snapshot/</url>
+					<releases>
+						<enabled>false</enabled>
+					</releases>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
 				</repository>
-                <repository>
-                    <id>jboss</id>
-                    <url>https://repository.jboss.org/nexus/content/repositories/central/</url>
-                    <releases>
-                        <enabled>true</enabled>
-                    </releases>
-                </repository>
-        		<repository>
-          			<id>egiz-commons</id>
-          			<url>https://apps.egiz.gv.at/maven/</url>
-          			<releases>
-            			<enabled>true</enabled>
-          			</releases>
-          			<snapshots>
-          				<enabled>false</enabled>
-          			</snapshots>
-        		</repository>
-        		<repository>
-          			<id>egiz-commons-snapshot</id>
-          			<url>https://apps.egiz.gv.at/maven-snapshot/</url>
-          			<releases>
-            			<enabled>false</enabled>
-          			</releases>
-          			<snapshots>
-          				<enabled>true</enabled>
-          			</snapshots>
-          		</repository>
-            </repositories>
-        </profile>
-    </profiles>
-
-
-    <dependencies>
-    		<dependency>
-    			<groupId>at.gv.egiz.eaaf</groupId>
-  				<artifactId>eaaf_core_api</artifactId>
-    		</dependency>
-    		<dependency>
-    			<groupId>at.gv.egiz.eaaf</groupId>
-	  			<artifactId>eaaf-core</artifactId>
-    		</dependency>    
-    		<dependency>
-    			<groupId>MOA.id.server</groupId>
-    			<artifactId>moa-id-jaxb_classes</artifactId>
-    		</dependency>
-    		<dependency>
-    			 <groupId>at.gv.util</groupId>
-          		 <artifactId>egovutils</artifactId>
-           		<exclusions>
-           			<exclusion>
-           				<groupId>*</groupId>
-           				<artifactId>*</artifactId>
-           			</exclusion>
-           		</exclusions>
-    		</dependency>
-    
-       		<dependency>
-    			<groupId>org.opensaml</groupId>
-  				<artifactId>opensaml</artifactId>
-           		<exclusions>
-           			<exclusion>
-           				<groupId>*</groupId>
-           				<artifactId>*</artifactId>
-           			</exclusion>
-           		</exclusions>
-    		</dependency>
-    		<dependency> 
-				<groupId>org.opensaml</groupId>
-				<artifactId>openws</artifactId>
-				<exclusions>
-					<exclusion>
-						<groupId>*</groupId>
-           				<artifactId>*</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-    
-    		<dependency>
-    			<groupId>org.apache.httpcomponents</groupId>
-    			<artifactId>httpclient</artifactId>
-				</dependency>
-    
-    		<dependency>
-    			<groupId>org.apache.httpcomponents</groupId>
-    			<artifactId>httpcore</artifactId>
-				</dependency>
-    
-    
-       <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-    
-    		<dependency>
-	    		<groupId>at.gv.egiz.components</groupId>
-	    		<artifactId>egiz-configuration-api</artifactId>
-	    		<version>0.2</version>
-    		</dependency>
-    		<dependency>
-    			<groupId>at.gv.egiz.components</groupId>
-    			<artifactId>egiz-configuration-file</artifactId>
-    			<version>0.2</version>
-    		</dependency>        
-    
-    		<dependency>
-    			<groupId>at.gv.egiz.eaaf</groupId>
-	  			<artifactId>eaaf-core</artifactId>
-    		</dependency>
-    
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_jce_full</artifactId>
-        </dependency>
-    
-    		<dependency>
-    			<groupId>MOA.id</groupId>
-					<artifactId>moa-spss-container</artifactId>
-					<version>${moa-id-version}</version>
-    		</dependency>
-        
-        <dependency>
-					<groupId>iaik.prod</groupId>
-					<artifactId>iaik_X509TrustManager</artifactId>
-				</dependency>
-				        
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${jodatime.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
-        </dependency>
-        <dependency>
-						<groupId>org.slf4j</groupId>
-						<artifactId>slf4j-log4j12</artifactId>
-				</dependency>
-<!--         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency> -->
-<!--         <dependency>
-					<groupId>org.apache.logging.log4j</groupId>
-					<artifactId>log4j-core</artifactId>
-				</dependency> -->
-    
-    
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.version}</version>
-        </dependency>        
-        <!--  dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-c3p0</artifactId>
-            <version>${hibernate.version}</version>
-        </dependency-->
-<!--         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${hibernate.version}</version>
-        </dependency> -->
-
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>saxpath</groupId>
-            <artifactId>saxpath</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xalan-bin-dist</groupId>
-            <artifactId>xalan</artifactId>
-            <scope>compile</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>xalan-bin-dist</groupId>
-            <artifactId>xml-apis</artifactId>
-            <scope>compile</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>xalan-bin-dist</groupId>
-            <artifactId>serializer</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-				<dependency>
-					<groupId>commons-httpclient</groupId>
-					<artifactId>commons-httpclient</artifactId>
-				</dependency>
-
-				<dependency>
-					<groupId>com.sun.xml.bind</groupId>
-					<artifactId>jaxb-xjc</artifactId>
-					<version>2.3.2</version>
-				</dependency>
-
-				<dependency>
-					<groupId>org.jvnet.jaxb2_commons</groupId>
-					<artifactId>jaxb2-commons-lang</artifactId>
-					<version>2.4</version>
-				</dependency>
-				
-				<dependency>
-					<groupId>org.jvnet.jaxb2_commons</groupId>
-					<artifactId>jaxb2-basics-runtime</artifactId>
-					<version>1.11.1</version>
-				</dependency>
-        
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql-connector.java}</version>
-        </dependency>
-        
+				<repository>
+					<id>MOA_web</id>
+					<name>MOA Dependencies weblocation</name>
+					<releases>
+						<enabled>true</enabled>
+						<checksumPolicy>ignore</checksumPolicy>
+					</releases>
+					<layout>default</layout>
+					<url>https://git.egiz.gv.at/EAAF-Components/plain/eaaf_modules/eaaf_module_moa-sig/repository</url>
+				</repository>
+				<repository>
+      				<id>shibboleth.internet2.edu</id>
+      				<name>Internet2</name>
+      				<url>https://build.shibboleth.net/nexus/content/groups/public/</url>
+    			</repository>
+			</repositories>
+		</profile>
+	</profiles>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>at.gv.egiz.eaaf</groupId>
+			<artifactId>eaaf_core_api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz.eaaf</groupId>
+			<artifactId>eaaf-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>MOA.id.server</groupId>
+			<artifactId>moa-id-jaxb_classes</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.util</groupId>
+			<artifactId>egovutils</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>*</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.opensaml</groupId>
+			<artifactId>opensaml</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>*</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.opensaml</groupId>
+			<artifactId>openws</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>*</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>at.gv.egiz.components</groupId>
+			<artifactId>egiz-configuration-api</artifactId>
+			<version>0.2</version>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz.components</groupId>
+			<artifactId>egiz-configuration-file</artifactId>
+			<version>0.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>at.gv.egiz.eaaf</groupId>
+			<artifactId>eaaf-core</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_jce_full</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>MOA.id</groupId>
+			<artifactId>moa-spss-container</artifactId>
+			<version>${moa-id-version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_X509TrustManager</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>${jodatime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jul-to-slf4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
+		<!-- <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> 
+			</dependency> -->
+		<!-- <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> 
+			</dependency> -->
+
+
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>${hibernate.version}</version>
+		</dependency>
+		<!-- dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-c3p0</artifactId> 
+			<version>${hibernate.version}</version> </dependency -->
+		<!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> 
+			<version>${hibernate.version}</version> </dependency> -->
+
+		<dependency>
+			<groupId>jaxen</groupId>
+			<artifactId>jaxen</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>saxpath</groupId>
+			<artifactId>saxpath</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>xalan</artifactId>
+			<scope>compile</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>xml-apis</artifactId>
+			<scope>compile</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>serializer</artifactId>
+			<scope>runtime</scope>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-xjc</artifactId>
+			<version>2.3.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<artifactId>jaxb2-commons-lang</artifactId>
+			<version>2.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<artifactId>jaxb2-basics-runtime</artifactId>
+			<version>1.11.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>${mysql-connector.java}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
@@ -283,201 +285,180 @@
 			<version>${org.springframework.version}</version>
 		</dependency>
 		<dependency>
-    	<groupId>org.springframework.data</groupId>
-    	<artifactId>spring-data-jpa</artifactId>
-    	<version>${org.springframework.data.spring-data-jpa}</version>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-jpa</artifactId>
+			<version>${org.springframework.data.spring-data-jpa}</version>
 		</dependency>
-		
-		
-  	    <dependency>
+
+
+		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
 		<dependency>
-		 	<groupId>com.fasterxml.jackson.core</groupId>
-      		<artifactId>jackson-annotations</artifactId>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
 		</dependency>
-		
+
 		<dependency>
-    	<groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
 		</dependency>
 
 
-		<!-- for testing only ?  -->
+		<!-- for testing only ? -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-    		<groupId>cglib</groupId>
-    		<artifactId>cglib</artifactId>
-    		<version>2.2.2</version>
-    		<scope>test</scope>
+			<groupId>cglib</groupId>
+			<artifactId>cglib</artifactId>
+			<version>2.2.2</version>
+			<scope>test</scope>
 		</dependency>
-		    
+
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
 			<version>1.4.191</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-dbcp2</artifactId>
-			</dependency>
+		</dependency>
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-collections4</artifactId>	
-		</dependency>
-
-		
-    </dependencies>
-
-    <build>
-    	<plugins>                 
-             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
-                <configuration>
-                    <archive>
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-<!-- CLI for 2.x to 3.x migragtion -->
-<!--   <plugin>
-    <groupId>org.apache.maven.plugins</groupId>
-    <artifactId>maven-jar-plugin</artifactId>
-    <version>2.4</version>
-    <configuration>
-      <archive>
-        <manifest>
-        <addClasspath>true</addClasspath>
-        <mainClass>at.gv.egovernment.moa.id.commons.config.MigrateConfiguration</mainClass>
-        <classpathPrefix>dependency-jars/</classpathPrefix>
-        </manifest>
-      </archive>
-    </configuration>
-  </plugin> -->
-  <plugin>
-    <groupId>org.apache.maven.plugins</groupId>
-    <artifactId>maven-dependency-plugin</artifactId>
-    <version>2.5.1</version>
-    <executions>
-      <execution>
-        <id>copy-dependencies</id>
-        <phase>package</phase>
-        <goals>
-            <goal>copy-dependencies</goal>
-        </goals>
-        <configuration>
-            <outputDirectory>
-               ${project.build.directory}/dependency-jars/
-            </outputDirectory>
-        </configuration>
-      </execution>
-    </executions>
-  </plugin>
-
-<!--             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin> -->
-            <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-banned-dependencies</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <bannedDependencies>
-                                    <searchTransitive>true</searchTransitive>
-                                    <excludes>
-                                        <!-- <exclude>commons-logging</exclude> -->
-                                        <exclude>org.slf4j:1.5*</exclude>
-                                        <exclude>org.slf4j:1.6*</exclude>
-                                        <!--   <exclude>org.springframework:2.*</exclude>
-                                           <exclude>org.springframework:3.0.*</exclude>     -->
-                                    </excludes>
-                                </bannedDependencies>
-                            </rules>
-                            <fail>true</fail>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-                  
-                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>
-                                            org.jvnet.hyperjaxb3
-                                        </groupId>
-                                        <artifactId>
-                                            maven-hyperjaxb3-plugin
-                                        </artifactId>
-                                        <versionRange>
-                                            [0.5.6,)
-                                        </versionRange>
-                                        <goals>
-                                            <goal>generate</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore></ignore>
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-    </build>
+			<artifactId>commons-collections4</artifactId>
+		</dependency>
+
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.6.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.0.2</version>
+				<configuration>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+					</archive>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- CLI for 2.x to 3.x migragtion -->
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> 
+				<version>2.4</version> <configuration> <archive> <manifest> <addClasspath>true</addClasspath> 
+				<mainClass>at.gv.egovernment.moa.id.commons.config.MigrateConfiguration</mainClass> 
+				<classpathPrefix>dependency-jars/</classpathPrefix> </manifest> </archive> 
+				</configuration> </plugin> -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.5.1</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>
+								${project.build.directory}/dependency-jars/
+							</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> 
+				<configuration> <archive> <addMavenDescriptor>false</addMavenDescriptor> 
+				</archive> </configuration> <executions> <execution> <goals> <goal>test-jar</goal> 
+				</goals> </execution> </executions> </plugin> -->
+			<plugin>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>1.1.1</version>
+				<executions>
+					<execution>
+						<id>enforce-banned-dependencies</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<bannedDependencies>
+									<searchTransitive>true</searchTransitive>
+									<excludes>
+										<!-- <exclude>commons-logging</exclude> -->
+										<exclude>org.slf4j:1.5*</exclude>
+										<exclude>org.slf4j:1.6*</exclude>
+										<!-- <exclude>org.springframework:2.*</exclude> <exclude>org.springframework:3.0.*</exclude> -->
+									</excludes>
+								</bannedDependencies>
+							</rules>
+							<fail>true</fail>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!--This plugin's configuration is used to store Eclipse m2e settings 
+				only. It has no influence on the Maven build itself. -->
+			<plugin>
+				<groupId>org.eclipse.m2e</groupId>
+				<artifactId>lifecycle-mapping</artifactId>
+				<version>1.0.0</version>
+				<configuration>
+					<lifecycleMappingMetadata>
+						<pluginExecutions>
+							<pluginExecution>
+								<pluginExecutionFilter>
+									<groupId>
+										org.jvnet.hyperjaxb3
+									</groupId>
+									<artifactId>
+										maven-hyperjaxb3-plugin
+									</artifactId>
+									<versionRange>
+										[0.5.6,)
+									</versionRange>
+									<goals>
+										<goal>generate</goal>
+									</goals>
+								</pluginExecutionFilter>
+								<action>
+									<ignore />
+								</action>
+							</pluginExecution>
+						</pluginExecutions>
+					</lifecycleMappingMetadata>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
index 6d341b88b..1c7b1d202 100644
--- a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
+++ b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
@@ -50,7 +50,7 @@ public class KeyStoreUtilsTest extends TestCase {
   }
   
   protected void setUp() throws Exception {
-    Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
+    //Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
     new File(tmpDir).mkdirs();
   }
   protected void tearDown() throws Exception {
diff --git a/id/server/moa-id-frontend-resources/pom.xml b/id/server/moa-id-frontend-resources/pom.xml
index b09e9df55..85857cd59 100644
--- a/id/server/moa-id-frontend-resources/pom.xml
+++ b/id/server/moa-id-frontend-resources/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>MOA.id</groupId>
     <artifactId>moa-id</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   
   <groupId>MOA.id.server</groupId>
diff --git a/id/server/moa-id-jaxb_classes/pom.xml b/id/server/moa-id-jaxb_classes/pom.xml
index 25a0e7967..427bab738 100644
--- a/id/server/moa-id-jaxb_classes/pom.xml
+++ b/id/server/moa-id-jaxb_classes/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>MOA.id</groupId>
     <artifactId>moa-id</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   <groupId>MOA.id.server</groupId>
   <artifactId>moa-id-jaxb_classes</artifactId>
diff --git a/id/server/moa-id-spring-initializer/pom.xml b/id/server/moa-id-spring-initializer/pom.xml
index 70836aae0..e4441dc95 100644
--- a/id/server/moa-id-spring-initializer/pom.xml
+++ b/id/server/moa-id-spring-initializer/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>MOA.id</groupId>
     <artifactId>moa-id</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   
   <groupId>MOA.id.server</groupId>
diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml b/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml
index 0d4ac89a7..b1dd44779 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>MOA.id.server.modules</groupId>
     <artifactId>moa-id-modules</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   <artifactId>moa-id-modul-citizencard_authentication</artifactId>
   
diff --git a/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml b/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml
index a1036fcd3..b826597e9 100644
--- a/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml
+++ b/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>MOA.id.server.modules</groupId>
     <artifactId>moa-id-modules</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   <artifactId>moa-id-module-AT_eIDAS_connector</artifactId>
   <name>moa-id-module-AT_eIDAS_connector</name>
diff --git a/id/server/modules/moa-id-module-E-ID_connector/pom.xml b/id/server/modules/moa-id-module-E-ID_connector/pom.xml
index fe47e5704..9764a8ee6 100644
--- a/id/server/modules/moa-id-module-E-ID_connector/pom.xml
+++ b/id/server/modules/moa-id-module-E-ID_connector/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>MOA.id.server.modules</groupId>
     <artifactId>moa-id-modules</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   <artifactId>moa-id-module-EID_connector</artifactId>
   <name>moa-id-module-E-ID_connector</name>
diff --git a/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/controller/EidAppRegIdentifierGenerationController.java b/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/controller/EidAppRegIdentifierGenerationController.java
index 091feb7fc..1478a6f45 100644
--- a/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/controller/EidAppRegIdentifierGenerationController.java
+++ b/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/controller/EidAppRegIdentifierGenerationController.java
@@ -87,7 +87,7 @@ public class EidAppRegIdentifierGenerationController extends AbstractController
 			
 			}
 			
-			String appRegId = Utils.getEidSystemApplicationId(oaParam, authUrl);					
+			String appRegId = Utils.getEidSystemApplicationId(oaParam, authUrl, authConfig);					
 			config.putCustomParameterWithOutEscaption(null, "appregId", appRegId);			
 			guiBuilder.build(req, resp, config, "AppReg Id generation GUI");
 						
diff --git a/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/tasks/CreateAuthnRequestTask.java b/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/tasks/CreateAuthnRequestTask.java
index 177103051..124377845 100644
--- a/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/tasks/CreateAuthnRequestTask.java
+++ b/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/tasks/CreateAuthnRequestTask.java
@@ -113,7 +113,7 @@ public class CreateAuthnRequestTask extends AbstractAuthServletTask {
 			authnReqConfig.setSignCred(credential.getIDPAssertionSigningCredential());
 			authnReqConfig.setSPEntityID(pendingReq.getAuthURL() + EIDProxyAuthConstants.ENDPOINT_METADATA);						
 			authnReqConfig.setScopeRequesterId(
-					Utils.getEidSystemApplicationId(pendingReq.getServiceProviderConfiguration(), pendingReq.getAuthURL()));
+					Utils.getEidSystemApplicationId(pendingReq.getServiceProviderConfiguration(), pendingReq.getAuthURL(), authConfig));
 					
 			//build and transmit AuthnRequest
 			authnReqBuilder.buildAuthnRequest(pendingReq, authnReqConfig , response);
diff --git a/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/utils/Utils.java b/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/utils/Utils.java
index 0de1a9df2..f58ca4743 100644
--- a/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/utils/Utils.java
+++ b/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/utils/Utils.java
@@ -9,14 +9,24 @@ import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
 import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
 import at.gv.egovernment.moa.id.auth.modules.eidproxyauth.EIDProxyAuthConstants;
 import at.gv.egovernment.moa.id.commons.api.AuthConfiguration;
+import at.gv.egovernment.moa.id.commons.api.IOAAuthParameters;
 import at.gv.egovernment.moa.id.commons.config.MOAIDConfigurationConstants;
 import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.MiscUtil;
 
 public class Utils {
 
+  public static final String CONFIG_PROP_EID_APPREG_ID_LAYOUT_V2 = 
+      "modules.eidproxyauth.appreg.id.layout.v2";
+  
 	public static final String PARAM_APPREG_SP_ID = "?sp=";
 	
-	public static String getEidSystemApplicationId(ISPConfiguration spConfiguration, String authUrl) {
+	public static final String PARAM_PROTOCOL_SAML1 = "/saml1";
+	public static final String PARAM_PROTOCOL_SAML2 = "/saml2";
+	public static final String PARAM_PROTOCOL_OIDC = "/oidc";
+	
+	public static String getEidSystemApplicationId(ISPConfiguration spConfiguration, String authUrl, 
+	    IConfiguration authConfig) {
 		StringBuilder builder = new StringBuilder();
 		if (authUrl.endsWith("/")) {
 			builder.append(authUrl.substring(0, authUrl.length() - 1));
@@ -25,13 +35,43 @@ public class Utils {
 			builder.append(authUrl);
 			
 		}		
+		
+		if (authConfig.getBasicConfigurationBoolean(Utils.CONFIG_PROP_EID_APPREG_ID_LAYOUT_V2, true)) {
+		  builder.append(selectProtocolFromSpConfig(spConfiguration));
+		  
+		}
 		builder.append(PARAM_APPREG_SP_ID);
 		builder.append(spConfiguration.getUniqueIdentifier());		
 		return builder.toString();
 		
 	}
 	
-	public static String getEIDSystemEntityId(ISPConfiguration spConfiguration, IConfiguration authConfig) {
+	private static String selectProtocolFromSpConfig(ISPConfiguration spConfiguration) {
+	  if (spConfiguration instanceof IOAAuthParameters) {
+	    IOAAuthParameters spConf = (IOAAuthParameters) spConfiguration;
+	    if (MiscUtil.isNotEmpty(
+	        spConf.getConfigurationValue(MOAIDConfigurationConstants.SERVICE_PROTOCOLS_PVP2X_URL))) {
+	      Logger.debug("SP: " + spConf.getUniqueIdentifier() + " marked as: " + PARAM_PROTOCOL_SAML2);
+	      return PARAM_PROTOCOL_SAML2;
+	      
+	    } else if (MiscUtil.isNotEmpty(
+	        spConf.getConfigurationValue(MOAIDConfigurationConstants.SERVICE_PROTOCOLS_OPENID_REDIRECTURL))) {
+	      Logger.debug("SP: " + spConf.getUniqueIdentifier() + " marked as: " + PARAM_PROTOCOL_OIDC);
+	      return PARAM_PROTOCOL_OIDC;
+	      
+	    } 
+	    	    
+	  } else {
+	    Logger.warn("Can NOT estimate type of SPConfiguration. Use SAML1 as default");
+	    	    
+	  }
+	  
+	  Logger.debug("SP: " + spConfiguration.getUniqueIdentifier() + " marked as: " + PARAM_PROTOCOL_SAML1);
+	  return PARAM_PROTOCOL_SAML1;
+	  	  
+  }
+
+  public static String getEIDSystemEntityId(ISPConfiguration spConfiguration, IConfiguration authConfig) {
 		//load from service-provider configuration
 		String msNodeEntityID = spConfiguration.getConfigurationValue(MOAIDConfigurationConstants.SERVICE_EXTERNAL_EID_SYSTEM_SERVICE_URL);
 		
@@ -59,4 +99,5 @@ public class Utils {
 						
 		return msNodeEntityID;
 	}
+
 }
diff --git a/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml b/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml
index 78d496fc8..e3cc3cb52 100644
--- a/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml
+++ b/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>MOA.id.server.modules</groupId>
     <artifactId>moa-id-modules</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   <artifactId>moa-id-module-bkaMobilaAuthSAML2Test</artifactId>
   <description>BKA MobileAuth Test for SAML2 applications</description>
diff --git a/id/server/modules/moa-id-module-eIDAS/pom.xml b/id/server/modules/moa-id-module-eIDAS/pom.xml
index 598a3388b..45fd97508 100644
--- a/id/server/modules/moa-id-module-eIDAS/pom.xml
+++ b/id/server/modules/moa-id-module-eIDAS/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>MOA.id.server.modules</groupId>
     <artifactId>moa-id-modules</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   <artifactId>moa-id-module-eIDAS</artifactId>
   <name>MOA-ID eIDAS Module</name>
diff --git a/id/server/modules/moa-id-module-elga_mandate_service/pom.xml b/id/server/modules/moa-id-module-elga_mandate_service/pom.xml
index b8a1531c8..46b645403 100644
--- a/id/server/modules/moa-id-module-elga_mandate_service/pom.xml
+++ b/id/server/modules/moa-id-module-elga_mandate_service/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>MOA.id.server.modules</groupId>
     <artifactId>moa-id-modules</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   <artifactId>moa-id-module-elga_mandate_service</artifactId>
   <version>${moa-id-module-elga_mandate_client}</version>
diff --git a/id/server/modules/moa-id-module-openID/pom.xml b/id/server/modules/moa-id-module-openID/pom.xml
index 0816f4e22..131ae455b 100644
--- a/id/server/modules/moa-id-module-openID/pom.xml
+++ b/id/server/modules/moa-id-module-openID/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>MOA.id.server.modules</groupId>
     <artifactId>moa-id-modules</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   
 	<artifactId>moa-id-module-openID</artifactId>
diff --git a/id/server/modules/moa-id-module-sl20_authentication/pom.xml b/id/server/modules/moa-id-module-sl20_authentication/pom.xml
index 7b901603c..0dccba648 100644
--- a/id/server/modules/moa-id-module-sl20_authentication/pom.xml
+++ b/id/server/modules/moa-id-module-sl20_authentication/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>MOA.id.server.modules</groupId>
     <artifactId>moa-id-modules</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   <artifactId>moa-id-module-sl20_authentication</artifactId>
   <name>moa-id-module-sl20_authentication</name>
diff --git a/id/server/modules/moa-id-module-ssoTransfer/pom.xml b/id/server/modules/moa-id-module-ssoTransfer/pom.xml
index e26bf0597..d0869994b 100644
--- a/id/server/modules/moa-id-module-ssoTransfer/pom.xml
+++ b/id/server/modules/moa-id-module-ssoTransfer/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>MOA.id.server.modules</groupId>
     <artifactId>moa-id-modules</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   <artifactId>moa-id-module-ssoTransfer</artifactId>
   <name>MOA-ID_SSO_Transfer_modul</name>
diff --git a/id/server/modules/moa-id-modules-federated_authentication/pom.xml b/id/server/modules/moa-id-modules-federated_authentication/pom.xml
index e6ceccf3f..1148ab31c 100644
--- a/id/server/modules/moa-id-modules-federated_authentication/pom.xml
+++ b/id/server/modules/moa-id-modules-federated_authentication/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>MOA.id.server.modules</groupId>
     <artifactId>moa-id-modules</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   <artifactId>moa-id-modules-federated_authentication</artifactId>
   <description>PVP2 ServiceProvider implementation for federated authentication</description>
diff --git a/id/server/modules/moa-id-modules-saml1/pom.xml b/id/server/modules/moa-id-modules-saml1/pom.xml
index 2f9f51445..d2cd5686e 100644
--- a/id/server/modules/moa-id-modules-saml1/pom.xml
+++ b/id/server/modules/moa-id-modules-saml1/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>MOA.id.server.modules</groupId>
     <artifactId>moa-id-modules</artifactId>
-    <version>4.1.4</version>
+    <version>4.1.5</version>
   </parent>
   
 	<artifactId>moa-id-module-saml1</artifactId>
diff --git a/id/server/modules/module-monitoring/pom.xml b/id/server/modules/module-monitoring/pom.xml
index 927065f62..5b19d44c0 100644
--- a/id/server/modules/module-monitoring/pom.xml
+++ b/id/server/modules/module-monitoring/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>MOA.id.server.modules</groupId>
 		<artifactId>moa-id-modules</artifactId>
-		<version>4.1.4</version>
+		<version>4.1.5</version>
 	</parent>
 
 	<artifactId>moa-id-module-monitoring</artifactId>
diff --git a/id/server/modules/pom.xml b/id/server/modules/pom.xml
index ae6c28f2c..d2bce7b0d 100644
--- a/id/server/modules/pom.xml
+++ b/id/server/modules/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>4.1.4</version>
+		<version>4.1.5</version>
 	</parent>
 
 	<groupId>MOA.id.server.modules</groupId>
diff --git a/id/server/pom.xml b/id/server/pom.xml
index 61c8d9317..e9fb44b80 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -4,7 +4,7 @@
     <parent>

         <groupId>MOA</groupId>

         <artifactId>id</artifactId>

-        <version>4.1.4</version>

+        <version>4.1.5</version>

     </parent>

 

     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
index 6d60cb356..49e008f78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,915 +1,923 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA</groupId>
-  <artifactId>MOA</artifactId>
-  <packaging>pom</packaging>
-  <version>4.1.4</version>
-  <name>MOA</name>
-
-  <properties>
-    <repositoryPath>${basedir}/repository</repositoryPath>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-    <!-- Project Version -->
-    <moa-id-version>4.1.4</moa-id-version>
-
-    <moa-id-version-final>4.1.4</moa-id-version-final>
-    <moa-id-version-edu>4.1.4</moa-id-version-edu>
-
-    <moa-id-proxy-version>2.0.1</moa-id-proxy-version>
-
-    <configtool-version>3.0.5</configtool-version>
-    <demo-oa-version>2.0.7</demo-oa-version>
-
-    <moa-id-module-elga_mandate_client>1.3.2</moa-id-module-elga_mandate_client>
-
-    <!-- =================================================================================== -->
-    <egiz-spring-api.version>0.3</egiz-spring-api.version>
-    <egiz.eaaf.version>1.0.15</egiz.eaaf.version>
-    <org.springframework.version>5.2.8.RELEASE</org.springframework.version>
-    <org.springframework.data.spring-data-jpa>2.3.3.RELEASE</org.springframework.data.spring-data-jpa>
-    <org.springframework.data.spring-data-redis>2.3.3.RELEASE</org.springframework.data.spring-data-redis>
-    <surefire.version>2.22.0</surefire.version>
-
-    <jaxb.version>2.3.1</jaxb.version>
-    <jaxb-core.version>2.3.0.1</jaxb-core.version>
-    <guava.version>29.0-jre</guava.version>
-
-    <opensaml.version>2.6.6</opensaml.version> <!-- update to v3 (v2 is end-of-life in june 2016) -->
-    <org.opensaml.openws.version>1.5.6</org.opensaml.openws.version>
-    <xmltooling.version>1.4.6</xmltooling.version>
-    <xmlsec.version>2.1.3</xmlsec.version>
-    <jaxws-api.version>2.3.1</jaxws-api.version>
-    <jws-api.version>1.1</jws-api.version>
-
-    <hibernate.version>5.4.21.Final</hibernate.version>
-    <org.apache.commons.commons.dbcp2>2.7.0</org.apache.commons.commons.dbcp2>
-
-    <cxf.version>3.3.7</cxf.version>
-    <struts.version>2.5.22</struts.version> <!-- 2.5.10.1 -->
-
-    <egovutils.version>2.0.0</egovutils.version>
-
-    <slf4j.version>1.7.30</slf4j.version>
-
-    <httpclient.version>4.5.12</httpclient.version>
-    <httpcore.version>4.4.13</httpcore.version>
-
-    <!-- Maybe problems with Hibernate 5.0.10 -->
-    <mysql-connector.java>8.0.21</mysql-connector.java>
-    <!-- <mysql-connector.java>5.1.40</mysql-connector.java> -->
-
-    <junit.version>4.12</junit.version>
-    <org.apache.commons.io.version>2.7</org.apache.commons.io.version>
-    <org.apache.commons.lang3.version>3.11</org.apache.commons.lang3.version>
-    <org.apache.commons.collections4.version>4.4</org.apache.commons.collections4.version>
-    <org.apache.commons.collections3.version>3.2.2</org.apache.commons.collections3.version>
-    <org.apache.commons-text.version>1.9</org.apache.commons-text.version>
-    <jodatime.version>2.10.6</jodatime.version>
-
-    <jackson-version>2.11.2</jackson-version>
-    <apache-cli-version>1.4</apache-cli-version>
-    <spring-orm-version>${org.springframework.version}</spring-orm-version>
-
-  </properties>
-
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-        <property>
-          <name>default</name>
-        </property>
-      </activation>
-      <modules>
-        <module>id</module>
-      </modules>
-      <repositories>
-        <repository>
-          <id>moaid_local</id>
-          <name>local</name>
-          <url>file:${basedir}/../../../repository</url>
-        </repository>
-        <!-- <repository> <id>hyberjaxb</id> <url>http://repository.highsource.org/maven2/releases/</url> 
-          <releases> <enabled>false</enabled> </releases> </repository> -->
-        <repository>
-          <id>egiz-shibboleth-mirror</id>
-          <name>egiz-shibboleth-mirror</name>
-          <url>https://apps.egiz.gv.at/shibboleth_nexus/</url>
-        </repository>
-        <repository>
-          <id>jboss</id>
-          <url>https://repository.jboss.org/nexus/content/repositories/central/</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-        </repository>
-        <repository>
-          <id>egiz-commons</id>
-          <url>https://apps.egiz.gv.at/maven/</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-          	<enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <repository>
-          <id>egiz-commons-snapshot</id>
-          <url>https://apps.egiz.gv.at/maven-snapshot/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-          	<enabled>true</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-  </profiles>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-  
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.1</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>properties-maven-plugin</artifactId> 
-        <version>1.0-alpha-2</version> <executions> <execution> <phase>initialize</phase> 
-        <goals> <goal>read-project-properties</goal> </goals> <configuration> <files> 
-        <file>${basedir}/moa-id.properties</file> </files> </configuration> </execution> 
-        </executions> </plugin> -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <configuration>
-          <excludes>
-            <exclude>eu/stork/peps/test/simple/SimpleBaseTest.java</exclude>
-            <exclude>eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java</exclude>
-            <exclude>eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java</exclude>
-            <exclude>eu/stork/peps/test/simple/StorkAuthRequestTest.java</exclude>
-            <exclude>eu/stork/peps/test/simple/StorkLogoutRequestTest.java</exclude>
-            <exclude>eu/stork/peps/test/simple/StorkLogoutResponseTest.java</exclude>
-            <exclude>eu/stork/peps/test/simple/StorkNewResponseTest.java</exclude>
-            <exclude>eu/stork/peps/test/simple/StorkResponseTest.java</exclude>
-            <exclude>test/MOAIDTestCase.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/MOATestCase.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/UnitTestCase.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/auth/invoke/IdentityLinkAssertionParserTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/proxy/builder/SAMLArtifactBuilderTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/spss/SPSSTestCase.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/util/DOMUtilsTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/util/SSLUtilsTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/util/URLDecoderTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/util/URLEncoderTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java</exclude>
-            <exclude>test/at/gv/egovernment/moa/util/XPathUtilsTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.1</version>
-        <configuration>
-          <verbose>false</verbose>
-          <fork>true</fork>
-          <executable>${env.BUILD_EXECUTEABLE}</executable>
-          <compilerVersion>${env.BUILD_VERSION}</compilerVersion>
-          <encoding>${project.build.sourceEncoding}</encoding>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.1.2</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <inherited>false</inherited>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <!-- <version>2.2-beta-1</version> -->
-        <version>2.2.2</version>
-        <!-- TODO Update Version 2.2-beta-1 for MOA-SPSS -->
-        <configuration>
-          <finalName>moa</finalName>
-          <encoding>UTF-8</encoding>
-          <descriptors>
-            <descriptor>id/assembly-auth-final.xml</descriptor>
-            <descriptor>id/assembly-auth-edu.xml</descriptor>
-            <descriptor>id/assembly-proxy.xml</descriptor>
-
-            <!-- <descriptor>spss/assembly.xml</descriptor> <descriptor>spss/assembly-lib.xml</descriptor> -->
-          </descriptors>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>versions-maven-plugin</artifactId>
-        <version>2.7</version>
-      </plugin>
-
-      <!-- Vulnerability checks -->
-      <!-- <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> 
-        <version>1.2.5</version> <executions> <execution> <phase>verify</phase> <goals> 
-        <goal>check</goal> </goals> </execution> </executions> </plugin> -->
-
-    </plugins>
-
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <excludePackageNames>test.*</excludePackageNames>
-          <failOnError>false</failOnError>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <dependencyManagement>
-    <dependencies>
-
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-dbcp2</artifactId>
-        <version>${org.apache.commons.commons.dbcp2}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opensaml</groupId>
-        <artifactId>opensaml</artifactId>
-        <version>${opensaml.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opensaml</groupId>
-        <artifactId>xmltooling</artifactId>
-        <version>${xmltooling.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opensaml</groupId>
-        <artifactId>openws</artifactId>
-        <version>${org.opensaml.openws.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.santuario</groupId>
-        <artifactId>xmlsec</artifactId>
-        <version>${xmlsec.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>javax.xml.ws</groupId>
-        <artifactId>jaxws-api</artifactId>
-        <version>${jaxws-api.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.jws</groupId>
-        <artifactId>javax.jws-api</artifactId>
-        <version>${jws-api.version}</version>
-      </dependency>
-
-
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>${guava.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        <version>${cxf.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-transports-http</artifactId>
-        <version>${cxf.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>${org.apache.commons.collections3.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-text</artifactId>
-        <version>${org.apache.commons-text.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.struts</groupId>
-        <artifactId>struts2-core</artifactId>
-        <version>${struts.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.struts</groupId>
-        <artifactId>struts2-json-plugin</artifactId>
-        <version>${struts.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>at.gv.util</groupId>
-        <artifactId>egovutils</artifactId>
-        <version>${egovutils.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>at.gv.egiz.components</groupId>
-        <artifactId>egiz-spring-api</artifactId>
-        <version>${egiz-spring-api.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl-over-slf4j</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jul-to-slf4j</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>jaxen</groupId>
-        <artifactId>jaxen</artifactId>
-        <version>1.1.6</version>
-      </dependency>
-      <dependency>
-        <groupId>saxpath</groupId>
-        <artifactId>saxpath</artifactId>
-        <version>1.0-FCS</version>
-        <scope>compile</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-core</artifactId>
-        <version>2.13.3</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpclient</artifactId>
-        <version>${httpclient.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpcore</artifactId>
-        <version>${httpcore.version}</version>
-      </dependency>
-
-      <dependency>
-         <groupId>org.postgresql</groupId>
-         <artifactId>postgresql</artifactId>
-         <version>42.2.16</version>
-      </dependency>
-
-      <dependency>
-        <groupId>javax.mail</groupId>
-        <artifactId>mail</artifactId>
-        <version>1.4.7</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
-        <version>1.4</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-httpclient</groupId>
-        <artifactId>commons-httpclient</artifactId>
-        <version>3.1</version>
-      </dependency>
-      <dependency>
-        <groupId>dav4j</groupId>
-        <artifactId>dav4j</artifactId>
-        <version>0.1</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>httpsclient</groupId>
-        <artifactId>httpsclient</artifactId>
-        <version>JSSE-1.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <!-- <dependency> <groupId>regexp</groupId> <artifactId>regexp</artifactId> 
-        <version>1.3</version> </dependency> -->
-
-
-      <!-- <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk16</artifactId> 
-        <version>1.46</version> </dependency> -->
-
-      <dependency>
-        <groupId>at.gv.egiz.eaaf</groupId>
-        <artifactId>eaaf_core_api</artifactId>
-        <version>${egiz.eaaf.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>at.gv.egiz.eaaf</groupId>
-        <artifactId>eaaf-core</artifactId>
-        <version>${egiz.eaaf.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>at.gv.egiz.eaaf</groupId>
-        <artifactId>eaaf-core</artifactId>
-        <type>test-jar</type>
-        <version>${egiz.eaaf.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>at.gv.egiz.eaaf</groupId>
-        <artifactId>eaaf_module_pvp2_idp</artifactId>
-        <version>${egiz.eaaf.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>at.gv.egiz.eaaf</groupId>
-        <artifactId>eaaf_module_pvp2_sp</artifactId>
-        <version>${egiz.eaaf.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>at.gv.egiz.eaaf</groupId>
-        <artifactId>eaaf_module_pvp2_core</artifactId>
-        <version>${egiz.eaaf.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>at.gv.egiz.eaaf</groupId>
-        <artifactId>eaaf_module_auth_sl20</artifactId>
-        <version>${egiz.eaaf.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>at.gv.egiz.eaaf</groupId>
-        <artifactId>eaaf_core_utils</artifactId>
-        <version>${egiz.eaaf.version}</version>
-        <scope>test</scope>
-        <type>test-jar</type>
-      </dependency>
-      <dependency>
-        <groupId>at.gv.egiz.eaaf</groupId>
-        <artifactId>eaaf-core</artifactId>
-        <version>${egiz.eaaf.version}</version>
-        <scope>test</scope> 
-        <type>test-jar</type>
-      </dependency>
-
-
-      <dependency>
-        <groupId>MOA.id.server</groupId>
-        <artifactId>moa-id-spring-initializer</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>MOA.id.server</groupId>
-        <artifactId>moa-id-frontend-resources</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>MOA.id</groupId>
-        <artifactId>moa-spss-container</artifactId>
-        <version>${moa-id-version}</version>
-        <type>pom</type>
-      </dependency>
-
-
-
-      <dependency>
-        <groupId>MOA.id.server</groupId>
-        <artifactId>moa-id-lib</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>MOA.id.server</groupId>
-        <artifactId>moa-id-commons</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>MOA.id.server</groupId>
-        <artifactId>moa-id-jaxb_classes</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>MOA.id.server</groupId>
-        <artifactId>moa-id-lib</artifactId>
-        <version>${moa-id-version}</version>
-        <scope>test</scope>
-        <type>test-jar</type>
-      </dependency>
-
-      <dependency>
-        <groupId>MOA.id.server.modules</groupId>
-        <artifactId>moa-id-module-stork</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>MOA.id.server.modules</groupId>
-        <artifactId>moa-id-module-monitoring</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>MOA.id.server.modules</groupId>
-        <artifactId>moa-id-module-saml1</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>MOA.id.server.modules</groupId>
-        <artifactId>moa-id-module-openID</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>MOA.id.server.modules</groupId>
-        <artifactId>moa-id-modul-citizencard_authentication</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>MOA.id.server.modules</groupId>
-        <artifactId>moa-id-module-eIDAS</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>MOA.id.server.modules</groupId>
-        <artifactId>moa-id-module-pvp2</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>MOA.id.server.modules</groupId>
-        <artifactId>moa-id-modules-federated_authentication</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>MOA.id.server.modules</groupId>
-        <artifactId>moa-id-module-elga_mandate_service</artifactId>
-        <version>${moa-id-module-elga_mandate_client}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>MOA.id.server.modules</groupId>
-        <artifactId>moa-id-module-bkaMobilaAuthSAML2Test</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>MOA.id.server.modules</groupId>
-        <artifactId>moa-id-module-sl20_authentication</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>MOA.id.server.modules</groupId>
-        <artifactId>moa-id-module-AT_eIDAS_connector</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>MOA.id.server.modules</groupId>
-        <artifactId>moa-id-module-EID_connector</artifactId>
-        <version>${moa-id-version}</version>
-      </dependency>
-
-
-      <dependency>
-        <groupId>MOA.id.server</groupId>
-        <artifactId>moa-id-commons</artifactId>
-        <version>${moa-id-version}</version>
-        <type>test-jar</type>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>1.2</version>
-        <scope>compile</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
-        <version>3.0.1</version>
-        <scope>provide</scope>
-      </dependency>
-      <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <version>1.1.1</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>commons-discovery</groupId>
-        <artifactId>commons-discovery</artifactId>
-        <version>0.5</version>
-        <scope>compile</scope>
-      </dependency>
-      <!-- IAIK libraries -->
-      <dependency>
-        <groupId>iaik.prod</groupId>
-        <artifactId>iaik_jce_full</artifactId>
-        <version>5.52_moa</version>
-      </dependency>
-
-      <dependency>
-        <groupId>iaik.prod</groupId>
-        <artifactId>iaik_X509TrustManager</artifactId>
-        <version>0.3.1</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>iaik.prod</groupId>
-        <artifactId>iaik_Pkcs11Provider</artifactId>
-        <version>1.2.4</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>iaik.prod</groupId>
-        <artifactId>iaik_Pkcs11Wrapper</artifactId>
-        <version>1.2.17</version>
-        <scope>compile</scope>
-      </dependency>
-      <dependency>
-        <groupId>iaik.prod</groupId>
-        <artifactId>iaik_Pkcs11Wrapper</artifactId>
-        <version>1.2.17</version>
-        <classifier>win32</classifier>
-        <type>dll</type>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>iaik.prod</groupId>
-        <artifactId>iaik_Pkcs11Wrapper</artifactId>
-        <version>1.2.17</version>
-        <classifier>linux</classifier>
-        <type>so</type>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>iaik.prod</groupId>
-        <artifactId>iaik_Pkcs11Wrapper</artifactId>
-        <version>1.2.17</version>
-        <classifier>linux_x64</classifier>
-        <type>so</type>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>iaik.prod</groupId>
-        <artifactId>iaik_Pkcs11Wrapper</artifactId>
-        <version>1.2.17</version>
-        <classifier>solaris_sparc</classifier>
-        <type>so</type>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>iaik.prod</groupId>
-        <artifactId>iaik_Pkcs11Wrapper</artifactId>
-        <version>1.2.17</version>
-        <classifier>solaris_sparcv9</classifier>
-        <type>so</type>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>iaik.prod</groupId>
-        <artifactId>iaik_Pkcs11Wrapper</artifactId>
-        <version>1.2.17</version>
-        <classifier>win64</classifier>
-        <type>dll</type>
-        <scope>runtime</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>${jaxb.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>xerces</groupId>
-        <artifactId>xercesImpl</artifactId>
-        <version>2.11.0</version>
-        <scope>compile</scope>
-      </dependency>
-      <!-- The xmlParserAPIs.jar of the official xalan distribution and the 
-        one in the central repository differ. So, we are going to include the official 
-        one in our own distribution to prevent from problems with different versions 
-        in the endorsed directory of the servlet container or jre endorsed directory. -->
-      <dependency>
-        <groupId>xalan-bin-dist</groupId>
-        <artifactId>xml-apis</artifactId>
-        <version>2.11.0</version>
-        <scope>runtime</scope>
-      </dependency>
-      <!-- The xalan.jar of the official xalan distribution and the one in 
-        the central repository differ. So, we are going to include the official one 
-        in our own distribution to prevent from problems with different versions 
-        in the endorsed directory of the servlet container or jre endorsed directory. -->
-      <dependency>
-        <groupId>xalan-bin-dist</groupId>
-        <artifactId>xalan</artifactId>
-        <version>2.7.1</version>
-        <scope>compile</scope><!-- for XPathAPI, Javadoc,... -->
-      </dependency>
-      <dependency>
-        <groupId>xalan-bin-dist</groupId>
-        <artifactId>serializer</artifactId>
-        <version>2.7.1</version><!-- xalan version -->
-        <scope>runtime</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-webmvc</artifactId>
-        <version>${org.springframework.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-redis</artifactId>
-        <version>${org.springframework.data.spring-data-redis}</version>
-      </dependency>
-
-
-      <!-- the core, which includes Streaming API, shared low-level abstractions 
-        (but NOT data-binding) -->
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-core</artifactId>
-        <version>${jackson-version}</version>
-      </dependency>
-      <!-- databinding; ObjectMapper, JsonNode and related classes are here -->
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-databind</artifactId>
-        <version>${jackson-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-annotations</artifactId>
-        <version>${jackson-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
-        <version>${apache-cli-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-core</artifactId>
-        <version>${jaxb-core.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
-        <version>${jaxb.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.easymock</groupId>
-        <artifactId>easymock</artifactId>
-        <scope>test</scope>
-        <version>3.5</version>
-      </dependency>
-      <dependency>
-        <groupId>org.unitils</groupId>
-        <artifactId>unitils-core</artifactId>
-        <version>3.4.6</version>
-      </dependency>
-
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Wrapper</artifactId>
-      <classifier>win32</classifier>
-      <type>dll</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Wrapper</artifactId>
-      <classifier>linux</classifier>
-      <type>so</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Wrapper</artifactId>
-      <classifier>linux_x64</classifier>
-      <type>so</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Wrapper</artifactId>
-      <classifier>solaris_sparc</classifier>
-      <type>so</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Wrapper</artifactId>
-      <classifier>solaris_sparcv9</classifier>
-      <type>so</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Wrapper</artifactId>
-      <classifier>win64</classifier>
-      <type>dll</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>${org.apache.commons.io.version}</version>
-    </dependency>
-
-  </dependencies>
-
-  <repositories>
-    <repository>
-      <id>MOA</id>
-      <name>MOA Dependencies</name>
-      <!--releases> <enabled>false</enabled> </releases -->
-      <layout>default</layout>
-      <url>file://${repositoryPath}</url>
-    </repository>
-  </repositories>
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>MOA</groupId>
+	<artifactId>MOA</artifactId>
+	<packaging>pom</packaging>
+	<version>4.1.5</version>
+	<name>MOA</name>
+
+	<properties>
+		<repositoryPath>${basedir}/repository</repositoryPath>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+		<!-- Project Version -->
+		<moa-id-version>4.1.5</moa-id-version>
+
+		<moa-id-version-final>4.1.5</moa-id-version-final>
+		<moa-id-version-edu>4.1.5</moa-id-version-edu>
+
+		<moa-id-proxy-version>2.0.1</moa-id-proxy-version>
+
+		<configtool-version>3.0.6</configtool-version>
+		<demo-oa-version>2.0.8</demo-oa-version>
+
+		<moa-id-module-elga_mandate_client>1.3.2</moa-id-module-elga_mandate_client>
+
+		<!-- =================================================================================== -->
+		<egiz-spring-api.version>0.3</egiz-spring-api.version>
+		<egiz.eaaf.version>1.0.15</egiz.eaaf.version>
+		<org.springframework.version>5.2.11.RELEASE</org.springframework.version>
+		<org.springframework.data.spring-data-jpa>2.3.5.RELEASE</org.springframework.data.spring-data-jpa>
+		<org.springframework.data.spring-data-redis>2.3.5.RELEASE</org.springframework.data.spring-data-redis>
+		<surefire.version>2.22.0</surefire.version>
+
+		<jaxb.version>2.3.1</jaxb.version>
+		<jaxb-core.version>2.3.0.1</jaxb-core.version>
+		<guava.version>30.0-jre</guava.version>
+
+		<opensaml.version>2.6.6</opensaml.version> <!-- update to v3 (v2 is end-of-life in june 2016) -->
+		<org.opensaml.openws.version>1.5.6</org.opensaml.openws.version>
+		<xmltooling.version>1.4.6</xmltooling.version>
+		<xmlsec.version>2.1.5</xmlsec.version>
+		<jaxws-api.version>2.3.1</jaxws-api.version>
+		<jws-api.version>1.1</jws-api.version>
+
+		<hibernate.version>5.4.25.Final</hibernate.version>
+		<org.apache.commons.commons.dbcp2>2.8.0</org.apache.commons.commons.dbcp2>
+
+		<cxf.version>3.3.8</cxf.version>
+		<struts.version>2.5.26</struts.version> <!-- 2.5.10.1 -->
+
+		<egovutils.version>2.0.0</egovutils.version>
+
+		<slf4j.version>1.7.30</slf4j.version>
+
+		<httpclient.version>4.5.13</httpclient.version>
+		<httpcore.version>4.4.14</httpcore.version>
+
+		<!-- Maybe problems with Hibernate 5.0.10 -->
+		<mysql-connector.java>8.0.22</mysql-connector.java>
+		<!-- <mysql-connector.java>5.1.40</mysql-connector.java> -->
+
+		<junit.version>4.12</junit.version>
+		<org.apache.commons.io.version>2.8.0</org.apache.commons.io.version>
+		<org.apache.commons.lang3.version>3.11</org.apache.commons.lang3.version>
+		<org.apache.commons.collections4.version>4.4</org.apache.commons.collections4.version>
+		<org.apache.commons.collections3.version>3.2.2</org.apache.commons.collections3.version>
+		<org.apache.commons-text.version>1.9</org.apache.commons-text.version>
+		<jodatime.version>2.10.8</jodatime.version>
+
+		<jackson-version>2.12.0</jackson-version>
+		<apache-cli-version>1.4</apache-cli-version>
+		<spring-orm-version>${org.springframework.version}</spring-orm-version>
+
+	</properties>
+
+	<profiles>
+		<profile>
+			<id>default</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+				<property>
+					<name>default</name>
+				</property>
+			</activation>
+			<modules>
+				<module>id</module>
+			</modules>
+			<repositories>
+				<repository>
+					<id>moaid_local</id>
+					<name>local</name>
+					<url>file:${basedir}/../../../repository</url>
+				</repository>
+				<repository>
+      				<id>shibboleth.internet2.edu</id>
+      				<name>Internet2</name>
+      				<url>https://build.shibboleth.net/nexus/content/groups/public/</url>
+    			</repository>
+				<repository>
+					<id>jboss</id>
+					<url>https://repository.jboss.org/nexus/content/repositories/central/</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+				</repository>
+				<repository>
+					<id>egiz-commons</id>
+					<url>https://apps.egiz.gv.at/maven/</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>egiz-commons-snapshot</id>
+					<url>https://apps.egiz.gv.at/maven-snapshot/</url>
+					<releases>
+						<enabled>false</enabled>
+					</releases>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>MOA_web</id>
+					<name>MOA Dependencies weblocation</name>
+					<releases>
+						<enabled>true</enabled>
+						<checksumPolicy>ignore</checksumPolicy>
+					</releases>
+					<layout>default</layout>
+					<url>https://git.egiz.gv.at/EAAF-Components/plain/eaaf_modules/eaaf_module_moa-sig/repository</url>
+				</repository>
+			</repositories>
+		</profile>
+	</profiles>
+
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+		</resources>
+
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-release-plugin</artifactId>
+					<version>2.5.1</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>properties-maven-plugin</artifactId> 
+				<version>1.0-alpha-2</version> <executions> <execution> <phase>initialize</phase> 
+				<goals> <goal>read-project-properties</goal> </goals> <configuration> <files> 
+				<file>${basedir}/moa-id.properties</file> </files> </configuration> </execution> 
+				</executions> </plugin> -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>${surefire.version}</version>
+				<configuration>
+					<excludes>
+						<exclude>eu/stork/peps/test/simple/SimpleBaseTest.java</exclude>
+						<exclude>eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java</exclude>
+						<exclude>eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java</exclude>
+						<exclude>eu/stork/peps/test/simple/StorkAuthRequestTest.java</exclude>
+						<exclude>eu/stork/peps/test/simple/StorkLogoutRequestTest.java</exclude>
+						<exclude>eu/stork/peps/test/simple/StorkLogoutResponseTest.java</exclude>
+						<exclude>eu/stork/peps/test/simple/StorkNewResponseTest.java</exclude>
+						<exclude>eu/stork/peps/test/simple/StorkResponseTest.java</exclude>
+						<exclude>test/MOAIDTestCase.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/MOATestCase.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/UnitTestCase.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/auth/invoke/IdentityLinkAssertionParserTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/proxy/builder/SAMLArtifactBuilderTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/spss/SPSSTestCase.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/util/DOMUtilsTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/util/SSLUtilsTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/util/URLDecoderTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/util/URLEncoderTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java</exclude>
+						<exclude>test/at/gv/egovernment/moa/util/XPathUtilsTest.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.6.1</version>
+				<configuration>
+					<verbose>false</verbose>
+					<fork>true</fork>
+					<executable>${env.BUILD_EXECUTEABLE}</executable>
+					<compilerVersion>${env.BUILD_VERSION}</compilerVersion>
+					<encoding>${project.build.sourceEncoding}</encoding>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.1.2</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<inherited>false</inherited>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<!-- <version>2.2-beta-1</version> -->
+				<version>2.2.2</version>
+				<!-- TODO Update Version 2.2-beta-1 for MOA-SPSS -->
+				<configuration>
+					<finalName>moa</finalName>
+					<encoding>UTF-8</encoding>
+					<descriptors>
+						<descriptor>id/assembly-auth-final.xml</descriptor>
+						<descriptor>id/assembly-auth-edu.xml</descriptor>
+						<descriptor>id/assembly-proxy.xml</descriptor>
+
+						<!-- <descriptor>spss/assembly.xml</descriptor> <descriptor>spss/assembly-lib.xml</descriptor> -->
+					</descriptors>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>versions-maven-plugin</artifactId>
+				<version>2.7</version>
+			</plugin>
+
+			<!-- Vulnerability checks -->
+			<!-- <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> 
+				<version>1.2.5</version> <executions> <execution> <phase>verify</phase> <goals> 
+				<goal>check</goal> </goals> </execution> </executions> </plugin> -->
+
+		</plugins>
+
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<excludePackageNames>test.*</excludePackageNames>
+					<failOnError>false</failOnError>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+
+	<dependencyManagement>
+		<dependencies>
+
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-dbcp2</artifactId>
+				<version>${org.apache.commons.commons.dbcp2}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.opensaml</groupId>
+				<artifactId>opensaml</artifactId>
+				<version>${opensaml.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.opensaml</groupId>
+				<artifactId>xmltooling</artifactId>
+				<version>${xmltooling.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.opensaml</groupId>
+				<artifactId>openws</artifactId>
+				<version>${org.opensaml.openws.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.santuario</groupId>
+				<artifactId>xmlsec</artifactId>
+				<version>${xmlsec.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>javax.xml.ws</groupId>
+				<artifactId>jaxws-api</artifactId>
+				<version>${jaxws-api.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.jws</groupId>
+				<artifactId>javax.jws-api</artifactId>
+				<version>${jws-api.version}</version>
+			</dependency>
+
+
+			<dependency>
+				<groupId>com.google.guava</groupId>
+				<artifactId>guava</artifactId>
+				<version>${guava.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.cxf</groupId>
+				<artifactId>cxf-rt-frontend-jaxws</artifactId>
+				<version>${cxf.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.cxf</groupId>
+				<artifactId>cxf-rt-transports-http</artifactId>
+				<version>${cxf.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>commons-collections</groupId>
+				<artifactId>commons-collections</artifactId>
+				<version>${org.apache.commons.collections3.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-text</artifactId>
+				<version>${org.apache.commons-text.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.struts</groupId>
+				<artifactId>struts2-core</artifactId>
+				<version>${struts.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.struts</groupId>
+				<artifactId>struts2-json-plugin</artifactId>
+				<version>${struts.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>at.gv.util</groupId>
+				<artifactId>egovutils</artifactId>
+				<version>${egovutils.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>at.gv.egiz.components</groupId>
+				<artifactId>egiz-spring-api</artifactId>
+				<version>${egiz-spring-api.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-api</artifactId>
+				<version>${slf4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>jcl-over-slf4j</artifactId>
+				<version>${slf4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>jul-to-slf4j</artifactId>
+				<version>${slf4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-log4j12</artifactId>
+				<version>${slf4j.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>jaxen</groupId>
+				<artifactId>jaxen</artifactId>
+				<version>1.1.6</version>
+			</dependency>
+			<dependency>
+				<groupId>saxpath</groupId>
+				<artifactId>saxpath</artifactId>
+				<version>1.0-FCS</version>
+				<scope>compile</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-core</artifactId>
+				<version>2.13.3</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpclient</artifactId>
+				<version>${httpclient.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpcore</artifactId>
+				<version>${httpcore.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.postgresql</groupId>
+				<artifactId>postgresql</artifactId>
+				<version>42.2.18</version>
+			</dependency>
+
+			<dependency>
+				<groupId>javax.mail</groupId>
+				<artifactId>mail</artifactId>
+				<version>1.4.7</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-fileupload</groupId>
+				<artifactId>commons-fileupload</artifactId>
+				<version>1.4</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-httpclient</groupId>
+				<artifactId>commons-httpclient</artifactId>
+				<version>3.1</version>
+			</dependency>
+			<dependency>
+				<groupId>dav4j</groupId>
+				<artifactId>dav4j</artifactId>
+				<version>0.1</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>httpsclient</groupId>
+				<artifactId>httpsclient</artifactId>
+				<version>JSSE-1.0</version>
+				<scope>compile</scope>
+			</dependency>
+			<!-- <dependency> <groupId>regexp</groupId> <artifactId>regexp</artifactId> 
+				<version>1.3</version> </dependency> -->
+
+
+			<!-- <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk16</artifactId> 
+				<version>1.46</version> </dependency> -->
+
+			<dependency>
+				<groupId>at.gv.egiz.eaaf</groupId>
+				<artifactId>eaaf_core_api</artifactId>
+				<version>${egiz.eaaf.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>at.gv.egiz.eaaf</groupId>
+				<artifactId>eaaf-core</artifactId>
+				<version>${egiz.eaaf.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>at.gv.egiz.eaaf</groupId>
+				<artifactId>eaaf-core</artifactId>
+				<type>test-jar</type>
+				<version>${egiz.eaaf.version}</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>at.gv.egiz.eaaf</groupId>
+				<artifactId>eaaf_module_pvp2_idp</artifactId>
+				<version>${egiz.eaaf.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>at.gv.egiz.eaaf</groupId>
+				<artifactId>eaaf_module_pvp2_sp</artifactId>
+				<version>${egiz.eaaf.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>at.gv.egiz.eaaf</groupId>
+				<artifactId>eaaf_module_pvp2_core</artifactId>
+				<version>${egiz.eaaf.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>at.gv.egiz.eaaf</groupId>
+				<artifactId>eaaf_module_auth_sl20</artifactId>
+				<version>${egiz.eaaf.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>at.gv.egiz.eaaf</groupId>
+				<artifactId>eaaf_core_utils</artifactId>
+				<version>${egiz.eaaf.version}</version>
+				<scope>test</scope>
+				<type>test-jar</type>
+			</dependency>
+			<dependency>
+				<groupId>at.gv.egiz.eaaf</groupId>
+				<artifactId>eaaf-core</artifactId>
+				<version>${egiz.eaaf.version}</version>
+				<scope>test</scope>
+				<type>test-jar</type>
+			</dependency>
+
+
+			<dependency>
+				<groupId>MOA.id.server</groupId>
+				<artifactId>moa-id-spring-initializer</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>MOA.id.server</groupId>
+				<artifactId>moa-id-frontend-resources</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>MOA.id</groupId>
+				<artifactId>moa-spss-container</artifactId>
+				<version>${moa-id-version}</version>
+				<type>pom</type>
+			</dependency>
+
+
+
+			<dependency>
+				<groupId>MOA.id.server</groupId>
+				<artifactId>moa-id-lib</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+			<dependency>
+				<groupId>MOA.id.server</groupId>
+				<artifactId>moa-id-commons</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>MOA.id.server</groupId>
+				<artifactId>moa-id-jaxb_classes</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>MOA.id.server</groupId>
+				<artifactId>moa-id-lib</artifactId>
+				<version>${moa-id-version}</version>
+				<scope>test</scope>
+				<type>test-jar</type>
+			</dependency>
+
+			<dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-module-stork</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+			<dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-module-monitoring</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+			<dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-module-saml1</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+			<dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-module-openID</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+			<dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-modul-citizencard_authentication</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+			<dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-module-eIDAS</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+			<dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-module-pvp2</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+			<dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-modules-federated_authentication</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-module-elga_mandate_service</artifactId>
+				<version>${moa-id-module-elga_mandate_client}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-module-bkaMobilaAuthSAML2Test</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-module-sl20_authentication</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-module-AT_eIDAS_connector</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-module-EID_connector</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+
+
+			<dependency>
+				<groupId>MOA.id.server</groupId>
+				<artifactId>moa-id-commons</artifactId>
+				<version>${moa-id-version}</version>
+				<type>test-jar</type>
+				<scope>test</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>${junit.version}</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>commons-logging</groupId>
+				<artifactId>commons-logging</artifactId>
+				<version>1.2</version>
+				<scope>compile</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>javax.servlet-api</artifactId>
+				<version>3.0.1</version>
+				<scope>provide</scope>
+			</dependency>
+			<dependency>
+				<groupId>javax.activation</groupId>
+				<artifactId>activation</artifactId>
+				<version>1.1.1</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>commons-discovery</groupId>
+				<artifactId>commons-discovery</artifactId>
+				<version>0.5</version>
+				<scope>compile</scope>
+			</dependency>
+			<!-- IAIK libraries -->
+			<dependency>
+				<groupId>iaik.prod</groupId>
+				<artifactId>iaik_jce_full</artifactId>
+				<version>5.61_moa</version>
+			</dependency>
+
+			<dependency>
+				<groupId>iaik.prod</groupId>
+				<artifactId>iaik_X509TrustManager</artifactId>
+				<version>0.3.1</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>iaik.prod</groupId>
+				<artifactId>iaik_Pkcs11Provider</artifactId>
+				<version>1.2.4</version>
+				<scope>runtime</scope>
+			</dependency>
+			<dependency>
+				<groupId>iaik.prod</groupId>
+				<artifactId>iaik_Pkcs11Wrapper</artifactId>
+				<version>1.2.17</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>iaik.prod</groupId>
+				<artifactId>iaik_Pkcs11Wrapper</artifactId>
+				<version>1.2.17</version>
+				<classifier>win32</classifier>
+				<type>dll</type>
+				<scope>runtime</scope>
+			</dependency>
+			<dependency>
+				<groupId>iaik.prod</groupId>
+				<artifactId>iaik_Pkcs11Wrapper</artifactId>
+				<version>1.2.17</version>
+				<classifier>linux</classifier>
+				<type>so</type>
+				<scope>runtime</scope>
+			</dependency>
+			<dependency>
+				<groupId>iaik.prod</groupId>
+				<artifactId>iaik_Pkcs11Wrapper</artifactId>
+				<version>1.2.17</version>
+				<classifier>linux_x64</classifier>
+				<type>so</type>
+				<scope>runtime</scope>
+			</dependency>
+			<dependency>
+				<groupId>iaik.prod</groupId>
+				<artifactId>iaik_Pkcs11Wrapper</artifactId>
+				<version>1.2.17</version>
+				<classifier>solaris_sparc</classifier>
+				<type>so</type>
+				<scope>runtime</scope>
+			</dependency>
+			<dependency>
+				<groupId>iaik.prod</groupId>
+				<artifactId>iaik_Pkcs11Wrapper</artifactId>
+				<version>1.2.17</version>
+				<classifier>solaris_sparcv9</classifier>
+				<type>so</type>
+				<scope>runtime</scope>
+			</dependency>
+			<dependency>
+				<groupId>iaik.prod</groupId>
+				<artifactId>iaik_Pkcs11Wrapper</artifactId>
+				<version>1.2.17</version>
+				<classifier>win64</classifier>
+				<type>dll</type>
+				<scope>runtime</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>javax.xml.bind</groupId>
+				<artifactId>jaxb-api</artifactId>
+				<version>${jaxb.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>xerces</groupId>
+				<artifactId>xercesImpl</artifactId>
+				<version>2.11.0</version>
+				<scope>compile</scope>
+			</dependency>
+			<!-- The xmlParserAPIs.jar of the official xalan distribution and the 
+				one in the central repository differ. So, we are going to include the official 
+				one in our own distribution to prevent from problems with different versions 
+				in the endorsed directory of the servlet container or jre endorsed directory. -->
+			<dependency>
+				<groupId>xalan-bin-dist</groupId>
+				<artifactId>xml-apis</artifactId>
+				<version>2.11.0</version>
+				<scope>runtime</scope>
+			</dependency>
+			<!-- The xalan.jar of the official xalan distribution and the one in the 
+				central repository differ. So, we are going to include the official one in 
+				our own distribution to prevent from problems with different versions in 
+				the endorsed directory of the servlet container or jre endorsed directory. -->
+			<dependency>
+				<groupId>xalan-bin-dist</groupId>
+				<artifactId>xalan</artifactId>
+				<version>2.7.1</version>
+				<scope>compile</scope><!-- for XPathAPI, Javadoc,... -->
+			</dependency>
+			<dependency>
+				<groupId>xalan-bin-dist</groupId>
+				<artifactId>serializer</artifactId>
+				<version>2.7.1</version><!-- xalan version -->
+				<scope>runtime</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-webmvc</artifactId>
+				<version>${org.springframework.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.springframework.data</groupId>
+				<artifactId>spring-data-redis</artifactId>
+				<version>${org.springframework.data.spring-data-redis}</version>
+			</dependency>
+
+
+			<!-- the core, which includes Streaming API, shared low-level abstractions 
+				(but NOT data-binding) -->
+			<dependency>
+				<groupId>com.fasterxml.jackson.core</groupId>
+				<artifactId>jackson-core</artifactId>
+				<version>${jackson-version}</version>
+			</dependency>
+			<!-- databinding; ObjectMapper, JsonNode and related classes are here -->
+			<dependency>
+				<groupId>com.fasterxml.jackson.core</groupId>
+				<artifactId>jackson-databind</artifactId>
+				<version>${jackson-version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.fasterxml.jackson.core</groupId>
+				<artifactId>jackson-annotations</artifactId>
+				<version>${jackson-version}</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-cli</groupId>
+				<artifactId>commons-cli</artifactId>
+				<version>${apache-cli-version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.sun.xml.bind</groupId>
+				<artifactId>jaxb-core</artifactId>
+				<version>${jaxb-core.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.xml.bind</groupId>
+				<artifactId>jaxb-impl</artifactId>
+				<version>${jaxb.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.easymock</groupId>
+				<artifactId>easymock</artifactId>
+				<scope>test</scope>
+				<version>3.5</version>
+			</dependency>
+			<dependency>
+				<groupId>org.unitils</groupId>
+				<artifactId>unitils-core</artifactId>
+				<version>3.4.6</version>
+			</dependency>
+
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Wrapper</artifactId>
+			<classifier>win32</classifier>
+			<type>dll</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Wrapper</artifactId>
+			<classifier>linux</classifier>
+			<type>so</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Wrapper</artifactId>
+			<classifier>linux_x64</classifier>
+			<type>so</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Wrapper</artifactId>
+			<classifier>solaris_sparc</classifier>
+			<type>so</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Wrapper</artifactId>
+			<classifier>solaris_sparcv9</classifier>
+			<type>so</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Wrapper</artifactId>
+			<classifier>win64</classifier>
+			<type>dll</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${org.apache.commons.io.version}</version>
+		</dependency>
+
+	</dependencies>
+
+	<repositories>
+		<repository>
+			<id>MOA</id>
+			<name>MOA Dependencies</name>
+			<!--releases> <enabled>false</enabled> </releases -->
+			<layout>default</layout>
+			<url>file://${repositoryPath}</url>
+		</repository>
+	</repositories>
 </project>
diff --git a/repository/MOA/spss/common/3.1.2/common-3.1.2.jar.md5 b/repository/MOA/spss/common/3.1.2/common-3.1.2.jar.md5
new file mode 100644
index 000000000..b9afdaa9b
--- /dev/null
+++ b/repository/MOA/spss/common/3.1.2/common-3.1.2.jar.md5
@@ -0,0 +1 @@
+b4717644f9d379f3c54b169ba2ef7150
\ No newline at end of file
diff --git a/repository/MOA/spss/common/3.1.2/common-3.1.2.jar.sha1 b/repository/MOA/spss/common/3.1.2/common-3.1.2.jar.sha1
new file mode 100644
index 000000000..cf9ef2fc9
--- /dev/null
+++ b/repository/MOA/spss/common/3.1.2/common-3.1.2.jar.sha1
@@ -0,0 +1 @@
+e8478dbc5cc205bdbf538f5f38799a495250b4d3
\ No newline at end of file
diff --git a/repository/MOA/spss/common/3.1.2/common-3.1.2.pom b/repository/MOA/spss/common/3.1.2/common-3.1.2.pom
new file mode 100644
index 000000000..52464a717
--- /dev/null
+++ b/repository/MOA/spss/common/3.1.2/common-3.1.2.pom
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>moaSig</groupId>
+  <artifactId>common</artifactId>
+  <version>3.1.2</version>
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.12</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>2.7.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>2.10.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+      <version>1.1.6</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/repository/MOA/spss/common/3.1.2/common-3.1.2.pom.md5 b/repository/MOA/spss/common/3.1.2/common-3.1.2.pom.md5
new file mode 100644
index 000000000..68cc4ff52
--- /dev/null
+++ b/repository/MOA/spss/common/3.1.2/common-3.1.2.pom.md5
@@ -0,0 +1 @@
+17634b4bf7f8665965fd7272dde5f68d
\ No newline at end of file
diff --git a/repository/MOA/spss/common/3.1.2/common-3.1.2.pom.sha1 b/repository/MOA/spss/common/3.1.2/common-3.1.2.pom.sha1
new file mode 100644
index 000000000..69c7e5ab5
--- /dev/null
+++ b/repository/MOA/spss/common/3.1.2/common-3.1.2.pom.sha1
@@ -0,0 +1 @@
+36de83994db038788cf834fddac191130651bd52
\ No newline at end of file
diff --git a/repository/MOA/spss/common/3.1.3/common-3.1.3.jar b/repository/MOA/spss/common/3.1.3/common-3.1.3.jar
new file mode 100644
index 000000000..065eadc08
--- /dev/null
+++ b/repository/MOA/spss/common/3.1.3/common-3.1.3.jar
diff --git a/repository/MOA/spss/common/3.1.3/common-3.1.3.pom b/repository/MOA/spss/common/3.1.3/common-3.1.3.pom
new file mode 100644
index 000000000..d5e7b6578
--- /dev/null
+++ b/repository/MOA/spss/common/3.1.3/common-3.1.3.pom
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>MOA.spss.common</groupId>
+  <artifactId>common</artifactId>
+  <version>3.1.3</version>
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>2.7.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>2.10.6</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+      <version>1.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.jar.md5 b/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.jar.md5
new file mode 100644
index 000000000..b69731946
--- /dev/null
+++ b/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.jar.md5
@@ -0,0 +1 @@
+ab6519acc09bec22f681b8365d7fe844
\ No newline at end of file
diff --git a/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.jar.sha1 b/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.jar.sha1
new file mode 100644
index 000000000..a7709dcd2
--- /dev/null
+++ b/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.jar.sha1
@@ -0,0 +1 @@
+62ceb1f4b99e5a64346f3f5c05cf4c8c3801ffa3
\ No newline at end of file
diff --git a/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.pom b/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.pom
new file mode 100644
index 000000000..0836d47a3
--- /dev/null
+++ b/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.pom
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>moaSig</groupId>
+  <artifactId>moa-sig-lib</artifactId>
+  <version>3.1.2</version>
+  <dependencies>
+    <dependency>
+      <groupId>MOA.spss</groupId>
+      <artifactId>common</artifactId>
+      <version>3.1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.17</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.6</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.11</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.axis</groupId>
+      <artifactId>axis-jaxrpc</artifactId>
+      <version>1.4</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.xerial</groupId>
+      <artifactId>sqlite-jdbc</artifactId>
+      <version>3.25.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.3.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>2.3.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.3.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>9.4-1204-jdbc42</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.8.1</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.pom.md5 b/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.pom.md5
new file mode 100644
index 000000000..6244d988a
--- /dev/null
+++ b/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.pom.md5
@@ -0,0 +1 @@
+7450f8769e8cfe85e4a3f3dd66457c12
\ No newline at end of file
diff --git a/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.pom.sha1 b/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.pom.sha1
new file mode 100644
index 000000000..c316ae207
--- /dev/null
+++ b/repository/MOA/spss/server/moa-sig-lib/3.1.2/moa-sig-lib-3.1.2.pom.sha1
@@ -0,0 +1 @@
+dfedc2417138beab8a00b908637109e6e698e133
\ No newline at end of file
diff --git a/repository/MOA/spss/server/moa-sig-lib/3.1.3/moa-sig-lib-3.1.3.jar b/repository/MOA/spss/server/moa-sig-lib/3.1.3/moa-sig-lib-3.1.3.jar
new file mode 100644
index 000000000..06f21d25f
--- /dev/null
+++ b/repository/MOA/spss/server/moa-sig-lib/3.1.3/moa-sig-lib-3.1.3.jar
diff --git a/repository/MOA/spss/server/moa-sig-lib/3.1.3/moa-sig-lib-3.1.3.pom b/repository/MOA/spss/server/moa-sig-lib/3.1.3/moa-sig-lib-3.1.3.pom
new file mode 100644
index 000000000..77ca744c1
--- /dev/null
+++ b/repository/MOA/spss/server/moa-sig-lib/3.1.3/moa-sig-lib-3.1.3.pom
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>MOA.spss.server</groupId>
+  <artifactId>moa-sig-lib</artifactId>
+  <version>3.1.3</version>
+  <dependencies>
+    <dependency>
+      <groupId>MOA.spss</groupId>
+      <artifactId>common</artifactId>
+      <version>3.1.3</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.17</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.14</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.axis</groupId>
+      <artifactId>axis-jaxrpc</artifactId>
+      <version>1.4</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.xerial</groupId>
+      <artifactId>sqlite-jdbc</artifactId>
+      <version>3.32.3.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.3.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>2.3.0.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.3.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>42.2.15.jre7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.11</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient-cache</artifactId>
+      <version>4.5.12</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/repository/MOA/spss/tsl_lib/2.0.2/tsl_lib-2.0.2.pom b/repository/MOA/spss/tsl_lib/2.0.2/tsl_lib-2.0.2.pom
new file mode 100644
index 000000000..93cb2c66d
--- /dev/null
+++ b/repository/MOA/spss/tsl_lib/2.0.2/tsl_lib-2.0.2.pom
@@ -0,0 +1,130 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>MOA.spss</groupId>
+  <artifactId>tsl_lib</artifactId>
+  <version>2.0.2</version>
+  <name>MOA-Sig TLS-library</name>
+  
+  <developers>
+  		<developer>
+			<id>tlenz</id>
+			<name>Thomas Lenz</name>	
+			<organization>IAIK</organization>
+			<email>thomas.lenz@iaik.tugraz.at</email>
+			<timezone>+1</timezone>
+			<roles>
+				<role>developer</role>
+			</roles>
+		</developer>
+	</developers>
+  
+  	<organization>
+		<name>EGIZ - E-Government Innovationszentrum - Austria</name>
+		<url>http://www.egiz.gv.at/</url>
+	</organization>
+	
+	<repositories>
+  		<repository>
+    		<id>MOA</id>
+      		<name>MOA Dependencies</name>
+      		<releases>
+      			<enabled>true</enabled>
+      			<checksumPolicy>ignore</checksumPolicy>
+      		</releases>
+        	<layout>default</layout>
+        	<url>file://${basedir}/repository</url>
+     	</repository>
+  	</repositories>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.5.1</version>
+				<configuration>
+			    	<compilerArguments>
+						<verbose />
+					</compilerArguments>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+			
+						<!--  if maven should be used to build jaxb classes -->
+			<plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxb2-maven-plugin</artifactId>
+                <version>1.5</version>
+                <executions>
+                    <execution>
+                        <id>xjc</id>
+                        <goals>
+                            <goal>xjc</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+               		<outputDirectory>${project.basedir}/src/main/xjc</outputDirectory>
+               		<bindingDirectory>${project.basedir}/src/main/resources/spec/jaxb/</bindingDirectory>
+                  	<bindingFiles>ts_119612v010201_sie_xsd.binding.xml</bindingFiles>
+              		<schemaDirectory>${project.basedir}/src/main/resources/spec/jaxb/</schemaDirectory>
+             		<schemaFiles>ts_119612v010201_sie_xsd.xsd</schemaFiles>
+           			<extension>true</extension>
+                </configuration>
+            </plugin>			
+		</plugins>	
+	</build>
+	
+  	<dependencies>
+  	
+  		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_pki_module</artifactId>
+			<version>2.01_moa</version>
+		</dependency>
+  		<dependency>
+    		<groupId>iaik.prod</groupId>
+	    	<artifactId>iaik_jce_full</artifactId>
+	    	<version>5.52_moa</version>
+      		<scope>provided</scope>
+    	</dependency>
+  		<dependency>
+			<groupId>iaik.prod</groupId> 
+			<artifactId>iaik_xsect</artifactId>
+			<version>2.13_moa</version>
+		</dependency>
+ 		<dependency> 
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_moa</artifactId>
+			<version>2.06</version>
+		</dependency>	
+  	
+  	
+  		<dependency>
+			<groupId>org.xerial</groupId>
+			<artifactId>sqlite-jdbc</artifactId>
+			<version>3.15.1</version>
+		</dependency>
+  	
+  		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.11.0</version>
+		</dependency>
+  	
+  		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+  			<artifactId>commons-lang3</artifactId>
+  			<version>3.4</version>
+		</dependency>
+				
+  	</dependencies>
+  
+</project>
diff --git a/repository/MOA/spss/tsl_lib/2.0.3/tsl_lib-2.0.3.jar b/repository/MOA/spss/tsl_lib/2.0.3/tsl_lib-2.0.3.jar
new file mode 100644
index 000000000..e1321ac16
--- /dev/null
+++ b/repository/MOA/spss/tsl_lib/2.0.3/tsl_lib-2.0.3.jar
diff --git a/repository/MOA/spss/tsl_lib/2.0.3/tsl_lib-2.0.3.pom b/repository/MOA/spss/tsl_lib/2.0.3/tsl_lib-2.0.3.pom
new file mode 100644
index 000000000..354fbfcaa
--- /dev/null
+++ b/repository/MOA/spss/tsl_lib/2.0.3/tsl_lib-2.0.3.pom
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>MOA.spss</groupId>
+	<artifactId>tsl_lib</artifactId>
+	<version>2.0.3</version>
+	<name>MOA-Sig TLS-library</name>
+
+	<developers>
+		<developer>
+			<id>tlenz</id>
+			<name>Thomas Lenz</name>
+			<organization>IAIK</organization>
+			<email>thomas.lenz@iaik.tugraz.at</email>
+			<timezone>+1</timezone>
+			<roles>
+				<role>developer</role>
+			</roles>
+		</developer>
+	</developers>
+
+	<organization>
+		<name>EGIZ - E-Government Innovationszentrum - Austria</name>
+		<url>http://www.egiz.gv.at/</url>
+	</organization>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		
+		<org.projectlombok.lombok.version>1.18.12</org.projectlombok.lombok.version>
+	</properties>
+
+	<repositories>
+		<repository>
+			<id>MOA</id>
+			<name>MOA Dependencies</name>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>ignore</checksumPolicy>
+			</releases>
+			<layout>default</layout>
+			<url>file://${basedir}/repository</url>
+		</repository>
+	</repositories>
+
+	<build>
+		<resources>
+			<resource>
+				<directory>${project.build.directory}/xjc</directory>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<excludes>
+					<exclude>**/jaxb</exclude>
+				</excludes>
+			</resource>
+		</resources>
+
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.5.1</version>
+				<configuration>
+					<compilerArguments>
+						<verbose />
+					</compilerArguments>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+
+			<!-- if maven should be used to build jaxb classes -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jaxb2-maven-plugin</artifactId>
+				<version>2.5.0</version>
+				<executions>
+					<execution>
+						<id>xjc</id>
+						<goals>
+							<goal>xjc</goal>
+						</goals>
+						<phase>generate-sources</phase>
+					</execution>
+				</executions>
+				<configuration>
+					<sources>
+						<source>${project.basedir}/src/main/resources/spec/jaxb/ts_119612v020101_sie_xsd.xsd</source>
+					</sources>
+					<xjbSources>
+						<xjbSource>${project.basedir}/src/main/resources/spec/jaxb/ts_119612v020101_sie_xsd.binding.xml</xjbSource>
+					</xjbSources>
+					<outputDirectory>${project.build.directory}/xjc</outputDirectory>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_pki_module</artifactId>
+			<version>2.01_moa</version>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_jce_full</artifactId>
+			<version>5.61_moa</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_xsect</artifactId>
+			<version>2.14_moa</version>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_moa</artifactId>
+			<version>2.06</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.xerial</groupId>
+			<artifactId>sqlite-jdbc</artifactId>
+			<version>3.32.3.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.1</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.11.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.30</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.11</version>
+		</dependency>
+
+		<dependency>
+    		<groupId>commons-io</groupId>
+    		<artifactId>commons-io</artifactId>
+    		<version>2.7</version>
+		</dependency>
+		
+		<dependency>
+    		<groupId>org.apache.httpcomponents</groupId>
+    		<artifactId>httpclient-cache</artifactId>
+    		<version>4.5.12</version>
+		</dependency>
+
+		<dependency>
+    		<groupId>ch.qos.logback</groupId>
+    		<artifactId>logback-classic</artifactId>
+    		<version>1.2.3</version>
+    		<scope>test</scope>
+		</dependency>
+
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>${org.projectlombok.lombok.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+	</dependencies>
+
+</project>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_cpades/2.4_moa/iaik_cpades-2.4_moa.jar b/repository/iaik/prod/iaik_cpades/2.4_moa/iaik_cpades-2.4_moa.jar
new file mode 100644
index 000000000..300c215c1
--- /dev/null
+++ b/repository/iaik/prod/iaik_cpades/2.4_moa/iaik_cpades-2.4_moa.jar
diff --git a/repository/iaik/prod/iaik_eccelerate/6.02/iaik_eccelerate-6.02.jar b/repository/iaik/prod/iaik_eccelerate/6.02/iaik_eccelerate-6.02.jar
new file mode 100644
index 000000000..e30b629e3
--- /dev/null
+++ b/repository/iaik/prod/iaik_eccelerate/6.02/iaik_eccelerate-6.02.jar
diff --git a/repository/iaik/prod/iaik_eccelerate_addon/6.02/iaik_eccelerate_addon-6.02.jar b/repository/iaik/prod/iaik_eccelerate_addon/6.02/iaik_eccelerate_addon-6.02.jar
new file mode 100644
index 000000000..94f2de55f
--- /dev/null
+++ b/repository/iaik/prod/iaik_eccelerate_addon/6.02/iaik_eccelerate_addon-6.02.jar
diff --git a/repository/iaik/prod/iaik_eccelerate_cms/6.02/iaik_eccelerate_cms-6.02.jar b/repository/iaik/prod/iaik_eccelerate_cms/6.02/iaik_eccelerate_cms-6.02.jar
new file mode 100644
index 000000000..32d7aec07
--- /dev/null
+++ b/repository/iaik/prod/iaik_eccelerate_cms/6.02/iaik_eccelerate_cms-6.02.jar
diff --git a/repository/iaik/prod/iaik_jce_full/5.61_moa/iaik_jce_full-5.61_moa.jar b/repository/iaik/prod/iaik_jce_full/5.61_moa/iaik_jce_full-5.61_moa.jar
new file mode 100644
index 000000000..78b79e975
--- /dev/null
+++ b/repository/iaik/prod/iaik_jce_full/5.61_moa/iaik_jce_full-5.61_moa.jar
diff --git a/repository/iaik/prod/iaik_pki_module/2.02_moa/iaik_pki_module-2.02_moa.jar b/repository/iaik/prod/iaik_pki_module/2.02_moa/iaik_pki_module-2.02_moa.jar
new file mode 100644
index 000000000..b7979e518
--- /dev/null
+++ b/repository/iaik/prod/iaik_pki_module/2.02_moa/iaik_pki_module-2.02_moa.jar
diff --git a/repository/iaik/prod/iaik_tsp/2.32_eval/iaik_tsp-2.32_eval.jar b/repository/iaik/prod/iaik_tsp/2.32_eval/iaik_tsp-2.32_eval.jar
new file mode 100644
index 000000000..fbd9abd20
--- /dev/null
+++ b/repository/iaik/prod/iaik_tsp/2.32_eval/iaik_tsp-2.32_eval.jar
diff --git a/repository/iaik/prod/iaik_xsect/2.14_moa/iaik_xsect-2.14_moa.jar b/repository/iaik/prod/iaik_xsect/2.14_moa/iaik_xsect-2.14_moa.jar
new file mode 100644
index 000000000..aa3c229ca
--- /dev/null
+++ b/repository/iaik/prod/iaik_xsect/2.14_moa/iaik_xsect-2.14_moa.jar