move main frontend GUI to seperate package

35 files changed, 396 insertions, 324 deletions

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index e88692a14..41dbe0bb4 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -132,6 +132,11 @@
 			<groupId>MOA.id.server</groupId>
 			<artifactId>moa-id-spring-initializer</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>MOA.id.server</groupId>
+  		<artifactId>moa-id-frontend-resources</artifactId>
+		</dependency>
+		
 		
 		<!-- Adding eIDAS module dependency automatically adds eIDAS protocol capabilities. -->
 		<dependency>
@@ -177,13 +182,12 @@
 				<artifactId>moa-id-modules-federated_authentication</artifactId>
 			</dependency> 
 
-<!-- 		<dependency>
+		<dependency>
 			<groupId>MOA.id.server.modules</groupId>
 			<artifactId>moa-id-module-ssoTransfer</artifactId>
 			<version>${moa-id-version}</version>
-		</dependency> -->
-		
-		
+		</dependency>
+				
         <!-- transitive dependencies we don't want to include into the war -->
 		<dependency>
 			<groupId>iaik.prod</groupId>
diff --git a/id/server/auth/src/main/resources/META-INF/services/org.apache.axis.components.net.SecureSocketFactory b/id/server/auth/src/main/resources/META-INF/services/org.apache.axis.components.net.SecureSocketFactory
deleted file mode 100644
index c4547e804..000000000
--- a/id/server/auth/src/main/resources/META-INF/services/org.apache.axis.components.net.SecureSocketFactory
+++ /dev/null
@@ -1 +0,0 @@
-at.gv.egovernment.moa.id.util.AxisSecureSocketFactory

diff --git a/id/server/auth/src/main/webapp/Blockdiagramm.png b/id/server/auth/src/main/webapp/Blockdiagramm.png
deleted file mode 100644
index 18d5b84a2..000000000
--- a/id/server/auth/src/main/webapp/Blockdiagramm.png
+++ /dev/null
diff --git a/id/server/auth/src/main/webapp/WCAG-Pruefprotokoll.pdf b/id/server/auth/src/main/webapp/WCAG-Pruefprotokoll.pdf
deleted file mode 100644
index 3722c5d7e..000000000
--- a/id/server/auth/src/main/webapp/WCAG-Pruefprotokoll.pdf
+++ /dev/null
diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
index 948cd3a24..f3b133585 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -16,14 +16,16 @@
 >

 

 	<context:annotation-config />

-

 	<mvc:annotation-driven />

 

-	<mvc:default-servlet-handler/>

+	<context:component-scan base-package="at.gv.egovernment.moa.id.auth.frontend" />

 

+	<!-- <mvc:default-servlet-handler/> -->

+	

   <mvc:interceptors>

   	<bean class="at.gv.egovernment.moa.id.auth.servlet.interceptor.WebFrontEndSecurityInterceptor" />

   	<bean class="at.gv.egovernment.moa.id.auth.servlet.interceptor.UniqueSessionIdentifierInterceptor" />

   </mvc:interceptors> 

+

 	

 </beans>

diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index af1603621..9ad651d42 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	version="3.0">
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+	version="3.1">
 	<display-name>MOA ID Auth</display-name>
 	<description>MOA ID Authentication Service</description>
 
@@ -21,7 +21,11 @@
 		<filter-name>characterEncodingFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
-
+	
+	<welcome-file-list>
+   <welcome-file>index.html</welcome-file>
+	</welcome-file-list>
+	
 	<session-config>
 		<session-timeout>5</session-timeout>
 	</session-config>
diff --git a/id/server/auth/src/main/webapp/anmeldeablauf.png b/id/server/auth/src/main/webapp/anmeldeablauf.png
deleted file mode 100644
index 59bdefe62..000000000
--- a/id/server/auth/src/main/webapp/anmeldeablauf.png
+++ /dev/null
diff --git a/id/server/moa-id-frontend-resources/.gitignore b/id/server/moa-id-frontend-resources/.gitignore
new file mode 100644
index 000000000..b83d22266
--- /dev/null
+++ b/id/server/moa-id-frontend-resources/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/id/server/moa-id-frontend-resources/pom.xml b/id/server/moa-id-frontend-resources/pom.xml
new file mode 100644
index 000000000..4107e98e3
--- /dev/null
+++ b/id/server/moa-id-frontend-resources/pom.xml
@@ -0,0 +1,45 @@
+<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>
+  <parent>
+    <groupId>MOA.id</groupId>
+    <artifactId>moa-id</artifactId>
+    <version>3.x</version>
+  </parent>
+  
+  <groupId>MOA.id.server</groupId>
+  <artifactId>moa-id-frontend-resources</artifactId>
+  <version>${moa-id-version}</version>  
+  <packaging>jar</packaging>
+  
+  <name>MOA-ID-Auth FrontEnd-Resources</name>
+  <description>Static FrontEnd resources for MOA-ID-Auth </description>
+  <organization>
+  	<name>EGIZ</name>
+  	<url>https://www.egiz.gv.at</url>
+  </organization>
+  <developers>
+  	<developer>
+  		<name>Thomas Lenz</name>
+  		<organization>EGIZ</organization>
+  		<email>thomas.lenz@egiz.gv.at</email>
+  	</developer>
+  </developers>
+  
+ 	<properties>
+		<repositoryPath>${basedir}/../../../../repository</repositoryPath>
+	</properties>
+  
+  <dependencies>
+  	<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+  	</dependency>
+  </dependencies>
+  
+</project>
\ No newline at end of file
diff --git a/id/server/moa-id-frontend-resources/src/main/java/META-INF/MANIFEST.MF b/id/server/moa-id-frontend-resources/src/main/java/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..254272e1c
--- /dev/null
+++ b/id/server/moa-id-frontend-resources/src/main/java/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SAML2InterfederationSignalServlet.java b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/StaticResourceConfiguration.java
index 1d18ccb2c..bc71a9511 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SAML2InterfederationSignalServlet.java
+++ b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/StaticResourceConfiguration.java
@@ -20,19 +20,28 @@
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
-package at.gv.egovernment.moa.id.auth.servlet;
+package at.gv.egovernment.moa.id.auth.frontend;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 /**
  * @author tlenz
  *
  */
