From 1d65e35ef38e8a7405ec25def325080b7da2ab4d Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Wed, 13 Jan 2016 16:47:05 +0100
Subject: moa learned how to receive eidas node requests

---
 id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'id/server/auth/src/main/webapp')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
index 8f01ca22b..c3cf396b3 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -93,6 +93,10 @@
         <from>^/stork2/RetrieveMandate$</from>
         <to type="forward">/dispatcher?mod=id_stork2&amp;action=MandateRetrievalRequest&amp;%{query-string}</to>
     </rule>
+    <rule match-type="regex">
+        <from>^/eidas/ColleagueRequest$</from>
+        <to type="forward">/dispatcher?mod=eidas&amp;action=AuthenticationRequest&amp;%{query-string}</to>
+    </rule>
 
 
     <rule match-type="regex">
-- 
cgit v1.2.3


From 0c6ca9a8fb5de402f128a449b80635a79292fce0 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 22 Jan 2016 14:11:11 +0100
Subject: refactor eIDAS-node metadata generation

---
 id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'id/server/auth/src/main/webapp')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
index c3cf396b3..a67549ef3 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -93,10 +93,16 @@
         <from>^/stork2/RetrieveMandate$</from>
         <to type="forward">/dispatcher?mod=id_stork2&amp;action=MandateRetrievalRequest&amp;%{query-string}</to>
     </rule>
+    
+    <!-- eIDAS protocol -->
     <rule match-type="regex">
         <from>^/eidas/ColleagueRequest$</from>
         <to type="forward">/dispatcher?mod=eidas&amp;action=AuthenticationRequest&amp;%{query-string}</to>
     </rule>
+    <rule match-type="regex">
+        <from>^/eidas/metadata$</from>
+        <to type="forward">/dispatcher?mod=eidas&amp;action=MetadataRequest&amp;%{query-string}</to>
+    </rule>
 
 
     <rule match-type="regex">
-- 
cgit v1.2.3


From d0e4e457b349e7d4ffc7b9eb146d79c8100f9781 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 10 Feb 2016 16:25:06 +0100
Subject: switch to Spring based application initializer

---
 .../src/main/webapp/WEB-INF/applicationContext.xml | 16 ++++++++--
 id/server/auth/src/main/webapp/WEB-INF/web.xml     | 36 +++++++++++-----------
 2 files changed, 32 insertions(+), 20 deletions(-)

(limited to 'id/server/auth/src/main/webapp')

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 a3f834457..18a75740a 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -2,11 +2,23 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="
+		http://www.springframework.org/schema/beans 
+		http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context 
+		http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/mvc
+		http://www.springframework.org/schema/mvc/spring-mvc.xsd
+		http://www.springframework.org/schema/tx
+		http://www.springframework.org/schema/tx/spring-tx.xsd
+	"
+>
 
 	<context:annotation-config />
 
+	<mvc:annotation-driven />
+
 	<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
 		<property name="transitionConditionExpressionEvaluator">
 			<bean class="at.gv.egovernment.moa.id.process.springweb.SpringWebExpressionEvaluator" />
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 5afc0dee7..4b129f374 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -5,10 +5,10 @@
 	<display-name>MOA ID Auth</display-name>
 	<description>MOA ID Authentication Service</description>
 
-	<!-- bootstrap loader for spring framework -->
-	<listener>
+ 	<!-- bootstrap loader for spring framework -->
+<!--	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
+	</listener> -->
 
 	<filter>
 		<filter-name>characterEncodingFilter</filter-name>
@@ -27,8 +27,8 @@
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 
-	<!-- exposes request and response to the current thread -->
-	<filter>
+ 	<!-- exposes request and response to the current thread -->
+<!--	<filter>
 		<filter-name>requestContextFilter</filter-name>
 		<filter-class>org.springframework.web.filter.RequestContextFilter</filter-class>
 	</filter>
@@ -67,8 +67,8 @@
 		<url-pattern>/RedirectServlet</url-pattern>
 	</servlet-mapping>
 	
-	<!-- automatically registered by module 'moa-id-module-monitoring' using @WebServlet annotation -->
-	<!--
+	automatically registered by module 'moa-id-module-monitoring' using @WebServlet annotation
+	
 	<servlet>
 		<display-name>MonitoringServlet</display-name>
 		<servlet-name>MonitoringServlet</servlet-name>
@@ -78,7 +78,7 @@
 		<servlet-name>MonitoringServlet</servlet-name>
 		<url-pattern>/MonitoringServlet</url-pattern>
 	</servlet-mapping>
-	-->
+	
 	
 	<servlet>
 		<display-name>SSOSendAssertionServlet</display-name>
@@ -110,7 +110,7 @@
 	<servlet-mapping>
 		<servlet-name>IDPSLO</servlet-name>
 		<url-pattern>/idpSingleLogout</url-pattern>
-	</servlet-mapping>
+	</servlet-mapping> -->
 	
 	<servlet>
 		<display-name>Apache-Axis Servlet</display-name>
@@ -122,7 +122,7 @@
 		<url-pattern>/services/*</url-pattern>
 	</servlet-mapping>
 
-	<servlet>
+<!-- 	<servlet>
 		<display-name>Dispatcher Servlet</display-name>
 		<servlet-name>DispatcherServlet</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.entrypoints.DispatcherServlet</servlet-class>
@@ -140,28 +140,28 @@
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ProcessEngineSignalServlet</servlet-class>
 	</servlet>
 	<servlet-mapping>
-		<!-- do not change this servlet-name -->
+		do not change this servlet-name
 		<servlet-name>ProcessEngineSignal</servlet-name>
 		
-		<!-- Use this url-pattern in order to signal the next (asynchronous) task. -->
+		Use this url-pattern in order to signal the next (asynchronous) task.
 		<url-pattern>/signalProcess</url-pattern>
 		
-		<!-- legacy url patterns for asynchronous tasks (internal default module/processes) -->
+		legacy url patterns for asynchronous tasks (internal default module/processes)
 		<url-pattern>/GetMISSessionID</url-pattern>
 		<url-pattern>/GetForeignID</url-pattern>
 		<url-pattern>/VerifyAuthBlock</url-pattern>
 		<url-pattern>/VerifyCertificate</url-pattern>
 		<url-pattern>/VerifyIdentityLink</url-pattern>
 		
-		<!--
+		
 			STORK servlet mappings; automatically registered by the stork module;
 			refer to at.gv.egovernment.moa.id.auth.modules.stork.STORKWebApplicationInitializer
-		-->
-		<!--
+		
+		
 		<url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
 		<url-pattern>/PEPSConnector</url-pattern>
-		-->
-	</servlet-mapping>
+		
+	</servlet-mapping> -->
 
 	<session-config>
 		<session-timeout>5</session-timeout>
-- 
cgit v1.2.3


From ff8ae7727e4de105a1179288b129429a29bc07ca Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 10 Feb 2016 17:05:00 +0100
Subject: refactor LogOutServlet to Spring WebMVC implementation

---
 id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'id/server/auth/src/main/webapp')

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 18a75740a..d0c786751 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -17,8 +17,12 @@
 
 	<context:annotation-config />
 
+	<context:component-scan base-package="at.gv.egovernment.moa.id.auth.servlet" />
+
 	<mvc:annotation-driven />
 
+	<mvc:default-servlet-handler/>
+
 	<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
 		<property name="transitionConditionExpressionEvaluator">
 			<bean class="at.gv.egovernment.moa.id.process.springweb.SpringWebExpressionEvaluator" />
-- 
cgit v1.2.3


From 1b7401488933f031a68dfe929b25db86279b52d2 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 15 Feb 2016 18:12:06 +0100
Subject: First untested part: Refactor authentication modules and process
 management to Spring

---
 id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'id/server/auth/src/main/webapp')

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 d0c786751..0774bd277 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -18,19 +18,22 @@
 	<context:annotation-config />
 
 	<context:component-scan base-package="at.gv.egovernment.moa.id.auth.servlet" />
+	<context:component-scan base-package="at.gv.egovernment.moa.id.protocols" />
 
 	<mvc:annotation-driven />
 
 	<mvc:default-servlet-handler/>
 
+  <mvc:interceptors>
+  	<bean class="at.gv.egovernment.moa.id.protocols.UniqueSessionIdentifierInterceptor" />
+  </mvc:interceptors> 
+
 	<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
 		<property name="transitionConditionExpressionEvaluator">
 			<bean class="at.gv.egovernment.moa.id.process.springweb.SpringWebExpressionEvaluator" />
 		</property>
 	</bean>
 	
-	<bean id="authenticationManager" class="at.gv.egovernment.moa.id.moduls.AuthenticationManager" factory-method="getInstance" />
-
 	<!-- import auth modules -->
 	<import resource="classpath*:**/*.authmodule.beans.xml" />
 
-- 
cgit v1.2.3