+@Configuration
+@EnableWebMvc
+public class StaticResourceConfiguration extends WebMvcConfigurerAdapter {
+
+	private static final String[] CLASSPATH_RESOURCE_LOCATIONS = {
+			"classpath:/mainGUI/"};
 
-public class SAML2InterfederationSignalServlet extends
-		AbstractProcessEngineSignalController {
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+	    registry.addResourceHandler("/**").addResourceLocations(CLASSPATH_RESOURCE_LOCATIONS);
 
-	
-	//TODO: getMOASessionID from SAML2 relayState
-	//TODO: add WebService EndPoints for pvp2/sp/post and redirect
-	//TODO: implement SAML2 preprocessing
-	
+	    
+	}
 }
diff --git a/id/server/auth/src/main/webapp/common/LogoBKA.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/common/LogoBKA.png
index 6a92647fd..6a92647fd 100644
--- a/id/server/auth/src/main/webapp/common/LogoBKA.png
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/common/LogoBKA.png
diff --git a/id/server/auth/src/main/webapp/common/LogoEGIZ.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/common/LogoEGIZ.png
index 39f05d131..39f05d131 100644
--- a/id/server/auth/src/main/webapp/common/LogoEGIZ.png
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/common/LogoEGIZ.png
diff --git a/id/server/auth/src/main/webapp/common/logo_digAT.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/common/logo_digAT.png
index 4f36681e2..4f36681e2 100644
--- a/id/server/auth/src/main/webapp/common/logo_digAT.png
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/common/logo_digAT.png
diff --git a/id/server/auth/src/main/webapp/common/main.css b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/common/main.css
index 6bd964346..6bd964346 100644
--- a/id/server/auth/src/main/webapp/common/main.css
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/common/main.css
diff --git a/id/server/auth/src/main/webapp/img/bk_aktivieren.jpg b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/bk_aktivieren.jpg
index a6436dc72..a6436dc72 100644
--- a/id/server/auth/src/main/webapp/img/bk_aktivieren.jpg
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/bk_aktivieren.jpg
diff --git a/id/server/auth/src/main/webapp/img/handy.gif b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handy.gif
index 5aeb542db..5aeb542db 100644
--- a/id/server/auth/src/main/webapp/img/handy.gif
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handy.gif
diff --git a/id/server/auth/src/main/webapp/img/karte.gif b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.gif
index ee9ab7cad..ee9ab7cad 100644
--- a/id/server/auth/src/main/webapp/img/karte.gif
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.gif
diff --git a/id/server/auth/src/main/webapp/img/logo.jpg b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/logo.jpg
index bafbccc84..bafbccc84 100644
--- a/id/server/auth/src/main/webapp/img/logo.jpg
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/logo.jpg
diff --git a/id/server/auth/src/main/webapp/img/mobile-bku.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/mobile-bku.png
index 697514273..697514273 100644
--- a/id/server/auth/src/main/webapp/img/mobile-bku.png
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/mobile-bku.png
diff --git a/id/server/auth/src/main/webapp/img/online-bku-deactivated.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku-deactivated.png
index c2145f12a..c2145f12a 100644
--- a/id/server/auth/src/main/webapp/img/online-bku-deactivated.png
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku-deactivated.png
diff --git a/id/server/auth/src/main/webapp/img/online-bku.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku.png
index d7d524999..d7d524999 100644
--- a/id/server/auth/src/main/webapp/img/online-bku.png
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku.png
diff --git a/id/server/auth/src/main/webapp/img/stork-logo.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/stork-logo.png
index 70355a084..70355a084 100644
--- a/id/server/auth/src/main/webapp/img/stork-logo.png
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/stork-logo.png
diff --git a/id/server/auth/src/main/webapp/img/valid-html5-blue.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/valid-html5-blue.png
index 91ebe3e87..91ebe3e87 100644
--- a/id/server/auth/src/main/webapp/img/valid-html5-blue.png
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/valid-html5-blue.png
diff --git a/id/server/auth/src/main/webapp/img/w3cvalidhtml5.jpg b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/w3cvalidhtml5.jpg
index 2cd65412e..2cd65412e 100644
--- a/id/server/auth/src/main/webapp/img/w3cvalidhtml5.jpg
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/w3cvalidhtml5.jpg
diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/index.html
index d2e7d1e1b..d2e7d1e1b 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/index.html
diff --git a/id/server/auth/src/main/webapp/info_bk.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/info_bk.html
index 59aea64cb..708be703b 100644
--- a/id/server/auth/src/main/webapp/info_bk.html
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/info_bk.html
@@ -1,100 +1,100 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

-<html lang="de">

-	<head>

-		<title>Information</title>

-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">

-        <meta http-equiv="Content-Style-Type" content="text/css">

-        <link rel="stylesheet" type="text/css" href="css/index.css">

-	</head>

-	<body>

-		<div id="wrapper">

-            <p id="skiplinks">

-                <a href="#content">Zum Inhalt springen</a>

-            </p>

-            <div id="banner">

-                <!-- [OPTIONAL] Aendern Sie hier die Titelueberschrift der Seite) -->

-                <div id="bannerleft">

-                    <h1>MOA-Template zur Bürgerkartenauswahl (Musterseite)</h1>

-                    <!-- Meldung im Browser, wenn JavaScript nicht aktiviert -->

-                    <noscript>

-                        <p>

-                            Bitte aktivieren Sie JavaScript.

-                        </p>

-	                </noscript>

-                </div>                

-                <!-- [OPTIONAL] Aendern Sie hier das Logo der Seite (und Alternativtext fuer das Bild) -->

-                <div id="bannerright">

-                    <img src="img/logo.jpg" alt="Logo">

-                </div>

-            </div>

-            <div id="main">

-                <div id="centercontent">

-                    <h2 id="contentheader" class="dunkel">

-                        Informationen zur B&uuml;rgerkarte

-                    </h2>

-                    <div id="content" class="hell">

-                        <p>

-                        	<B>Hinweis:</B>

-                            F&uuml;r nat&uuml;rliche Personen ist beim Login mit B&uuml;rgerkarte keine Erstanmeldung erforderlich.

-                        </p>

-                        <p>

-                        	Um mit der B&uuml;rgerkarte einsteigen zu k&ouml;nnen, ben&ouml;tigen Sie:

-                        </p>

-                        <ul>

-							<li>

-                               	eine Chipkarte, die f&uuml;r die Verwendung als B&uuml;rgerkarte geeignet ist, wie zum Beispiel Ihre e-card, Bankomatkarte oder Signaturkarte von A-Trust

-				      </li>

-							<li>

-                               	einen Kartenleser mit den dazugeh&ouml;rigen Treibern

-							</li>

-							<li>

-                               	eine B&uuml;rgerkartensoftware (BKU)

-                            </li>

-						</ul>

-                        <p>&nbsp;</p>

-                        <p>oder</p>

-                        <ul>

-                        	<li>

-                            	ein Mobiltelefon, das zur Nutzung als Handysignatur registriert ist.

-                            </li>

-                        </ul>

-<p>&nbsp;                        	

-            </p>

-<p>Als B&uuml;rgerkartensoftware stehen Ihnen folgende drei Varianten zur Verf&uuml;gung:

-              </p>

-                        <ul>

-                        	<li><i>Lokale BKU</i>: Diese Software wird lokal auf Ihrem Computer installiert. Die Software finden sie unter <a href="http://www.buergerkarte.at/download.de.php" target="_blank">http://www.buergerkarte.at/download.de.php</a>

-                            </li>

-                            <li><i>Online BKU</i>: Mit der Online BKU wird keine lokale B&uuml;rgerkartensoftware am PC ben&ouml;tigt. &Uuml;ber JAVA Technologien werden die ben&ouml;tigten Funktionen als Applet im Browser ausgef&uuml;hrt. Einzige Voraussetzung ist eine aktuelle JAVA Version (ab Java 6).

-                            </li>

-                            <li><i>Handysignatur</i>: Mit der Handysignatur k&ouml;nnen Sie sich mittels ihres Mobiltelefons anmelden. Voraussetzung ist eine vorherige Registrierung. Mehr Informationen hierzu finden Sie auf: <a href="https://www.handy-signatur.at/" target="_blank">https://www.handy-signatur.at/</a><br>

-                              <br>

-                        	  <b>Informationen zur B&uuml;rgerkarte finden Sie hier:</b>

-                            </li>

-                        </ul>

-                        <ul>

-                       	  <li>

-                               	<a href="http://www.digitales.oesterreich.gv.at" target="_blank">Digitales &Ouml;sterreich</a>: Informationen rund um E-Government

-                            </li>

-							<li>

-           						<a href="http://www.buergerkarte.at" target="_blank">B&uuml;rgerkarte</a>: Informationen zur B&uuml;rgerkarte                     	

-                            </li>

-                        </ul>

-						<p>

-                        	<br>

-					    	<b>Hier bekommen Sie Ihre B&uuml;rgerkarte:</b>                    

-                        </p>

-						<ul>

-                           	<li>