From 89dc33e5d6053af56a6d2cb11271ab092ced7dc3 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 18 Feb 2016 10:58:10 +0100
Subject: add WebFrontEnd security interceptor

---
 id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'id/server/auth/src/main/webapp')

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 0774bd277..da5bf98ab 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -25,7 +25,8 @@
 	<mvc:default-servlet-handler/>
 
   <mvc:interceptors>
-  	<bean class="at.gv.egovernment.moa.id.protocols.UniqueSessionIdentifierInterceptor" />
+  	<bean class="at.gv.egovernment.moa.id.auth.servlet.interceptor.WebFrontEndSecurityInterceptor" />
+  	<bean class="at.gv.egovernment.moa.id.auth.servlet.interceptor.UniqueSessionIdentifierInterceptor" />
   </mvc:interceptors> 
 
 	<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
-- 
cgit v1.2.3


From 9bafb2671b297d39574c346c896347f197282081 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 18 Feb 2016 19:21:10 +0100
Subject: remove AXIS1 implemented WebService for SAML1  --> now a simple
 Spring controller is used as WebService endpoint

---
 .../src/main/webapp/WEB-INF/server-config.wsdd     | 29 ----------------------
 id/server/auth/src/main/webapp/WEB-INF/web.xml     |  4 +--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 id/server/auth/src/main/webapp/WEB-INF/server-config.wsdd

(limited to 'id/server/auth/src/main/webapp')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/server-config.wsdd b/id/server/auth/src/main/webapp/WEB-INF/server-config.wsdd
deleted file mode 100644
index 121ec3cf9..000000000
--- a/id/server/auth/src/main/webapp/WEB-INF/server-config.wsdd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment name="defaultClientConfig"
-            xmlns="http://xml.apache.org/axis/wsdd/"
-            xmlns:java="http://xml.apache.org/axis/wsdd/providers/java"
-            xmlns:handler="http://xml.apache.org/axis/wsdd/providers/handler">
-
-  <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
-  <handler name="MsgDispatcher" type="java:org.apache.axis.providers.java.MsgProvider"/>
-  <handler name="HTTPAuthHandler" type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
-
-  <service name="GetAuthenticationData" provider="java:MSG">
-    <namespace>urn:oasis:names:tc:SAML:1.0:protocol</namespace>
-    <parameter name="allowedMethods" value="Request"/>
-    <parameter name="className" value="at.gv.egovernment.moa.id.protocols.saml1.GetAuthenticationDataService"/>
-    <wsdlFile>/resources/wsdl/MOA-ID-1.x.wsdl</wsdlFile>
-    <requestFlow>
-    </requestFlow>
-    <responseFlow>
-    </responseFlow>
-  </service>
-
-  <transport name="http">
-    <requestFlow>
-      <handler type="URLMapper"/>
-      <handler type="HTTPAuthHandler"/>
-    </requestFlow>
-  </transport>
-
-</deployment>
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 4b129f374..92dcf1266 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -112,7 +112,7 @@
 		<url-pattern>/idpSingleLogout</url-pattern>
 	</servlet-mapping> -->
 	
-	<servlet>
+<!-- 	<servlet>
 		<display-name>Apache-Axis Servlet</display-name>
 		<servlet-name>AxisServlet</servlet-name>
 		<servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
@@ -120,7 +120,7 @@
 	<servlet-mapping>
 		<servlet-name>AxisServlet</servlet-name>
 		<url-pattern>/services/*</url-pattern>
-	</servlet-mapping>
+	</servlet-mapping> -->
 
 <!-- 	<servlet>
 		<display-name>Dispatcher Servlet</display-name>
-- 
cgit v1.2.3


From f3010fd5d1d8e423ee6f2a1aaca5441ccfd3f785 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 19 Feb 2016 13:15:50 +0100
Subject: remove unused code and files

---
 .../auth/src/main/webapp/WEB-INF/urlrewrite.xml    | 134 --------------------
 id/server/auth/src/main/webapp/WEB-INF/web.xml     | 141 ---------------------
 id/server/auth/src/main/webapp/errorpage-auth.jsp  |  50 --------
 3 files changed, 325 deletions(-)
 delete mode 100644 id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
 delete mode 100644 id/server/auth/src/main/webapp/errorpage-auth.jsp

(limited to 'id/server/auth/src/main/webapp')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
deleted file mode 100644
index a67549ef3..000000000
--- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE urlrewrite PUBLIC "-//tuckey.org//DTD UrlRewrite 4.0//EN"
-        "http://www.tuckey.org/res/dtds/urlrewrite4.0.dtd">
-
-<!-- Configuration file for UrlRewriteFilter http://www.tuckey.org/urlrewrite/ -->
-<urlrewrite>
-
-	<rule>
-		<note>
-			The rule means that requests to /test/status/ will be redirected to
-			/rewrite-status
-			the url will be rewritten.
-		</note>
-		<from>/test/status/</from>
-		<to type="redirect">%{context-path}/rewrite-status</to>
-	</rule>
-
-	<!-- Legacy Rules -->
-	<rule match-type="regex">
-		<from>^/StartAuthentication$</from>
-		<to type="forward">/dispatcher?mod=id_saml1&amp;action=GetArtifact</to>
-	</rule>
-	<rule match-type="regex">
-		<from>^/StartAuthentication\?(.*)$</from>
-		<to type="forward">/dispatcher?mod=id_saml1&amp;action=GetArtifact&amp;$1</to>
-	</rule>
-
-	<rule match-type="regex">
-		<from>^/auth/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)$</from>
-		<to type="forward">/dispatcher?mod=$1&amp;action=$2</to>
-	</rule>
-	<rule match-type="regex">
-		<from>^/auth/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)\?(.*)$</from>
-		<to type="forward">/dispatcher?mod=$1&amp;action=$2&amp;$3</to>
-	</rule>
-
-
-	<rule match-type="regex">
-		<from>^/pvp2/metadata$</from>
-		<to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Metadata&amp;%{query-string}</to>
-	</rule>
-	<rule match-type="regex">
-		<from>^/pvp2/redirect$</from>
-		<to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Redirect&amp;endpointtype=idp&amp;%{query-string}</to>
-	</rule>
-	<rule match-type="regex">
-		<from>^/pvp2/post$</from>
-		<to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Post&amp;endpointtype=idp&amp;%{query-string}</to>
-	</rule>
-	<rule match-type="regex">
-		<from>^/pvp2/Soap$</from>
-		<to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Soap&amp;endpointtype=idp</to>
-	</rule>
-	<rule match-type="regex">
-		<from>^/pvp2/attributequery$</from>
-		<to type="forward">/dispatcher?mod=id_pvp2x&amp;action=AttributeQuery&amp;endpointtype=idp</to>
-	</rule>
-	<rule match-type="regex">
-		<from>^/pvp2/sp/redirect$</from>
-		<to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Redirect&amp;endpointtype=sp&amp;%{query-string}</to>
-	</rule>
-	<rule match-type="regex">
-		<from>^/pvp2/sp/post$</from>
-		<to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Post&amp;endpointtype=sp&amp;%{query-string}</to>
-	</rule>
-
-
-    <rule match-type="regex">
-        <from>^/stork2/StartAuthentication$</from>
-        <to type="forward">/dispatcher?mod=id_stork2&amp;action=AuthenticationRequest&amp;%{query-string}</to>
-    </rule>
-    <rule match-type="regex">
-        <from>^/stork2/ResumeAuthentication$</from>
-        <to type="forward">/dispatcher?mod=id_stork2&amp;action=AttributeCollector&amp;%{query-string}</to>
-    </rule>
-    <rule match-type="regex">
-        <from>^/stork2/GetConsent$</from>
-        <to type="forward">/dispatcher?mod=id_stork2&amp;action=ConsentEvaluator&amp;%{query-string}</to>
-    </rule>
-    <rule match-type="regex">
-        <from>^/stork2/SendPEPSAuthnRequest$</from>
-        <to type="forward">/dispatcher?mod=id_stork2&amp;action=AuthenticationRequest&amp;%{query-string}</to>
-    </rule>
-    <rule match-type="regex">
-        <from>^/stork2/ServiceProvider$</from>
-        <to type="forward">/dispatcher?mod=id_stork2&amp;action=AuthenticationRequest&amp;%{query-string}</to>
-    </rule>
-    <rule match-type="regex">
-        <from>^/stork2/SendPEPSAuthnRequestWithoutSignedDoc$</from>
-        <to type="forward">/dispatcher?mod=id_stork2&amp;action=AuthenticationRequest1&amp;%{query-string}</to>
-    </rule>
-    <rule match-type="regex">
-        <from>^/stork2/RetrieveMandate$</from>
-        <to type="forward">/dispatcher?mod=id_stork2&amp;action=MandateRetrievalRequest&amp;%{query-string}</to>
-    </rule>
-    
-    <!-- eIDAS protocol -->
-    <rule match-type="regex">
-        <from>^/eidas/ColleagueRequest$</from>
-        <to type="forward">/dispatcher?mod=eidas&amp;action=AuthenticationRequest&amp;%{query-string}</to>
-    </rule>
-    <rule match-type="regex">
-        <from>^/eidas/metadata$</from>
-        <to type="forward">/dispatcher?mod=eidas&amp;action=MetadataRequest&amp;%{query-string}</to>
-    </rule>
-
-
-    <rule match-type="regex">
-		<from>^/oauth2/auth\\?(.*)$</from>
-		<to type="forward">/dispatcher?mod=id_oauth20&amp;action=AUTH&amp;%{query-string}</to>
-	</rule>
-	<rule match-type="regex">
-		<from>^/oauth2/token\\?(.*)$</from>
-		<to type="forward">/dispatcher?mod=id_oauth20&amp;action=TOKEN&amp;%{query-string}</to>
-	</rule>
-	
-
-	<outbound-rule>
-		<note>
-			The outbound-rule specifies that when response.encodeURL is called (if
-			you are using JSTL c:url)
-			the url /rewrite-status will be rewritten to /test/status/.
-
-			The above rule and this outbound-rule means that end users should never
-			see the
-			url /rewrite-status only /test/status/ both in thier location bar and in
-			hyperlinks
-			in your pages.
-		</note>
-		<from>/rewrite-status</from>
-		<to>/test/status/</to>
-	</outbound-rule>
-
-</urlrewrite>
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 92dcf1266..af1603621 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -5,11 +5,6 @@
 	<display-name>MOA ID Auth</display-name>
 	<description>MOA ID Authentication Service</description>
 
- 	<!-- bootstrap loader for spring framework -->
-<!--	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener> -->
-
 	<filter>
 		<filter-name>characterEncodingFilter</filter-name>
 		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
@@ -27,142 +22,6 @@
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 
- 	<!-- exposes request and response to the current thread -->
-<!--	<filter>
-		<filter-name>requestContextFilter</filter-name>
-		<filter-class>org.springframework.web.filter.RequestContextFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>requestContextFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-	
-	<filter>
-		<filter-name>UrlRewriteFilter</filter-name>
-		<filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>UrlRewriteFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<servlet>
-		<description>Generate BKU Request template</description>
-		<display-name>GenerateIframeTemplate</display-name>
-		<servlet-name>GenerateIframeTemplate</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>GenerateIframeTemplate</servlet-name>
-		<url-pattern>/GenerateIframeTemplate</url-pattern>
-	</servlet-mapping>
-	
-	<servlet>
-		<display-name>RedirectServlet</display-name>
-		<servlet-name>RedirectServlet</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.RedirectServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>RedirectServlet</servlet-name>
-		<url-pattern>/RedirectServlet</url-pattern>
-	</servlet-mapping>
-	
-	automatically registered by module 'moa-id-module-monitoring' using @WebServlet annotation
-	
-	<servlet>
-		<display-name>MonitoringServlet</display-name>
-		<servlet-name>MonitoringServlet</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.MonitoringServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>MonitoringServlet</servlet-name>
-		<url-pattern>/MonitoringServlet</url-pattern>
-	</servlet-mapping>
-	
-	
-	<servlet>
-		<display-name>SSOSendAssertionServlet</display-name>
-		<servlet-name>SSOSendAssertionServlet</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.SSOSendAssertionServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>SSOSendAssertionServlet</servlet-name>
-		<url-pattern>/SSOSendAssertionServlet</url-pattern>
-	</servlet-mapping>
-	
-	<servlet>
-		<description>SSO LogOut</description>
-		<display-name>LogOut</display-name>
-		<servlet-name>LogOut</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.LogOutServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>LogOut</servlet-name>
-		<url-pattern>/LogOut</url-pattern>
-	</servlet-mapping>
-	
-	<servlet>
-		<description>IDP Single LogOut Service</description>
-		<display-name>IDP-SLO</display-name>
-		<servlet-name>IDPSLO</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.IDPSingleLogOutServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>IDPSLO</servlet-name>
-		<url-pattern>/idpSingleLogout</url-pattern>
-	</servlet-mapping> -->
-	
-<!-- 	<servlet>
-		<display-name>Apache-Axis Servlet</display-name>
-		<servlet-name>AxisServlet</servlet-name>
-		<servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>AxisServlet</servlet-name>
-		<url-pattern>/services/*</url-pattern>
-	</servlet-mapping> -->
-
-<!-- 	<servlet>
-		<display-name>Dispatcher Servlet</display-name>
-		<servlet-name>DispatcherServlet</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.entrypoints.DispatcherServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>DispatcherServlet</servlet-name>
-		<url-pattern>/dispatcher</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<description>Resumes a suspended process task.</description>
-		<display-name>ProcessEngineSignal</display-name>
-		<servlet-name>ProcessEngineSignal</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ProcessEngineSignalServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		do not change this servlet-name
-		<servlet-name>ProcessEngineSignal</servlet-name>
-		
-		Use this url-pattern in order to signal the next (asynchronous) task.
-		<url-pattern>/signalProcess</url-pattern>
-		
-		legacy url patterns for asynchronous tasks (internal default module/processes)
-		<url-pattern>/GetMISSessionID</url-pattern>
-		<url-pattern>/GetForeignID</url-pattern>
-		<url-pattern>/VerifyAuthBlock</url-pattern>
-		<url-pattern>/VerifyCertificate</url-pattern>
-		<url-pattern>/VerifyIdentityLink</url-pattern>
-		
-		
-			STORK servlet mappings; automatically registered by the stork module;
-			refer to at.gv.egovernment.moa.id.auth.modules.stork.STORKWebApplicationInitializer
-		
-		
-		<url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
-		<url-pattern>/PEPSConnector</url-pattern>
-		
-	</servlet-mapping> -->
-
 	<session-config>
 		<session-timeout>5</session-timeout>
 	</session-config>
diff --git a/id/server/auth/src/main/webapp/errorpage-auth.jsp b/id/server/auth/src/main/webapp/errorpage-auth.jsp
deleted file mode 100644
index 07f3e7f69..000000000
--- a/id/server/auth/src/main/webapp/errorpage-auth.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<%@ page contentType="text/html; charset=UTF-8" %>
-<html>
-<head>
-<title>Ein Fehler ist aufgetreten</title>
-</head>
-<% Throwable exceptionThrown = (Throwable)request.getAttribute("ExceptionThrown");
-   String errorMessage = (String)request.getAttribute("ErrorMessage");
-   String wrongParameters = (String)request.getAttribute("WrongParameters");
-%>
-
-<body>
-<h1>Fehler bei der Anmeldung</h1>
-<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
-
-<% if (errorMessage != null) { %>
-<p>
-<%= errorMessage%><br>
-</p>
-<% } %>
-<% if (exceptionThrown != null) { %>
-<p> 
-<%= exceptionThrown.getMessage()%>
-</p>
-<% } %>
-<% if (wrongParameters != null) { %>
-<p>Die Angabe der Parameter ist unvollst&auml;ndig.<br></p>
-<b> <%= wrongParameters %> </b><br>
-<p>
-   Beispiele f&uuml;r korrekte Links zur MOA-ID Authentisierung sind:
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>
-Im Falle einer Applikation aus dem privatwirtschaftlichen Bereich (type="businessService") entf&auml;llt die Angabe des <i>Target</i> Parameters:
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>Die Angabe der Parameter <tt>&quot;Template&quot;</tt> und <tt>&quot;BKUSelectionTemplate&quot;</tt> ist optional.</p>
-<% } %>
-</body>
-</html>
\ No newline at end of file
-- 
cgit v1.2.3


From d476d340b2fb6694eac18d94e6c0ddbaad5b7545 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 24 Feb 2016 12:16:05 +0100
Subject: move bean definitions

---
 .../auth/src/main/webapp/WEB-INF/applicationContext.xml    | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'id/server/auth/src/main/webapp')

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 da5bf98ab..948cd3a24 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -17,9 +17,6 @@
 
 	<context:annotation-config />
 
-	<context:component-scan base-package="at.gv.egovernment.moa.id.auth.servlet" />
-	<context:component-scan base-package="at.gv.egovernment.moa.id.protocols" />
-
 	<mvc:annotation-driven />
 
 	<mvc:default-servlet-handler/>
@@ -28,16 +25,5 @@
   	<bean class="at.gv.egovernment.moa.id.auth.servlet.interceptor.WebFrontEndSecurityInterceptor" />
   	<bean class="at.gv.egovernment.moa.id.auth.servlet.interceptor.UniqueSessionIdentifierInterceptor" />
   </mvc:interceptors> 
-
-	<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
-		<property name="transitionConditionExpressionEvaluator">
-			<bean class="at.gv.egovernment.moa.id.process.springweb.SpringWebExpressionEvaluator" />
-		</property>
-	</bean>
-	
-	<!-- import auth modules -->
-	<import resource="classpath*:**/*.authmodule.beans.xml" />
-
-	<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.auth.modules.registration.ModuleRegistration" factory-method="getInstance" />
 	
 </beans>