-                               	<a href="http://www.a-trust.at/" target="_blank">A-Trust</a>: Aktivieren der Bankomatkarte/e-card als B&uuml;rgerkarte oder Registrierung ihres Mobiltelefons als B&uuml;rgerkarte oder Ausstellung einer eigenen B&uuml;rgerkarte

-                            </li>

-                        </ul>

-						<p align="center">

-							<a href="javascript:history.back();" class="link_nav">zur&uuml;ck</a>

-						</p>                 

-					</div>

-                </div>

-            </div>

-		</div>

-	</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="de">
+	<head>
+		<title>Information</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <meta http-equiv="Content-Style-Type" content="text/css">
+        <link rel="stylesheet" type="text/css" href="css/index.css">
+	</head>
+	<body>
+		<div id="wrapper">
+            <p id="skiplinks">
+                <a href="#content">Zum Inhalt springen</a>
+            </p>
+            <div id="banner">
+                <!-- [OPTIONAL] Aendern Sie hier die Titelueberschrift der Seite) -->
+                <div id="bannerleft">
+                    <h1>MOA-Template zur Bürgerkartenauswahl (Musterseite)</h1>
+                    <!-- Meldung im Browser, wenn JavaScript nicht aktiviert -->
+                    <noscript>
+                        <p>
+                            Bitte aktivieren Sie JavaScript.
+                        </p>
+	                </noscript>
+                </div>                
+                <!-- [OPTIONAL] Aendern Sie hier das Logo der Seite (und Alternativtext fuer das Bild) -->
+                <div id="bannerright">
+                    <img src="img/logo.jpg" alt="Logo">
+                </div>
+            </div>
+            <div id="main">
+                <div id="centercontent">
+                    <h2 id="contentheader" class="dunkel">
+                        Informationen zur B&uuml;rgerkarte
+                    </h2>
+                    <div id="content" class="hell">
+                        <p>
+                        	<B>Hinweis:</B>
+                            F&uuml;r nat&uuml;rliche Personen ist beim Login mit B&uuml;rgerkarte keine Erstanmeldung erforderlich.
+                        </p>
+                        <p>
+                        	Um mit der B&uuml;rgerkarte einsteigen zu k&ouml;nnen, ben&ouml;tigen Sie:
+                        </p>
+                        <ul>
+							<li>
+                               	eine Chipkarte, die f&uuml;r die Verwendung als B&uuml;rgerkarte geeignet ist, wie zum Beispiel Ihre e-card, Bankomatkarte oder Signaturkarte von A-Trust
+				      </li>
+							<li>
+                               	einen Kartenleser mit den dazugeh&ouml;rigen Treibern
+							</li>
+							<li>
+                               	eine B&uuml;rgerkartensoftware (BKU)
+                            </li>
+						</ul>
+                        <p>&nbsp;</p>
+                        <p>oder</p>
+                        <ul>
+                        	<li>
+                            	ein Mobiltelefon, das zur Nutzung als Handysignatur registriert ist.
+                            </li>
+                        </ul>
+<p>&nbsp;                        	
+            </p>
+<p>Als B&uuml;rgerkartensoftware stehen Ihnen folgende drei Varianten zur Verf&uuml;gung:
+              </p>
+                        <ul>
+                        	<li><i>Lokale BKU</i>: Diese Software wird lokal auf Ihrem Computer installiert. Die Software finden sie unter <a href="http://www.buergerkarte.at/download.de.php" target="_blank">http://www.buergerkarte.at/download.de.php</a>
+                            </li>
+                            <li><i>Online BKU</i>: Mit der Online BKU wird keine lokale B&uuml;rgerkartensoftware am PC ben&ouml;tigt. &Uuml;ber JAVA Technologien werden die ben&ouml;tigten Funktionen als Applet im Browser ausgef&uuml;hrt. Einzige Voraussetzung ist eine aktuelle JAVA Version (ab Java 6).
+                            </li>
+                            <li><i>Handysignatur</i>: Mit der Handysignatur k&ouml;nnen Sie sich mittels ihres Mobiltelefons anmelden. Voraussetzung ist eine vorherige Registrierung. Mehr Informationen hierzu finden Sie auf: <a href="https://www.handy-signatur.at/" target="_blank">https://www.handy-signatur.at/</a><br>
+                              <br>
+                        	  <b>Informationen zur B&uuml;rgerkarte finden Sie hier:</b>
+                            </li>
+                        </ul>
+                        <ul>
+                       	  <li>
+                               	<a href="http://www.digitales.oesterreich.gv.at" target="_blank">Digitales &Ouml;sterreich</a>: Informationen rund um E-Government
+                            </li>
+							<li>
+           						<a href="http://www.buergerkarte.at" target="_blank">B&uuml;rgerkarte</a>: Informationen zur B&uuml;rgerkarte                     	
+                            </li>
+                        </ul>
+						<p>
+                        	<br>
+					    	<b>Hier bekommen Sie Ihre B&uuml;rgerkarte:</b>                    
+                        </p>
+						<ul>
+                           	<li>
+                               	<a href="http://www.a-trust.at/" target="_blank">A-Trust</a>: Aktivieren der Bankomatkarte/e-card als B&uuml;rgerkarte oder Registrierung ihres Mobiltelefons als B&uuml;rgerkarte oder Ausstellung einer eigenen B&uuml;rgerkarte
+                            </li>
+                        </ul>
+						<p align="center">
+							<a href="javascript:history.back();" class="link_nav">zur&uuml;ck</a>
+						</p>                 
+					</div>
+                </div>
+            </div>
+		</div>
+	</body>
 </html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/info_mandates.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/info_mandates.html
index c46b91636..f5e935338 100644
--- a/id/server/auth/src/main/webapp/info_mandates.html
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/info_mandates.html
@@ -1,58 +1,58 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

-<html lang="de">

-	<head>

-		<title>Information</title>

-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">

-        <meta http-equiv="Content-Style-Type" content="text/css">

-        <link rel="stylesheet" type="text/css" href="css/index.css">

-	</head>

-	<body>

-		<div id="wrapper">

-            <p id="skiplinks">

-                <a href="#content">Zum Inhalt springen</a>

-            </p>

-            <div id="banner">

-                <!-- [OPTIONAL] Aendern Sie hier die Titelueberschrift der Seite) -->

-                <div id="bannerleft">

-                    <h1>MOA-Template zur Bürgerkartenauswahl (Musterseite)</h1>

-                    <!-- Meldung im Browser, wenn JavaScript nicht aktiviert -->

-                    <noscript>

-                        <p>

-                            Bitte aktivieren Sie JavaScript.

-                        </p>

-	                </noscript>

-                </div>                

-                <!-- [OPTIONAL] Aendern Sie hier das Logo der Seite (und Alternativtext fuer das Bild) -->

-                <div id="bannerright">

-                    <img src="img/logo.jpg" alt="Logo">

-                </div>

-            </div>

-            <div id="main">

-                <div id="centercontent">

-                    <h2 id="contentheader" class="dunkel">

-                        Information zur Anmeldung mittels elektronischer Vollmacht

-                    </h2>

-                    <div id="content" class="hell">

-                        <p>

-                        <p>Aktivieren Sie das K&auml;stchen <input type="checkbox" checked="true" readonly="true" enabled="false"/> "in Vertretung anmelden",

-			wenn Sie sich als Vertreter f&uuml;r eine andere Person anmelden m&ouml;chten. Das Vollmachtenservice

-			der Stammzahlenregisterbeh&ouml;rde bietet Ihnen Ihre verf&uuml;gbaren Vollmachten zur Auswahl an.</p>

-

-			

-			<p>Das Service zum Eintragen einer Vollmacht zwischen zwei nat&uuml;rlichen Personen k&ouml;nnen Sie

-			unter dem Hyperlink <a href="https://vollmachten.stammzahlenregister.gv.at/">Bilaterale Vollmacht</a>

-			eintragen.</p>

-			

-			<p>Als Organwalter (gem&auml;&szlig; &sect; 5 Abs. 3 E-GovG) und berufsm&auml;&szlig;ige Parteinvertreter,

-			aktivieren Sie bitte ebenfalls das K&auml;stchen <input type="checkbox" checked="true" readonly="true" enabled="false"/> "in Vertretung anmelden".</p>

-

-			

-			<p><span style="text-decoration: underline">Hinweis</span>: Welche Vollmachten Ihnen bei der jeweiligen

-			B&uuml;rgerkartenapplikation zur Verf&uuml;gung stehen, h&auml;ngt vom Anwendungsbetreiber ab.</p>

-                        </p>

-					</div>

-                </div>

-            </div>

-		</div>

-	</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="de">
+	<head>
+		<title>Information</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <meta http-equiv="Content-Style-Type" content="text/css">
+        <link rel="stylesheet" type="text/css" href="css/index.css">
+	</head>
+	<body>
+		<div id="wrapper">
+            <p id="skiplinks">
+                <a href="#content">Zum Inhalt springen</a>
+            </p>
+            <div id="banner">
+                <!-- [OPTIONAL] Aendern Sie hier die Titelueberschrift der Seite) -->
+                <div id="bannerleft">
+                    <h1>MOA-Template zur Bürgerkartenauswahl (Musterseite)</h1>
+                    <!-- Meldung im Browser, wenn JavaScript nicht aktiviert -->
+                    <noscript>
+                        <p>
+                            Bitte aktivieren Sie JavaScript.
+                        </p>
+	                </noscript>
+                </div>                
+                <!-- [OPTIONAL] Aendern Sie hier das Logo der Seite (und Alternativtext fuer das Bild) -->
+                <div id="bannerright">
+                    <img src="img/logo.jpg" alt="Logo">
+                </div>
+            </div>
+            <div id="main">
+                <div id="centercontent">
+                    <h2 id="contentheader" class="dunkel">
+                        Information zur Anmeldung mittels elektronischer Vollmacht
+                    </h2>
+                    <div id="content" class="hell">
+                        <p>
+                        <p>Aktivieren Sie das K&auml;stchen <input type="checkbox" checked="true" readonly="true" enabled="false"/> "in Vertretung anmelden",
+			wenn Sie sich als Vertreter f&uuml;r eine andere Person anmelden m&ouml;chten. Das Vollmachtenservice
+			der Stammzahlenregisterbeh&ouml;rde bietet Ihnen Ihre verf&uuml;gbaren Vollmachten zur Auswahl an.</p>
+
+			
+			<p>Das Service zum Eintragen einer Vollmacht zwischen zwei nat&uuml;rlichen Personen k&ouml;nnen Sie
+			unter dem Hyperlink <a href="https://vollmachten.stammzahlenregister.gv.at/">Bilaterale Vollmacht</a>
+			eintragen.</p>
+			
+			<p>Als Organwalter (gem&auml;&szlig; &sect; 5 Abs. 3 E-GovG) und berufsm&auml;&szlig;ige Parteinvertreter,
+			aktivieren Sie bitte ebenfalls das K&auml;stchen <input type="checkbox" checked="true" readonly="true" enabled="false"/> "in Vertretung anmelden".</p>
+
+			
+			<p><span style="text-decoration: underline">Hinweis</span>: Welche Vollmachten Ihnen bei der jeweiligen
+			B&uuml;rgerkartenapplikation zur Verf&uuml;gung stehen, h&auml;ngt vom Anwendungsbetreiber ab.</p>
+                        </p>
+					</div>
+                </div>
+            </div>
+		</div>
+	</body>
 </html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/info_stork.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/info_stork.html