-- 
cgit v1.2.3


From 0dc260503a5deb581802e645ddae996ae9298968 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 24 Feb 2016 08:07:07 +0100
Subject: Update SSO-transer authentication modul to MOA_ID 3.2.x

---
 id/server/auth/src/main/webapp/index.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'id/server/auth/src/main/webapp')

diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index 0c051571b..d2e7d1e1b 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -77,6 +77,7 @@
                     <li><a href=#>Demo Clients</a></li>
                     <!--Link zum Konfigtool-->
                     <li><a href="https://localhost:8443/moa-id-configuration">Konfiguration GUI</a></li>
+                    <li><a href="./TransferSSOSession">Transfer Single Sign-On Session to Smartphone App</a></li>
                 	
                 </ul>
             </nav>
-- 
cgit v1.2.3


From f66ed1831a4877d6c7cb3c55bbc3fd84024a1523 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 09:14:38 +0100
Subject: move main frontend GUI to seperate package

---
 id/server/auth/src/main/webapp/Blockdiagramm.png   | Bin 206722 -> 0 bytes
 .../auth/src/main/webapp/WCAG-Pruefprotokoll.pdf   | Bin 721803 -> 0 bytes
 .../src/main/webapp/WEB-INF/applicationContext.xml |   6 +-
 id/server/auth/src/main/webapp/WEB-INF/web.xml     |  10 +-
 id/server/auth/src/main/webapp/anmeldeablauf.png   | Bin 51158 -> 0 bytes
 id/server/auth/src/main/webapp/common/LogoBKA.png  | Bin 8062 -> 0 bytes
 id/server/auth/src/main/webapp/common/LogoEGIZ.png | Bin 77395 -> 0 bytes
 .../auth/src/main/webapp/common/logo_digAT.png     | Bin 22964 -> 0 bytes
 id/server/auth/src/main/webapp/common/main.css     | 253 ----------------
 .../auth/src/main/webapp/img/bk_aktivieren.jpg     | Bin 30471 -> 0 bytes
 id/server/auth/src/main/webapp/img/handy.gif       | Bin 4460 -> 0 bytes
 id/server/auth/src/main/webapp/img/karte.gif       | Bin 3360 -> 0 bytes
 id/server/auth/src/main/webapp/img/logo.jpg        | Bin 18260 -> 0 bytes
 id/server/auth/src/main/webapp/img/mobile-bku.png  | Bin 4602 -> 0 bytes
 .../src/main/webapp/img/online-bku-deactivated.png | Bin 5382 -> 0 bytes
 id/server/auth/src/main/webapp/img/online-bku.png  | Bin 6011 -> 0 bytes
 id/server/auth/src/main/webapp/img/stork-logo.png  | Bin 9160 -> 0 bytes
 .../auth/src/main/webapp/img/valid-html5-blue.png  | Bin 3297 -> 0 bytes
 .../auth/src/main/webapp/img/w3cvalidhtml5.jpg     | Bin 1938 -> 0 bytes
 id/server/auth/src/main/webapp/index.html          |  92 ------
 id/server/auth/src/main/webapp/info_bk.html        | 100 -------
 id/server/auth/src/main/webapp/info_mandates.html  |  58 ----
 id/server/auth/src/main/webapp/info_stork.html     |  42 ---
 id/server/auth/src/main/webapp/moa_errorcodes.html | 333 ---------------------
 .../auth/src/main/webapp/template_handyBKU.html    |  38 ---
 .../auth/src/main/webapp/template_localBKU.html    |  30 --
 .../auth/src/main/webapp/template_onlineBKU.html   |  37 ---
 27 files changed, 11 insertions(+), 988 deletions(-)
 delete mode 100644 id/server/auth/src/main/webapp/Blockdiagramm.png
 delete mode 100644 id/server/auth/src/main/webapp/WCAG-Pruefprotokoll.pdf
 delete mode 100644 id/server/auth/src/main/webapp/anmeldeablauf.png
 delete mode 100644 id/server/auth/src/main/webapp/common/LogoBKA.png
 delete mode 100644 id/server/auth/src/main/webapp/common/LogoEGIZ.png
 delete mode 100644 id/server/auth/src/main/webapp/common/logo_digAT.png
 delete mode 100644 id/server/auth/src/main/webapp/common/main.css
 delete mode 100644 id/server/auth/src/main/webapp/img/bk_aktivieren.jpg
 delete mode 100644 id/server/auth/src/main/webapp/img/handy.gif
 delete mode 100644 id/server/auth/src/main/webapp/img/karte.gif
 delete mode 100644 id/server/auth/src/main/webapp/img/logo.jpg
 delete mode 100644 id/server/auth/src/main/webapp/img/mobile-bku.png
 delete mode 100644 id/server/auth/src/main/webapp/img/online-bku-deactivated.png
 delete mode 100644 id/server/auth/src/main/webapp/img/online-bku.png
 delete mode 100644 id/server/auth/src/main/webapp/img/stork-logo.png
 delete mode 100644 id/server/auth/src/main/webapp/img/valid-html5-blue.png
 delete mode 100644 id/server/auth/src/main/webapp/img/w3cvalidhtml5.jpg
 delete mode 100644 id/server/auth/src/main/webapp/index.html
 delete mode 100644 id/server/auth/src/main/webapp/info_bk.html
 delete mode 100644 id/server/auth/src/main/webapp/info_mandates.html
 delete mode 100644 id/server/auth/src/main/webapp/info_stork.html
 delete mode 100644 id/server/auth/src/main/webapp/moa_errorcodes.html
 delete mode 100644 id/server/auth/src/main/webapp/template_handyBKU.html
 delete mode 100644 id/server/auth/src/main/webapp/template_localBKU.html
 delete mode 100644 id/server/auth/src/main/webapp/template_onlineBKU.html