index 2bdf62711..048f0ac78 100644
--- a/id/server/auth/src/main/webapp/info_stork.html
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/info_stork.html
@@ -1,42 +1,42 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

-<html lang="de">

-	<head>

-		<title>Information (STORK)</title>

-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">

-        <meta http-equiv="Content-Style-Type" content="text/css">

-        <link rel="stylesheet" type="text/css" href="css/index.css">

-	</head>

-	<body>

-		<div id="wrapper">

-            <p id="skiplinks">

-                <a href="#content">Go to contents</a>

-            </p>

-            <div id="banner">

-                <!-- [OPTIONAL] Aendern Sie hier die Titelueberschrift der Seite) -->

-                <div id="bannerleft">

-                    <h1>Information using STORK for secure authentication</h1>

-                    <!-- Meldung im Browser, wenn JavaScript nicht aktiviert -->

-                    <noscript>

-                        <p>

-                            Please activate JavaScript.

-                        </p>

-	                </noscript>

-                </div>                

-                <!-- [OPTIONAL] Aendern Sie hier das Logo der Seite (und Alternativtext fuer das Bild) -->

-                <div id="bannerright">

-                    <img src="img/stork-logo.png" alt="STORK-Logo">

-                </div>

-            </div>

-            <div id="main">

-                    <h2 id="contentheader" class="dunkel">

-                        Information using STORK for secure authentication

-                    </h2>

-                    <div id="content" class="hell">

-                        

-                        <p>The STORK project makes it easier for citizens to access online public services across borders by implementing Europe-wide interoperable cross border platforms for the mutual recognition of national electronic identity (eID) between participating countries.</p>

-                        <p>For more information, please consult the STORK website:</p><a href="https://www.eid-stork2.eu/">https://www.eid-stork2.eu/</a>

-					</div>

-            </div>

-		</div>

-	</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="de">
+	<head>
+		<title>Information (STORK)</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <meta http-equiv="Content-Style-Type" content="text/css">
+        <link rel="stylesheet" type="text/css" href="css/index.css">
+	</head>
+	<body>
+		<div id="wrapper">
+            <p id="skiplinks">
+                <a href="#content">Go to contents</a>
+            </p>
+            <div id="banner">
+                <!-- [OPTIONAL] Aendern Sie hier die Titelueberschrift der Seite) -->
+                <div id="bannerleft">
+                    <h1>Information using STORK for secure authentication</h1>
+                    <!-- Meldung im Browser, wenn JavaScript nicht aktiviert -->
+                    <noscript>
+                        <p>
+                            Please activate JavaScript.
+                        </p>
+	                </noscript>
+                </div>                
+                <!-- [OPTIONAL] Aendern Sie hier das Logo der Seite (und Alternativtext fuer das Bild) -->
+                <div id="bannerright">
+                    <img src="img/stork-logo.png" alt="STORK-Logo">
+                </div>
+            </div>
+            <div id="main">
+                    <h2 id="contentheader" class="dunkel">
+                        Information using STORK for secure authentication
+                    </h2>
+                    <div id="content" class="hell">
+                        
+                        <p>The STORK project makes it easier for citizens to access online public services across borders by implementing Europe-wide interoperable cross border platforms for the mutual recognition of national electronic identity (eID) between participating countries.</p>
+                        <p>For more information, please consult the STORK website:</p><a href="https://www.eid-stork2.eu/">https://www.eid-stork2.eu/</a>
+					</div>
+            </div>
+		</div>
+	</body>
 </html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/moa_errorcodes.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/moa_errorcodes.html
index a5702d60d..a5702d60d 100644
--- a/id/server/auth/src/main/webapp/moa_errorcodes.html
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/moa_errorcodes.html
diff --git a/id/server/auth/src/main/webapp/template_handyBKU.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_handyBKU.html
index 6c3dc563c..08071ac3a 100644
--- a/id/server/auth/src/main/webapp/template_handyBKU.html
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_handyBKU.html
@@ -1,38 +1,38 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