(limited to 'id/server/auth/src/main/webapp')

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
Binary files a/id/server/auth/src/main/webapp/Blockdiagramm.png and /dev/null differ
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
Binary files a/id/server/auth/src/main/webapp/WCAG-Pruefprotokoll.pdf and /dev/null differ
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
Binary files a/id/server/auth/src/main/webapp/anmeldeablauf.png and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/common/LogoBKA.png b/id/server/auth/src/main/webapp/common/LogoBKA.png
deleted file mode 100644
index 6a92647fd..000000000
Binary files a/id/server/auth/src/main/webapp/common/LogoBKA.png and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/common/LogoEGIZ.png b/id/server/auth/src/main/webapp/common/LogoEGIZ.png
deleted file mode 100644
index 39f05d131..000000000
Binary files a/id/server/auth/src/main/webapp/common/LogoEGIZ.png and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/common/logo_digAT.png b/id/server/auth/src/main/webapp/common/logo_digAT.png
deleted file mode 100644
index 4f36681e2..000000000
Binary files a/id/server/auth/src/main/webapp/common/logo_digAT.png and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/common/main.css b/id/server/auth/src/main/webapp/common/main.css
deleted file mode 100644
index 6bd964346..000000000
--- a/id/server/auth/src/main/webapp/common/main.css
+++ /dev/null
@@ -1,253 +0,0 @@
-html {
-	font-family: "Roboto", sans-serif;
-	color: #000;
-    font-weight:300;
-}
-
-.container {
-	margin: auto;
-	max-width: 1000px;
-	padding-left: 20px;
-	padding-right: 20px;
-}
-
-body {
-	margin: 0;
-	padding: 0;
-	letter-spacing: 0.05em;
-}
-
-h1
-{
-font-family: "Roboto", sans-serif;
-}
-
-#headline {
-	/*background: linear-gradient(center top , #FAFAFA, #F5F5F5) repeat scroll 0% 0% transparent;*/
-	background: linear-gradient(#FAFAFA, #F5F5F5);
-	border-bottom: 1px solid #EEE;
-}
-
-#headline br {
-	clear: both;
-}
-
-#headline h1 {
-		color: #404040;
-		padding-right: 1em;
-		padding-top: 0.3em;
-		margin-bottom: 0;
-		float: right;
-          font-size: 220%;
-  font-weight: 400;
-	}
-#headline img {
-        width: 300px;
-        padding-left: 0;
-        padding-top: 35px;
-        padding-bottom:20px;
-    }
-
-#description {
-	text-align: justify;
-}
-
-#maincontent {
-	height: 13em;
-}
-
-#demologin p {
-	padding-left: 10px;
-	padding-right: 10px;
-	text-align: justify;
-	font-size: 100%;
-	color: #000;
-    padding-top:20px;
-    
-}
-
-#demologin a{
-    
-}
-
-.button {
-	border-radius: 5px;
-	/*background-color: rgb(41,127,184); */
-	background-color: #E10319;
-	text-decoration: none;
-	text-transform: uppercase;
-	padding: 10px 80px 10px 80px;
-	letter-spacing: 1.5px;
-	text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.3);
-	color: WHITE;
-	box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-	margin-left: 10px;
-}
-
-.button:hover {
-	box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.8);
-	text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.9);
-}
-
-#singlelogout {
-	clear: both;
-	width: 100%;
-	box-sizing: border-box;
-
-}
-a{
-	text-decoration: none;
-    font-size:100%;
-    color: #666;
-}
-a:hover{
-	text-decoration: none;
-    font-size:100%;
-    color: #E10319;
-}
-
-/*****************************/
-@media ( max-width :599px) {
-	  #headline {
-        /*background: linear-gradient(center top , #FAFAFA, #F5F5F5) repeat scroll 0% 0% transparent;*/
-        background: linear-gradient(#FAFAFA, #F5F5F5);
-        border-bottom: 1px solid #EEE;
-    }   
-
-    #headline img {
-        width: 150px;
-        padding-left: 0;
-        padding-top: 0.5em;
-        padding-bottom:0.5em;
-    }
-    #headline br {
-        clear: both;
-    }
-    #headline h1 {font-family: "Roboto", sans-serif;
-        color: #404040;
-        padding: 0;
-        margin-bottom: 0;
-        margin-top: 0;
-        text-align: center;
-    }
-	nav {
-		display: block;
-		width: 100%;
-        text-align: center;
-		box-sizing: border-box;
-		color: WHITE;
-		margin: 0px 0px 0px 0px;
-		overflow: hidden;
-
-	}
-	nav ul {
-		margin: 0;
-		padding: 0;
-	}
-	nav ul li {
-		list-style-type: none;
-		padding-top: 2px;
-        padding-bottom: 2px;
-	}
-	nav>ul>li>a {
-		color: #666;
-		display: block;
-		text-decoration: none;
-	}
-	nav>ul>li:hover {
-		color: #404040;
-	}
-	nav>ul>li:hover>a {
-		color: #404040;
-	}
-	nav>ul>li:active>a {
-		color: #404040;
-	}
-	#demologin {
-		width: 100%;
-		box-sizing: border-box;
-		border: 1px solid;
-		border-radius: 1px;
-		border-color: #818286;
-		background: #F5F5F5;
-		height: 182px;
-		width: 242px;
-		margin-top: 18px;
-        padding-left:0;
-	}
-}
-/*****************************/
-@media ( min-width :600px) {
-    #headline {
-	/*background: linear-gradient(center top , #FAFAFA, #F5F5F5) repeat scroll 0% 0% transparent;*/
-	background: linear-gradient(#FAFAFA, #F5F5F5);
-	border-bottom: 1px solid #EEE;
-
-    }
-	#headline br {
-		clear: both;
-	}
-
-	#headline h1 {
-        color: #404040;
-		padding-right: 1em;
-		padding-top: 0.15em;
-		margin-bottom: 0;
-		float: right;
-	}
-    #headline img {
-        width: 300px;
-        padding-left: 0;
-        padding-top: 35px;
-        padding-bottom:20px;
-    }
-	nav {
-		display: block;
-		float: left;
-		width: 30%;
-		box-sizing: border-box;
-		background-color: #fff;
-		color: #888;
-		margin: 8px 0px 8px 0px;
-		overflow: hidden;
-	}
-	nav ul {
-		margin: 0;
-		padding: 0;
-	}
-	nav ul li {
-		list-style-type: none;
-		padding-top: 15px;
-	}
-	nav>ul>li>a {
-		color: #666;
-		display: block;
-		text-decoration: none;
-	}
-	nav>ul>li:hover {
-		color: #E10319;
-	}
-	nav>ul>li:hover>a {
-		color: #E10319;
-	}
-	nav>ul>li:active>a {
-		color: #E10319;
-	}
-	#demologin {
-		float: right;
-		width: 50%;
-		box-sizing: border-box;
-		border: 1px solid;
-		border-radius: 1px;
-		border-color: #818286;
-		background: #F5F5F5;
-		height: 282px;
-		width: 342px;
-		margin-right: 150px;
-		margin-top: 18px;
-        padding-left:0;
-	}
-    #demologin a:hover{
-        color:white;
-    }
-}
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/img/bk_aktivieren.jpg b/id/server/auth/src/main/webapp/img/bk_aktivieren.jpg
deleted file mode 100644
index a6436dc72..000000000
Binary files a/id/server/auth/src/main/webapp/img/bk_aktivieren.jpg and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/img/handy.gif b/id/server/auth/src/main/webapp/img/handy.gif
deleted file mode 100644
index 5aeb542db..000000000
Binary files a/id/server/auth/src/main/webapp/img/handy.gif and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/img/karte.gif b/id/server/auth/src/main/webapp/img/karte.gif
deleted file mode 100644
index ee9ab7cad..000000000
Binary files a/id/server/auth/src/main/webapp/img/karte.gif and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/img/logo.jpg b/id/server/auth/src/main/webapp/img/logo.jpg
deleted file mode 100644
index bafbccc84..000000000
Binary files a/id/server/auth/src/main/webapp/img/logo.jpg and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/img/mobile-bku.png b/id/server/auth/src/main/webapp/img/mobile-bku.png
deleted file mode 100644
index 697514273..000000000
Binary files a/id/server/auth/src/main/webapp/img/mobile-bku.png and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/img/online-bku-deactivated.png b/id/server/auth/src/main/webapp/img/online-bku-deactivated.png
deleted file mode 100644
index c2145f12a..000000000
Binary files a/id/server/auth/src/main/webapp/img/online-bku-deactivated.png and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/img/online-bku.png b/id/server/auth/src/main/webapp/img/online-bku.png
deleted file mode 100644
index d7d524999..000000000
Binary files a/id/server/auth/src/main/webapp/img/online-bku.png and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/img/stork-logo.png b/id/server/auth/src/main/webapp/img/stork-logo.png
deleted file mode 100644
index 70355a084..000000000
Binary files a/id/server/auth/src/main/webapp/img/stork-logo.png and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/img/valid-html5-blue.png b/id/server/auth/src/main/webapp/img/valid-html5-blue.png
deleted file mode 100644
index 91ebe3e87..000000000
Binary files a/id/server/auth/src/main/webapp/img/valid-html5-blue.png and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/img/w3cvalidhtml5.jpg b/id/server/auth/src/main/webapp/img/w3cvalidhtml5.jpg
deleted file mode 100644
index 2cd65412e..000000000
Binary files a/id/server/auth/src/main/webapp/img/w3cvalidhtml5.jpg and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
deleted file mode 100644
index d2e7d1e1b..000000000
--- a/id/server/auth/src/main/webapp/index.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf8" >
-        <title>MOA-ID 3.1.x</title>
-        <link rel="stylesheet" href="./common/main.css" type="text/css">
-        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-        <link href='https://fonts.googleapis.com/css?family=Roboto:300,400' rel='stylesheet' type='text/css'>
-        <script language="JavaScript" type="text/javascript">
-        
-            function PVP2LoginIframe(url) {
-                var el = document.getElementById("demologin");
-                var iframe = document.createElement("iframe");
-                iframe.setAttribute("src", url);
-                iframe.setAttribute("width", "240");
-                iframe.setAttribute("height", "180");
-                iframe.setAttribute("frameborder", "0");
-                iframe.setAttribute("scrolling", "no");
-                iframe.setAttribute("title", "Login");
-                //iframe.setAttribute("scrolling", "yes");
-            
-                iframe.setAttribute("name", "iframelogin");
-                iframe.setAttribute("id", "iframelogin");
-                
-                
-                iframe.setAttribute("onload","iframeLoaded()");
-                
-                var divdemologin = document.getElementById("demologin");
-                divdemologin.innerHTML="";
-
-                el.appendChild(iframe, el); 
-            }
-            
-            function iframeLoaded(){
-                //console.log(document.title); 
-                var ifr=document.getElementById("iframelogin");
-
-                //only works on same origin
-                
-                /*
-                var iframedoc=(ifr.contentWindow||ifr.contentDocument);
-                
-                //var iframedoc=ifr.contentDocument||iframe.contentWindow.document;
-                console.log(iframedoc.title);
-                if(iframedoc.title=="Demo Applikation"){
-                    ifr.setAttribute("width",480);
-                    ifr.setAttribute("height",240);
-                    
-                    var demologin=document.getElementById("demologin");
-                    demologin.style.marginRight="250px";
-                }
-                */
-            }
-
-        </script>
-    </head>
-    <body>
-  <div id="headline">
-      <div class="container">
-          <a href="http://www.digitales.oesterreich.gv.at/"><img src="./common/logo_digAT.png"/></a>
-          <a href="../index.html"><h1>MOA-ID-AUTH </h1></a>
-          <br/>
-      </div>
-  </div>
-        <div id="description" class="container">
-            <p>Bei MOA-ID-AUTH handelt es sich um ein Modul für die Identifizierung und Authentifizierung bei Onlineapplikationen unter Verwendung der Bürgerkarte.
-            Hier kann sowohl die Smartcard-Variante (e-Card) als auch die Handysignatur verwendet werden.
-            Die Konfiguration des Modules MOA-ID-Auth erfolgt mit Hilfe des Zusatzmodules MOA-ID-Configuration welches eine web-basierte Konfigurationsschnittstelle zur Verfügung stellt.</p>
-        </div>
-        <div id="maincontent" class="container">
-            <nav>
-                <ul>
-                    <!--li><a href="_index.html">Allgemein</a></li-->
-                    <!--li><a href="http://joinup.ec.europa.eu/site/moa-idspss/">Dokumentation</a></li-->
-                    <li><a href="http://joinup.ec.europa.eu/site/moa-idspss/moa-id-3.x/doc/handbook">Dokumentation</a></li>
-                    <!--Link zu den Demo-Clients-->
-                    <li><a href=#>Demo Clients</a></li>
-                    <!--Link zum Konfigtool-->
-                    <li><a href="https://localhost:8443/moa-id-configuration">Konfiguration GUI</a></li>
-                    <li><a href="./TransferSSOSession">Transfer Single Sign-On Session to Smartphone App</a></li>
-                	
-                </ul>
-            </nav>
-        <div id="demologin" class="container">
-            <br/>
-            <a href="#" id="loginButton" class="button" onClick="PVP2LoginIframe('https://menja.iaik.tugraz.at:8443/moa-id-oa/servlet/pvp2login')">Login</a>
-            <p id="loginText">Über den Login-Button können Sie sich anschließend bei Ihrer Online-Applikation mit der Bürgerkarte oder der Handysignatur anmelden. Dazu müssen Sie allerdings zuvor die Applikation gemäß <a href="http://joinup.ec.europa.eu/site/moa-idspss/moa-id-3.x/doc/handbook/application/application.html#DemoApp_pvp21">Beschreibung</a> konfigurieren.</p>
-        </div>
-        </div>
-
-    </body>
-</html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/info_bk.html b/id/server/auth/src/main/webapp/info_bk.html
deleted file mode 100644
index 59aea64cb..000000000
--- a/id/server/auth/src/main/webapp/info_bk.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!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/auth/src/main/webapp/info_mandates.html
deleted file mode 100644
index c46b91636..000000000
--- a/id/server/auth/src/main/webapp/info_mandates.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!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/auth/src/main/webapp/info_stork.html
deleted file mode 100644
index 2bdf62711..000000000
--- a/id/server/auth/src/main/webapp/info_stork.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!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/auth/src/main/webapp/moa_errorcodes.html
deleted file mode 100644
index a5702d60d..000000000
--- a/id/server/auth/src/main/webapp/moa_errorcodes.html
+++ /dev/null
@@ -1,333 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" >
-  <title>MOA-ID 2.0.x</title>
-  <link rel="stylesheet" href="./common/MOA.css" type="text/css">
-</head>
-<body>
-<h2>&Uuml;bersicht der m&ouml;glichen MOA-ID spezifischen Statuscodes
-</h2>
-<h3><a name="statuscodes_1xxxx" id="allgemeines_zugangspunkte7"></a>1.3.1 Statuscodes 1xxxx</h3>
-<p>Alle Statuscodes beginnent mit der Zahl eins beschreiben Fehler welche w&auml;hrend des Identifizerungs- und Authentifizierungsvorgangs aufgetreten sind.</p>
-<h4><a name="statuscodes_10xxx" id="allgemeines_zugangspunkte11"></a>1.3.1.1 Authentifizierung (10xxx)</h4>
-<table width="1237" border="1">
-  <tr>
-    <th width="214" scope="col">Statuscode</th>
-    <th width="1007" scope="col">Beschreibung</th>
-  </tr>
-  <tr>
-    <td><a name="1000" id="allgemeines_zugangspunkte"></a>1000</td>
-    <td>Anmeldung an der angeforderten Online-Applikation wird nicht unterst&uuml;tzt.</td>
-  </tr>
-  <tr>
-    <td><a name="1001" id="allgemeines_zugangspunkte2"></a>1001</td>
-    <td>Es ist bereits eine Anmeldung im Gange.</td>
-  </tr>
-  <tr>
-    <td><a name="1002" id="allgemeines_zugangspunkte3"></a>1002</td>
-    <td>Fehlerhafter Parameter</td>
-  </tr>
-  <tr>
-    <td><a name="1003" id="allgemeines_zugangspunkte4"></a>1003</td>
-    <td>Anfrage nur &uuml;ber https m&ouml;glich</td>
-  </tr>
-  <tr>
-    <td><a name="1004" id="allgemeines_zugangspunkte5"></a>1004</td>
-    <td>Zertifikat konnte nicht ausgelesen werden</td>
-  </tr>
-  <tr>
-    <td><a name="1005" id="allgemeines_zugangspunkte6"></a>1005</td>
-    <td>Die Authentifizierung wurde durch den Benutzer abgebrochen</td>
-  </tr>
-  <tr>
-    <td><a name="1006" id="allgemeines_zugangspunkte25"></a>1006</td>
-    <td>Vollmachtsmodus f&uuml;r nicht-&ouml;ffentlichen Bereich wird nicht unterst&uuml;tzt.</td>
-  </tr>
-  <tr>
-    <td><a name="1007" id="allgemeines_zugangspunkte26"></a>1007</td>
-    <td>Vollmachtsmodus f&uuml;r ausl&auml;ndische Personen wird nicht unterst&uuml;tzt.</td>
-  </tr>
-</table>
-<h4><a name="statuscodes_11xxx" id="allgemeines_zugangspunkte12"></a>1.3.1.2 Validierung (11xxx)</h4>
-<table width="1237" border="1">
-  <tr>
-    <th width="214" scope="col">Statuscode</th>
-    <th width="1007" scope="col">Beschreibung</th>
-  </tr>
-  <tr>
-    <td><a name="1100" id="allgemeines_zugangspunkte27"></a>1100</td>
-    <td>Ung&uuml;ltige MOA SessionID</td>
-  </tr>
-  <tr>
-    <td><a name="1101" id="allgemeines_zugangspunkte28"></a>1101</td>
-    <td>Fehler beim Parsen eines Parameters</td>
-  </tr>
-  <tr>
-    <td><a name="1102" id="allgemeines_zugangspunkte29"></a>1102</td>
-    <td>Fehler beim Validieren der Personenbindung</td>
-  </tr>
-  <tr>
-    <td><a name="1103" id="allgemeines_zugangspunkte30"></a>1103</td>
-    <td>Signatur ung&uuml;ltig</td>
-  </tr>
-  <tr>
-    <td><a name="1104" id="allgemeines_zugangspunkte31"></a>1104</td>
-    <td>Zertifikat der Personenbindung ung&uuml;ltig</td>
-  </tr>
-  <tr>
-    <td><a name="1105" id="allgemeines_zugangspunkte32"></a>1105</td>
-    <td>Zertifikat der Signature ung&uuml;ltig</td>
-  </tr>
-  <tr>
-    <td><a name="1106" id="allgemeines_zugangspunkte33"></a>1106</td>
-    <td>Fehler beim Validieren des AuthBlocks</td>
-  </tr>
-  <tr>
-    <td><a name="1107" id="allgemeines_zugangspunkte34"></a>1107</td>
-    <td>Fehler beim Validieren eines  SSL-Server-Endzertifikates</td>
-  </tr>
-  <tr>
-    <td><a name="1108" id="allgemeines_zugangspunkte35"></a>1108</td>
-    <td>Fehler beim Validieren der Online Vollmacht.</td>
-  </tr>
-  <tr>
-    <td><a name="1109" id="allgemeines_zugangspunkte36"></a>1109</td>
-    <td>Fehler beim validieren der SZR-Gateway Response</td>
-  </tr>
-</table>
-<h4><a name="statuscodes_12xxx" id="allgemeines_zugangspunkte13"></a>1.3.1.3 STORK (12xxx)</h4>
-<table width="1237" border="1">
-  <tr>
-    <th width="214" scope="col">Statuscode</th>
-    <th width="1007" scope="col">Beschreibung</th>
-  </tr>
-  <tr>
-    <td><a name="1200" id="allgemeines_zugangspunkte37"></a>1200</td>
-    <td>Fehler beim erstellen des STORK Authentifizierungsrequests</td>
-  </tr>
-  <tr>
-    <td><a name="1201" id="allgemeines_zugangspunkte38"></a>1201</td>
-    <td>Fehler beim validieren der STORK Authentifizierungsresponse</td>
-  </tr>
-  <tr>
-    <td><a name="1202" id="allgemeines_zugangspunkte39"></a>1202</td>
-    <td>STORK Authentifizierungsresponse antwortet mit einem Fehler</td>
-  </tr>
-  <tr>
-    <td><a name="1203" id="allgemeines_zugangspunkte40"></a>1203</td>
-    <td>Fehler beim Sammeln von STORK Attributen</td>
-  </tr>
-    <tr>
-        <td><a name="1204" id="allgemeines_zugangspunkte70"></a>1203</td>
-        <td>Fehler bei der Datenkonversion - eingegebenes Datum fehlerhaft</td>
-    </tr>
-</table>
-<h3><a name="statuscodes_4xxxx" id="allgemeines_zugangspunkte8"></a>1.3.2 Statuscodes 4xxxx</h3>
-<p>Alles Statuscodes beginnent mit der Zahl vier beschreiben Fehler die w&auml;hrend der Kommunikation mit externen Services aufgetreten sind.</p>
-<h4><a name="statuscodes_40xxx" id="allgemeines_zugangspunkte19"></a>1.3.2.1 BKU (40xxxx)</h4>
-<p>Tritt w&auml;hrend des Anmeldevorgangs in der B&uuml;rgerkartenumgebung ein Fehler auf so wird der entsprechende Fehlercode an den Service Provider weitergereicht. Der der durch das Modul MOA-ID-Auth weitergereichte Statuscode f&uuml;r B&uuml;rgerkartenumgebungsfehler wei&szlig;t das folgende zweiteilige Format auf. Der erste Teil, bestehend aus zwei Dezimalstellen, kennzeichnet den Fehler als Fehler als B&uuml;rgerkartenumgebungsfehler. Der zweite Teil, bestehend aus vier Dezimalstellen bezeichnet den eindeutigen Identifikator des Fehers aus der B&uuml;rgerkartenumgebung (<a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20140114/">siehe SecurityLayer Spezifikation</a>). </p>
-<p align="right"><em><a name="40" id="allgemeines_zugangspunkte41"></a>{40}{xxxxx}</em></p>
-<blockquote>
-  <p>{40}  ... MOA-ID Statuscode f&uuml;r Fehler aus der B&uuml;rgerkartenumgebung</p>
-  <p>{xxxx}  .... Fehlercode der B&uuml;rgerkartenumgebung.</p>
-</blockquote>
-<h4><a name="statuscodes_41xxx" id="allgemeines_zugangspunkte20"></a>1.3.2.2 MIS (41xxxx)</h4>
-<p>Tritt w&auml;hrend der Kommunikation mit dem Online-Vollmachten Service oder der Vollmachtsauswahl ein Fehler auf so wird der entsprechende Fehlercode an den Service Provider weitergereicht. Der der durch das Modul MOA-ID-Auth weitergereichte Statuscode f&uuml;r Fehler aus dem Online-Vollmachten Service wei&szlig;t das folgende zweiteilige Format auf. Der erste Teil, bestehend aus drei Dezimalstellen, kennzeichnet den Fehler als Fehler als Online-Vollmachten Service Fehler. Der zweite Teil, bestehend aus drei Dezimalstellen bezeichnet den eindeutigen Identifikator des Fehlers aus dem Online-Vollmachten Service (<a href="http://reference.e-government.gv.at/AG-II-Architektur-mis-1-1-0.2890.0.html">siehe Online-Vollmachten Spezifikation</a>). </p>
-<p><em><a name="41" id="allgemeines_zugangspunkte42"></a>{411}{xxxx}</em></p>
-<blockquote>
-  <p>{411}  ... MOA-ID Statuscode f&uuml;r Fehler aus  dem Online-Vollmachten Service.</p>
-  <p>{xxx}  .... Fehlercode des Online-Vollmachten Service.</p>
-</blockquote>
-<p>Zus&auml;tzlich zu den gemappeden Fehlern aus dem Online-Vollmachen Service werden zus&auml;tzliche weitere Fehlercodes definiert.</p>
-<table width="1237" border="1">
-  <tr>
-    <th width="214" scope="col">Statuscode</th>
-    <th width="1007" scope="col">Beschreibung</th>
-  </tr>
-  <tr>
-    <td>41000</td>
-    <td>Das Online-Vollmachten Service ist nicht erreichbar</td>
-  </tr>
-  <tr>
-    <td>41001</td>
-    <td>Allgemeiner Fehler bei der Kommunikation mit dem Online-Vollmachten Service</td>
-  </tr>
-</table>
-<h4><a name="statuscodes_42xxx" id="allgemeines_zugangspunkte21"></a>1.3.2.3 SZR-Gateway (42xxx)</h4>
-<table width="1237" border="1">
-  <tr>
-    <th width="214" scope="col">Statuscode</th>
-    <th width="1007" scope="col">Beschreibung</th>
-  </tr>
-  <tr>
-    <td><a name="4200" id="allgemeines_zugangspunkte43"></a>4200</td>
-    <td>Das SZR-Gateway Service ist nicht erreichbar</td>
-  </tr>
-  <tr>
-    <td><a name="4201" id="allgemeines_zugangspunkte44"></a>4201</td>
-    <td>Die Antragung in das SZR ist fehlgeschlagen</td>
-  </tr>
-</table>
-<h4><a name="statuscodes_43xxx" id="allgemeines_zugangspunkte22"></a>1.3.2.4 MOA SP/SS(43xxx)</h4>
-<table width="1237" border="1">
-  <tr>
-    <th width="214" scope="col">Statuscode</th>
-    <th width="1007" scope="col">Beschreibung</th>
-  </tr>
-  <tr>
-    <td><a name="4300" id="allgemeines_zugangspunkte45"></a>4300</td>
-    <td>Fehler beim Aufruf von MOA SP/SS</td>
-  </tr>
-</table>
-<h4><a name="statuscodes_44xxx" id="allgemeines_zugangspunkte23"></a>1.3.2.5 Interfederation (44xxx)</h4>
-<table width="1237" border="1">
-  <tr>
-    <th width="214" scope="col">Statuscode</th>
-    <th width="1007" scope="col">Beschreibung</th>
-  </tr>
-  <tr>
-    <td><a name="4400" id="allgemeines_zugangspunkte46"></a>4400</td>
-    <td>Fehler beim generieren der Anmeldedaten</td>
-  </tr>
-</table>
-<h3><a name="statuscodes_6xxxx" id="allgemeines_zugangspunkte9"></a>1.3.3 Statuscodes 6xxxx</h3>
-<p>Alles Statuscodes beginnent mit der Zahl sechs beschreiben protokolspezifische Fehler die nicht durch das jeweilige Authentifizierungsprotokoll abgebildet werden.</p>
-<h4><a name="statuscodes_61xxx" id="allgemeines_zugangspunkte24"></a>1.3.3.1 Allgemein (61xxx)</h4>
-<table width="1237" border="1">
-  <tr>
-    <th width="214" scope="col">Statuscode</th>
-    <th width="1007" scope="col">Beschreibung</th>
-  </tr>
-  <tr>
-    <td><a name="6000" id="allgemeines_zugangspunkte47"></a>6000</td>
-    <td>Das Authentifizierungsprotokoll wurde nicht erkannt oder wird nicht unterst&uuml;zt</td>
-  </tr>
-  <tr>
-    <td><a name="6001" id="allgemeines_zugangspunkte48"></a>6001</td>
-    <td>Der STORK Request wurde nicht erkannt oder wird nicht unterst&uuml;zt</td>
-  </tr>
-</table>
-<h4><a name="statuscodes_61xxx" id="allgemeines_zugangspunkte16"></a>1.3.3.2 PVP 2.1 (61xxx)</h4>
-<table width="1237" border="1">
-  <tr>
-    <th width="214" scope="col">Statuscode</th>
-    <th width="1007" scope="col">Beschreibung</th>
-  </tr>
-  <tr>
-    <td><a name="6100" id="allgemeines_zugangspunkte49"></a>6100</td>
-    <td>Fehler beim erstellen der PVP 2.1 Response</td>
-  </tr>
-  <tr>
-    <td><a name="6101" id="allgemeines_zugangspunkte50"></a>6101</td>
-    <td>Fehler beim verschl&uuml;sseln der PVP 2.1 Assertion</td>
-  </tr>
-  <tr>
-    <td><a name="6102" id="allgemeines_zugangspunkte51"></a>6102</td>
-    <td>Authentifizierung entspricht nicht dem geforderten QAA Level</td>
-  </tr>
-  <tr>
-    <td><a name="6103" id="allgemeines_zugangspunkte52"></a>6103</td>
-    <td>F&uuml;r die im Requst angegebene EnityID konnten keine g&uuml;ltigen Metadaten gefunden werden</td>
-  </tr>
-  <tr>
-    <td><a name="6104" id="allgemeines_zugangspunkte53"></a>6104</td>
-    <td>Die Signatur des Requests konnte nicht g&uuml;ltig validiert werden. Entweder ist die Signatur ung&uuml;ltig oder das Signaturzertifikat stimmt nicht mit dem in den Metadaten hinterlegten Zertifikat &uuml;berein.</td>
-  </tr>
-  <tr>
-    <td><a name="6105" id="allgemeines_zugangspunkte54"></a>6105</td>
-    <td>Der Request konnte nicht g&uuml;ltig validiert werden.</td>
-  </tr>
-</table>
-<h4><a name="statuscodes_62xxx" id="allgemeines_zugangspunkte17"></a>1.3.3.3 OpenID Connect (62xxx)</h4>
-<table width="1237" border="1">
-  <tr>
-    <th width="214" scope="col">Statuscode</th>
-    <th width="1007" scope="col">Beschreibung</th>
-  </tr>
-  <tr>
-    <td><a name="6200" id="allgemeines_zugangspunkte55"></a>6200</td>
-    <td>Fehlerhafte redirect url</td>
-  </tr>
-</table>
-<h4><a name="statuscodes_63xxx" id="allgemeines_zugangspunkte18"></a>1.3.3.4 SAML 1(63xxx)</h4>
-<table width="1237" border="1">
-  <tr>
-    <th width="214" scope="col">Statuscode</th>
-    <th width="1007" scope="col">Beschreibung</th>
-  </tr>
-  <tr>
-    <td><a name="6300" id="allgemeines_zugangspunkte56"></a>6300</td>
-    <td>Fehlerhaftes SAML Artifact Format</td>
-  </tr>
-</table>
-<h3><a name="statuscodes_9xxxx" id="allgemeines_zugangspunkte10"></a>1.3.4 Statuscodes 9xxxx</h3>
-<p>Alles Statuscodes beginnent mit der Zahl neun beschreiben interne Serverfehler.</p>
-<h4><a name="statuscodes_90xxx" id="allgemeines_zugangspunkte14"></a>1.3.4.1 Konfigurationsfehler (90xxx)</h4>
-<table width="1237" border="1">
-  <tr>
-    <th width="214" scope="col">Statuscode</th>
-    <th width="1007" scope="col">Beschreibung</th>
-  </tr>
-  <tr>
-    <td><a name="9000" id="allgemeines_zugangspunkte57"></a>9000</td>
-    <td>Fehlerhaftes BKU-Selection Template</td>
-  </tr>
-  <tr>
-    <td><a name="9001" id="allgemeines_zugangspunkte58"></a>9001</td>
-    <td>Fehlerhaftes Send-Assertion Template</td>
-  </tr>
-  <tr>
-    <td><a name="9002" id="allgemeines_zugangspunkte59"></a>9002</td>
-    <td>Fehlerhaftes SecurityLayer Template.</td>
-  </tr>
-  <tr>
-    <td><a name="9003" id="allgemeines_zugangspunkte60"></a>9003</td>
-    <td>Fehlerhafte STORK VIDP Konfiguration</td>
-  </tr>
-  <tr>
-    <td><a name="9004" id="allgemeines_zugangspunkte61"></a>9004</td>
-    <td>Fehlerhafte STORK Konfiguration</td>
-  </tr>
-  <tr>
-    <td><a name="9005" id="allgemeines_zugangspunkte62"></a>9005</td>
-    <td>Fehlerhafte OpenID Connect Konfiguration</td>
-  </tr>
-  <tr>
-    <td><a name="9006" id="allgemeines_zugangspunkte63"></a>9006</td>
-    <td>Es sind keine Vollmachtsprofile konfiguriert.</td>
-  </tr>
-  <tr>
-    <td><a name="9007" id="allgemeines_zugangspunkte64"></a>9007</td>
-    <td>Der SZR-Gateway Client konnte nicht initialisiert werden.</td>
-  </tr>
-</table>
-<h4><a name="statuscodes_91xxx" id="allgemeines_zugangspunkte15"></a>1.3.4.2 Interne Fehler (91xxx)</h4>
-<table width="1237" border="1">
-  <tr>
-    <th width="214" scope="col">Statuscode</th>
-    <th width="1007" scope="col">Beschreibung</th>
-  </tr>
-  <tr>
-    <td><a name="9100" id="allgemeines_zugangspunkte65"></a>9100</td>
-    <td>Fehler beim einlesen einer externen Resource.</td>
-  </tr>
-  <tr>
-    <td><a name="9101" id="allgemeines_zugangspunkte66"></a>9101</td>
-    <td>Datenbankzugriffsfehler</td>
-  </tr>
-  <tr>
-    <td><a name="9102" id="allgemeines_zugangspunkte67"></a>9102</td>
-    <td>Fehler beim Erzeugen einer internen Datenstruktur</td>
-  </tr>
-  <tr>
-    <td><a name="9103" id="allgemeines_zugangspunkte68"></a>9103</td>
-    <td>Fehler bei der Verarbeitung eines Templates</td>
-  </tr>
-  <tr>
-    <td><a name="9199" id="allgemeines_zugangspunkte69"></a>9199</td>
-    <td>Allgemeiner interner Fehler</td>
-  </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/template_handyBKU.html b/id/server/auth/src/main/webapp/template_handyBKU.html
deleted file mode 100644
index 6c3dc563c..000000000
--- a/id/server/auth/src/main/webapp/template_handyBKU.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!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/auth/src/main/webapp/template_localBKU.html
deleted file mode 100644
index 0ec8e52c2..000000000
--- a/id/server/auth/src/main/webapp/template_localBKU.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!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/auth/src/main/webapp/template_onlineBKU.html
deleted file mode 100644
index 39d7bb8e1..000000000
--- a/id/server/auth/src/main/webapp/template_onlineBKU.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!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>
-- 
cgit v1.2.3


From f9020f47b60bc1cff6c671461924ba606ce87853 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 09:15:03 +0100
Subject: fix some problems in ELGA-mandate module

---
 id/server/auth/src/main/webapp/index.html | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 id/server/auth/src/main/webapp/index.html

(limited to 'id/server/auth/src/main/webapp')

diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.3


From 04a8a85a7092f460e30553394ae415ad9bed18ed Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 11:35:56 +0100
Subject: move basic applicationContext.xml to SpringInitialization modul

---
 .../src/main/webapp/WEB-INF/applicationContext.xml | 31 ----------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml

(limited to 'id/server/auth/src/main/webapp')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
deleted file mode 100644
index f3b133585..000000000
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans 
-		http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context 
-		http://www.springframework.org/schema/context/spring-context.xsd
-		http://www.springframework.org/schema/mvc
-		http://www.springframework.org/schema/mvc/spring-mvc.xsd
-		http://www.springframework.org/schema/tx
-		http://www.springframework.org/schema/tx/spring-tx.xsd
-	"
->
-
-	<context:annotation-config />
-	<mvc:annotation-driven />
-
-	<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>
-- 
cgit v1.2.3


From d60ceb70869148deb9f85751c63460fa245a8c7f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 12:14:18 +0100
Subject: split moa-id-auth in a final- and an edjucation- version

---
 .../auth/src/main/webapp/META-INF/MANIFEST.MF      |  2 -
 id/server/auth/src/main/webapp/WEB-INF/web.xml     | 47 ----------------------
 id/server/auth/src/main/webapp/index.html          |  0
 3 files changed, 49 deletions(-)
 delete mode 100644 id/server/auth/src/main/webapp/META-INF/MANIFEST.MF
 delete mode 100644 id/server/auth/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 id/server/auth/src/main/webapp/index.html

(limited to 'id/server/auth/src/main/webapp')

diff --git a/id/server/auth/src/main/webapp/META-INF/MANIFEST.MF b/id/server/auth/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 58630c02e..000000000
--- a/id/server/auth/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 9ad651d42..000000000
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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://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>
-
-	<filter>
-		<filter-name>characterEncodingFilter</filter-name>
-		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
-		<init-param>
-			<param-name>encoding</param-name>
-			<param-value>UTF-8</param-value>
-		</init-param>
-		<init-param>
-			<param-name>forceEncoding</param-name>
-			<param-value>true</param-value>
-		</init-param>
-	</filter>
-	<filter-mapping>
-		<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>
-	
-	<error-page>
-		<error-code>500</error-code>
-		<location>/errorpage.jsp</location>
-	</error-page>
-	
-	<login-config>
-		<auth-method>BASIC</auth-method>
-		<realm-name>UserDatabase</realm-name>
-	</login-config>
-	<security-role>
-		<description>The role that is required to log in to the moa Application</description>
-		<role-name>moa-admin</role-name>
-	</security-role>
-
-</web-app>
diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
deleted file mode 100644
index e69de29bb..000000000
-- 
cgit v1.2.3