-<html lang="de">

-	<head>

-		<title></title>

-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">

-		<script language="javascript" type="text/javascript">

-			function onAnmeldeSubmit() {

-				document.CustomizedForm.submit();

-				document.CustomizedForm.Senden.disabled=true;

-			}

-		</script>

-	</head>

-	<body onLoad="onAnmeldeSubmit()">		 

-      <form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data">

-			Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier:

-     		<input class="button" type="submit" value="Starte Anmeldung" name="Senden">

-			<input type="hidden" name="XMLRequest" value="<XMLRequest>">

-			<input type="hidden" name="DataURL" value="<DataURL>">

-			<input type="hidden" name="PushInfobox" value="<PushInfobox>">

-			

-			<!-- Angabe der Parameter für die Handy-BKU -->

-			<input type="hidden" name="appletWidth" value="<APPLETWIDTH>">

-			<input type="hidden" name="appletHeight" value="<APPLETHEIGHT>">

-			

-			<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Handy-BKU -->

-			<input type="hidden" name="backgroundColor" value="<COLOR>"> 

-            

-			<input type="hidden" name="redirecttarget" value="<REDIRECTTARGET>">

-		</form>

-

-		<form name="CustomizedInfoForm" action="<BKU>" method="post">

-			<input type="hidden" name="XMLRequest" value="<CertInfoXMLRequest>">

-			<input type="hidden" name="DataURL" value="<CertInfoDataURL>">

-		</form>

-		<form name="DummyForm" action="<BKU>" method="post">

-		</form>

-	</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="de">
+	<head>
+		<title></title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<script language="javascript" type="text/javascript">
+			function onAnmeldeSubmit() {
+				document.CustomizedForm.submit();
+				document.CustomizedForm.Senden.disabled=true;
+			}
+		</script>
+	</head>
+	<body onLoad="onAnmeldeSubmit()">		 
+      <form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data">
+			Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier:
+     		<input class="button" type="submit" value="Starte Anmeldung" name="Senden">
+			<input type="hidden" name="XMLRequest" value="<XMLRequest>">
+			<input type="hidden" name="DataURL" value="<DataURL>">
+			<input type="hidden" name="PushInfobox" value="<PushInfobox>">
+			
+			<!-- Angabe der Parameter für die Handy-BKU -->
+			<input type="hidden" name="appletWidth" value="<APPLETWIDTH>">
+			<input type="hidden" name="appletHeight" value="<APPLETHEIGHT>">
+			
+			<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Handy-BKU -->
+			<input type="hidden" name="backgroundColor" value="<COLOR>"> 
+            
+			<input type="hidden" name="redirecttarget" value="<REDIRECTTARGET>">
+		</form>
+
+		<form name="CustomizedInfoForm" action="<BKU>" method="post">
+			<input type="hidden" name="XMLRequest" value="<CertInfoXMLRequest>">
+			<input type="hidden" name="DataURL" value="<CertInfoDataURL>">
+		</form>
+		<form name="DummyForm" action="<BKU>" method="post">
+		</form>
+	</body>
 </html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/template_localBKU.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_localBKU.html
index 0ec8e52c2..b9905c4af 100644
--- a/id/server/auth/src/main/webapp/template_localBKU.html
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_localBKU.html
@@ -1,30 +1,30 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

-<html lang="de">

-	<head>

-		<title></title>

-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">

-		<script language="javascript" type="text/javascript">

-			function onAnmeldeSubmit() {

-				document.CustomizedForm.submit();

-				document.CustomizedForm.Senden.disabled=true;

-			}

-		</script>

-	</head>

-	<body onLoad="onAnmeldeSubmit()">	   

-		<form target=<REDIRECTTARGET> name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data">

-			Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: 

-     		<input class="button" type="submit" value="Starte Anmeldung" name="Senden">

-			<input type="hidden" name="XMLRequest" value="<XMLRequest>">

-			<input type="hidden" name="DataURL" value="<DataURL>">

-			<input type="hidden" name="PushInfobox" value="<PushInfobox>">

-		</form>

-		

-		<form name="CustomizedInfoForm" action="<BKU>" method="post">

-			<input type="hidden" name="XMLRequest" value="<CertInfoXMLRequest>">

-			<input type="hidden" name="DataURL" value="<CertInfoDataURL>">

-		</form>

-		

-		<form name="DummyForm" action="<BKU>" method="post">

-		</form>

-	</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="de">
+	<head>
+		<title></title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<script language="javascript" type="text/javascript">
+			function onAnmeldeSubmit() {
+				document.CustomizedForm.submit();
+				document.CustomizedForm.Senden.disabled=true;
+			}
+		</script>
+	</head>
+	<body onLoad="onAnmeldeSubmit()">	   
+		<form target=<REDIRECTTARGET> name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data">
+			Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: 
+     		<input class="button" type="submit" value="Starte Anmeldung" name="Senden">
+			<input type="hidden" name="XMLRequest" value="<XMLRequest>">
+			<input type="hidden" name="DataURL" value="<DataURL>">
+			<input type="hidden" name="PushInfobox" value="<PushInfobox>">
+		</form>
+		
+		<form name="CustomizedInfoForm" action="<BKU>" method="post">
+			<input type="hidden" name="XMLRequest" value="<CertInfoXMLRequest>">
+			<input type="hidden" name="DataURL" value="<CertInfoDataURL>">
+		</form>
+		
+		<form name="DummyForm" action="<BKU>" method="post">
+		</form>
+	</body>
+</html>
diff --git a/id/server/auth/src/main/webapp/template_onlineBKU.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_onlineBKU.html
index 39d7bb8e1..a9932d49d 100644
--- a/id/server/auth/src/main/webapp/template_onlineBKU.html
+++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_onlineBKU.html
@@ -1,37 +1,37 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

-<html lang="de">

-	<head>

-		<title></title>

-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">

-		<script language="javascript" type="text/javascript">

-			function onAnmeldeSubmit() {

-				document.CustomizedForm.submit();

-				document.CustomizedForm.Senden.disabled=true;

-			}

-		</script>

-	</head>

-	<body onLoad="onAnmeldeSubmit()">	 

-		<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data">

-			Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: 

-		    <input class="button" type="hidden" value="Starte Anmeldung" name="Senden">

-			<input type="hidden" name="XMLRequest" value="<XMLRequest>">

-			<input type="hidden" name="DataURL" value="<DataURL>">

-			<input type="hidden" name="PushInfobox" value="<PushInfobox>">

-		

-			<!-- Angabe der Parameter fuer die Online-BKU -->

-			<input type="hidden" name="appletWidth" value="<APPLETWIDTH>">

-			<input type="hidden" name="appletHeight" value="<APPLETHEIGHT>">

-			

-			<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Online-BKU -->

-	      <input type="hidden" name="appletBackgroundColor" value="<COLOR>">

-	      <input type="hidden" name="redirectTarget" value="<REDIRECTTARGET>">

-		</form>

-		

-		<form name="CustomizedInfoForm" action="<BKU>" method="post">

-			<input type="hidden" name="XMLRequest" value="<CertInfoXMLRequest>">

-			<input type="hidden" name="DataURL" value="<CertInfoDataURL>">

-		</form>

-		<form name="DummyForm" action="<BKU>" method="post">

-		</form>

-	</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="de">
+	<head>
+		<title></title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<script language="javascript" type="text/javascript">
+			function onAnmeldeSubmit() {
+				document.CustomizedForm.submit();
+				document.CustomizedForm.Senden.disabled=true;
+			}
+		</script>
+	</head>
+	<body onLoad="onAnmeldeSubmit()">	 
+		<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data">
+			Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: 
+		    <input class="button" type="hidden" value="Starte Anmeldung" name="Senden">
+			<input type="hidden" name="XMLRequest" value="<XMLRequest>">
+			<input type="hidden" name="DataURL" value="<DataURL>">
+			<input type="hidden" name="PushInfobox" value="<PushInfobox>">
+		
+			<!-- Angabe der Parameter fuer die Online-BKU -->
+			<input type="hidden" name="appletWidth" value="<APPLETWIDTH>">
+			<input type="hidden" name="appletHeight" value="<APPLETHEIGHT>">
+			
+			<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Online-BKU -->
+	      <input type="hidden" name="appletBackgroundColor" value="<COLOR>">
+	      <input type="hidden" name="redirectTarget" value="<REDIRECTTARGET>">
+		</form>
+		
+		<form name="CustomizedInfoForm" action="<BKU>" method="post">
+			<input type="hidden" name="XMLRequest" value="<CertInfoXMLRequest>">
+			<input type="hidden" name="DataURL" value="<CertInfoDataURL>">
+		</form>
+		<form name="DummyForm" action="<BKU>" method="post">
+		</form>
+	</body>
+</html>
diff --git a/id/server/modules/pom.xml b/id/server/modules/pom.xml
index 77d63c35c..3ca3497a0 100644
--- a/id/server/modules/pom.xml
+++ b/id/server/modules/pom.xml
@@ -19,15 +19,19 @@
 		<repositoryPath>${basedir}/../../../repository</repositoryPath>
 	</properties>
 	
-	<modules>
+	<modules>	
+		<module>moa-id-modul-citizencard_authentication</module>
+		
 		<module>module-monitoring</module>
+
 		<module>moa-id-modules-saml1</module>
 		<module>moa-id-module-openID</module>
-		<module>moa-id-modul-citizencard_authentication</module>
-		<module>moa-id-module-eIDAS</module>
-		<!-- <module>moa-id-module-pvp2</module> -->
+		
+		<module>moa-id-module-eIDAS</module>		
 		<module>moa-id-modules-federated_authentication</module>
 		<module>moa-id-module-elga_mandate_service</module>
+		
+		<module>moa-id-module-ssoTransfer</module>
 	</modules>
 	
 	<dependencies>
diff --git a/id/server/pom.xml b/id/server/pom.xml
index c311d8d96..dd1d88e76 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -22,8 +22,9 @@
         <module>moa-id-commons</module>

         <module>modules</module>

         <module>moa-id-spring-initializer</module>

-        

+        <module>moa-id-frontend-resources</module>        

         <module>auth</module>

+        

     </modules>

 

 	<dependencyManagement>