From 33a37cce841e6c48ab044cd153aa7ed7cfffc6cc Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Wed, 14 Jan 2015 12:41:54 +0100
Subject: Apply some minor fixes.

- Add some FIXMEs.
- Fix moa-id-auth web.xml and switch to Servlet 3.0.
- Fix moa-id-auth logging (replace commons-logging with commons-logging-slf4j bridge, use log4j native binding).
- Adjust logging of periodical tasks (no more logging at info level).
---
 id/server/auth/pom.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index dd75ee6aa..7db6ce648 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -112,11 +112,25 @@
 					<artifactId>axis-wsdl4j</artifactId>
 					<groupId>axis</groupId>
 				</exclusion>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>MOA.id.server</groupId>
 			<artifactId>moa-id-lib</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>ch.qos.logback</groupId>
+					<artifactId>logback-classic</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
         <dependency>
             <groupId>eu.stork</groupId>
@@ -173,6 +187,13 @@
 			<!-- should be provided by the container or jre -->
 			<scope>provided</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>1.7.10</version>
+		</dependency>
+
 	</dependencies>
 
 </project>
-- 
cgit v1.2.3


From 92717efaa56e3d0f7c271b91483507cf981b417b Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 16 Jan 2015 10:19:44 +0100
Subject: Add minor fixes and updates.

- Fix moa-id-auth web.xml and upgrade to servlet 3.0.
- Reformat loginFormFull.html in order to enhance readability.
- Add some TODOs and FIXMEs.
- Adding some comments to DispatcherServlet in order to ease understanding the process.
---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 71 ++++++++++++++++----------
 1 file changed, 44 insertions(+), 27 deletions(-)

(limited to 'id/server/auth')

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 42085b01e..fb3888a3e 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
-<web-app>
+<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">
 	<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>
+
+	<!-- 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>
+
 <!-- 	<servlet>
 		<servlet-name>SelectBKU</servlet-name>
 		<display-name>SelectBKU</display-name>
@@ -10,63 +27,63 @@
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.SelectBKUServlet</servlet-class>
 	</servlet> -->
 	<servlet>
-		<servlet-name>GenerateIframeTemplate</servlet-name>
-		<display-name>GenerateIframeTemplate</display-name>
 		<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>
-		<servlet-name>RedirectServlet</servlet-name>
 		<display-name>RedirectServlet</display-name>
+		<servlet-name>RedirectServlet</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.RedirectServlet</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>MonitoringServlet</servlet-name>
 		<display-name>MonitoringServlet</display-name>
+		<servlet-name>MonitoringServlet</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.MonitoringServlet</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>SSOSendAssertionServlet</servlet-name>
 		<display-name>SSOSendAssertionServlet</display-name>
+		<servlet-name>SSOSendAssertionServlet</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.SSOSendAssertionServlet</servlet-class>
 	</servlet>	
 	<servlet>
-		<servlet-name>LogOut</servlet-name>
-		<display-name>LogOut</display-name>
 		<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>
-		<servlet-name>IDPSLO</servlet-name>
-		<display-name>IDP-SLO</display-name>
 		<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>
-		<servlet-name>VerifyIdentityLink</servlet-name>
-		<display-name>VerifyIdentityLink</display-name>
 		<description>Verify identity link coming from security layer</description>
+		<display-name>VerifyIdentityLink</display-name>
+		<servlet-name>VerifyIdentityLink</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>VerifyCertificate</servlet-name>
-		<display-name>VerifyCertificate</display-name>
 		<description>Verify the certificate coming from security layer</description>
+		<display-name>VerifyCertificate</display-name>
+		<servlet-name>VerifyCertificate</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>GetMISSessionID</servlet-name>
-		<display-name>GetMISSessionID</display-name>
 		<description>Get the MIS session ID coming from security layer</description>
+		<display-name>GetMISSessionID</display-name>
+		<servlet-name>GetMISSessionID</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GetMISSessionIDServlet</servlet-class>
 	</servlet>
 
 	<servlet>
-		<servlet-name>GetForeignID</servlet-name>
-		<display-name>GetForeignID</display-name>
 		<description>Gets the foreign eID from security layer</description>
+		<display-name>GetForeignID</display-name>
+		<servlet-name>GetForeignID</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GetForeignIDServlet</servlet-class>
 	</servlet>
 <!-- 	<servlet>
@@ -76,9 +93,9 @@
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ProcessValidatorInputServlet</servlet-class>
 	</servlet> -->
 	<servlet>
-		<servlet-name>VerifyAuthBlock</servlet-name>
-		<display-name>VerifyAuthBlock</display-name>
 		<description>Verify AUTH block coming from security layer</description>
+		<display-name>VerifyAuthBlock</display-name>
+		<servlet-name>VerifyAuthBlock</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet</servlet-class>
 	</servlet>
 <!-- 	<servlet>
@@ -89,8 +106,8 @@
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ConfigurationServlet</servlet-class>
 	</servlet> -->
 	<servlet>
-		<servlet-name>AxisServlet</servlet-name>
 		<display-name>Apache-Axis Servlet</display-name>
+		<servlet-name>AxisServlet</servlet-name>
 		<servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
 	</servlet>
 
@@ -100,18 +117,18 @@
 		<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
 	</servlet> -->
 	<servlet>
-		<servlet-name>PEPSConnectorServlet</servlet-name>
-		<display-name>PEPSConnectorServlet</display-name>
 		<description>Servlet receiving STORK SAML Response Messages from
 			different C-PEPS</description>
+		<display-name>PEPSConnectorServlet</display-name>
+		<servlet-name>PEPSConnectorServlet</servlet-name>
 		<servlet-class>
 			at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
-		<display-name>PEPSConnectorWithLocalSigningServlet</display-name>
 		<description>Servlet receiving STORK SAML Response Messages from
 			different C-PEPS</description>
+		<display-name>PEPSConnectorWithLocalSigningServlet</display-name>
+		<servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
 		<servlet-class>
 			at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet</servlet-class>
 	</servlet>
@@ -124,8 +141,8 @@
 		<load-on-startup>1</load-on-startup>
 	</servlet>-->
 	<servlet>
-		<servlet-name>DispatcherServlet</servlet-name>
 		<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>
-- 
cgit v1.2.3


From 1e0d9d236dec23ed079f043bd87e8b2cd0f87907 Mon Sep 17 00:00:00 2001
From: Christian Maierhofer <cmaierhofer@iaik.tugraz.at>
Date: Fri, 16 Jan 2015 10:29:11 +0100
Subject: modified moa-id auth start page

---
 id/server/auth/src/main/webapp/common/MOA.css      | 617 ---------------------
 .../auth/src/main/webapp/common/logo_digAT.png     | Bin 0 -> 22964 bytes
 id/server/auth/src/main/webapp/common/main.css     | 253 +++++++++
 id/server/auth/src/main/webapp/index.html          | 193 +++----
 4 files changed, 344 insertions(+), 719 deletions(-)
 delete mode 100644 id/server/auth/src/main/webapp/common/MOA.css
 create mode 100644 id/server/auth/src/main/webapp/common/logo_digAT.png
 create mode 100644 id/server/auth/src/main/webapp/common/main.css

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/common/MOA.css b/id/server/auth/src/main/webapp/common/MOA.css
deleted file mode 100644
index b7a2b9280..000000000
--- a/id/server/auth/src/main/webapp/common/MOA.css
+++ /dev/null
@@ -1,617 +0,0 @@
-body
-{ 
-  font-family: "Times New Roman", Times, serif;
-  font-size: medium;
-  font-weight: normal;
-  margin-left: 2.5em;
-  margin-right: 2.5em;
-  background-color: white;
-  text: #000000;
-  link: #990000;
-  vlink: #666666; 
-  alink: #cc9966;
-}
-
-
-
-p
-{ 
-  margin-top: 0pt;
-  margin-bottom: 0.5em;
-  text-align: justify
-}
-
-pre 
-{ 
-  font-family: "Courier New", monospace;
-  font-size: 90%;
-  background-color: #cccccc;
-  color: #000000;
-  margin-left:1.5%;
-  margin-right:1.5%;
-  margin-top: 1em;
-  margin-bottom: 1em;
-  border: #008000 none;
-}
-
-hr 
-{
-  color: #000080;
-  background-color: #000080;
-  margin-top: 0.5em;
-  margin-bottom: 0.5em;
-}
-
-table.fixedWidth
-{
-  width: 97%;
-  margin-left:1.5%;
-  margin-right:1.5%;
-  margin-top: 1em;
-  margin-bottom: 1em;
-}
-
-
-table.varWidth
-{
-  margin-left:1.5%;
-  margin-top: 1em;
-  margin-bottom: 1em;
-}
-
-th
-{
-  text-align: left;
-}
-
-h1
-{ 
-  color: #000000; 
-  text-align: left;
-  font-size: 167%;
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: normal;
-  background-color:#999;
-}
-
-h2
-{ 
-  color: #000000;
-  font-size: 150%;
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: normal;
-  background-color:#999;
-}
-
-h3
-{ 
-  color: #000000;
-  font-size: 133%; 
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: normal;
-  background-color:#999;
-}
-
-h4
-{
-  color: #000000;
-  font-size: 116%;
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: normal;
-  background-color:#999;
-}
-
-h5
-{ 
-  color: #000000;
-  font-size: 100%;
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: normal;
-  background-color:#999;
-}
-
-h6
-{ 
-  color: #000000;
-  font-size: 83%;
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: normal;
-  background-color:#999;
-}
-
-code
-{
-  font-family: "Courier New", Courier, monospace;
-  font-size: 90%;
-  color: #000000
-}
-
-dd
-{
-  margin-top: 0.8em;
-  margin-bottom: 0.8em;
-  text-align: justify
-
-}
-
-dt 
-{
-  margin-top: 0.8em;
-  font-family: Arial, Helvetica, sans-serif;
-  color: #000080
-}
-
-ol
-{
-  margin-top: 0.5em;
-  margin-bottom: 0.5em
-}
-
-ol.alpha
-{
-  list-style-type: lower-alpha
-}
-
-li
-{
-  margin-top: 0.25em;
-  margin-bottom: 0.25em;
-  text-align: justify
-}
-
-a:hover
-{
-  color: #990000
-}
-
-
-.title
-{
-  text-align: left;
-  font-size: 200%;
-  color: #000000;
-  font-family: Arial, Helvetica, sans-serif;
-  margin-top: 0.4em;
-  margin-bottom: 0.4em;
-  background-color:#999;
-}
-
-.subtitle 
-{  
-  text-align: left;
-  font-size: 133%;
-  color: #000000;
-  font-family: Arial, Helvetica, sans-serif;
-  margin-top: 0.4em;
-  margin-bottom: 0.4em
-}
-
-.glossaryTerm 
-{  
-  font-style: italic;
-  color: #006699
-}
-
-.example
-{ 
-  font-family: "Courier New", monospace;
-  background-color: #CCFFFF;
-  color: #000000;
-  margin: 0pt 0pt;
-  border: #008000 none
-}
-
-.schema
-{ 
-  font-family: "Courier New", monospace;
-  background-color: #FFFFCC;
-  color: #000000;
-  margin: 0pt 0pt;
-  border: #008000 none
-}
-
-.documentinfo
-{
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 100%;
-}
-
-.ol-contents
-{
-  font-size: 100%;
-  margin-top: 0.0em;
-  margin-bottom: 0.0em;
-}
-
-.li-contents
-{
-  font-size: 100%;
-  margin-top: 0.0em;
-  margin-bottom: 0.0em;
-}
-
-.logoTitle 
-{ 
-  text-align: center;
-  font-size: 200%;
-  color: #000080;
-  font-family: Arial, Helvetica, sans-serif;
-}
-
-.logoTable 
-{ 
-  margin-bottom: 0px;
-  margin-left: 0px
-}
-
-.superscript
-{ 
-  vertical-align: super;
-  font-size: 66%;
-}
-
-.term
-{ 
-  font-style: italic; 
-}
-
-.comment
-{
-  color: #000000;
-  background: #ffff00;
-  font-style: italic
-}
-
-.addedErrata12
-{  
-  color: #FF0000; 
-  background-color: #FFEEEE;
-  text-decoration: underline
-}
-
-.deletedErrata12
-{
-  color: #999999;
-  background-color: #EEEEEE;
-  text-decoration: line-through
-}
-
-.added12
-{  
-  color: #FF0000; 
-  text-decoration: underline
-; background-color: #F8F0FF
-}
-
-.deleted12
-{
-  color: #999999;
-  text-decoration: line-through
-; background-color: #f8f0ff
-}
-
-.rfc2119Keyword 
-{ 
-  font-variant: small-caps;
-  font-style: normal;
-}
-
-.remark {  font-style: italic}
-
-li.faq
-{
-  margin-top: 1.5em;
-  margin-bottom: 1.5em;
-}
-
-.faq-question
-{ 
-  color: #000080;
-  font-size: 100%;
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: normal;
-  margin-bottom: 0.4em;
-}
-
-
-/*body
-{ 
-  font-family: "Times New Roman", Times, serif;
-  font-size: medium;
-  font-weight: normal;
-  margin-left: 2.5em;
-  margin-right: 2.5em;
-}
-
-p
-{ 
-  margin-top: 0pt;
-  margin-bottom: 0.5em;
-  text-align: justify
-}
-
-pre 
-{ 
-  font-family: "Courier New", monospace;
-  font-size: 90%;
-  background-color: #cccccc;
-  color: #000000;
-  margin-left:1.5%;
-  margin-right:1.5%;
-  margin-top: 1em;
-  margin-bottom: 1em;
-  border: #008000 none;
-}
-
-hr 
-{
-  color: #000080;
-  background-color: #000080;
-  margin-top: 0.5em;
-  margin-bottom: 0.5em;
-}
-
-table.fixedWidth
-{
-  width: 97%;
-  margin-left:1.5%;
-  margin-right:1.5%;
-  margin-top: 1em;
-  margin-bottom: 1em;
-}
-
-
-table.varWidth
-{
-  margin-left:1.5%;
-  margin-top: 1em;
-  margin-bottom: 1em;
-}
-
-th
-{
-  text-align: left;
-}
-
-h1
-{ 
-  color: #000080; 
-  text-align: left;
-  font-size: 167%;
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: normal
-}
-
-h2
-{ 
-  color: #000080;
-  font-size: 150%;
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: normal
-}
-
-h3
-{ 
-  color: #000080;
-  font-size: 133%; 
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: normal
-}
-
-h4
-{
-  color: #000080;
-  font-size: 116%;
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: normal
-}
-
-h5
-{ 
-  color: #000080;
-  font-size: 100%;
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: normal
-}
-
-h6
-{ 
-  color: #000080;
-  font-size: 83%;
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: normal
-}
-
-code
-{
-  font-family: "Courier New", Courier, monospace;
-  font-size: 90%;
-  color: #000000
-}
-
-dd
-{
-  margin-top: 0.8em;
-  margin-bottom: 0.8em;
-  text-align: justify
-
-}
-
-dt 
-{
-  margin-top: 0.8em;
-  font-family: Arial, Helvetica, sans-serif;
-  color: #000080
-}
-
-ol
-{
-  margin-top: 0.5em;
-  margin-bottom: 0.5em
-}
-
-ol.alpha
-{
-  list-style-type: lower-alpha
-}
-
-li
-{
-  margin-top: 0.25em;
-  margin-bottom: 0.25em;
-  text-align: justify
-}
-
-a:hover
-{
-  color: #990000
-}
-
-
-.title
-{
-  text-align: left;
-  font-size: 167%;
-  color: #000080;
-  font-family: Arial, Helvetica, sans-serif;
-  margin-top: 0.4em;
-  margin-bottom: 0.4em
-}
-
-.subtitle 
-{  
-  text-align: left;
-  font-size: 133%;
-  color: #000080;
-  font-family: Arial, Helvetica, sans-serif;
-  margin-top: 0.4em;
-  margin-bottom: 0.4em
-}
-
-.glossaryTerm 
-{  
-  font-style: italic;
-  color: #006699
-}
-
-.example
-{ 
-  font-family: "Courier New", monospace;
-  background-color: #CCFFFF;
-  color: #000000;
-  margin: 0pt 0pt;
-  border: #008000 none
-}
-
-.schema
-{ 
-  font-family: "Courier New", monospace;
-  background-color: #FFFFCC;
-  color: #000000;
-  margin: 0pt 0pt;
-  border: #008000 none
-}
-
-.documentinfo
-{
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 100%;
-}
-
-.ol-contents
-{
-  font-size: 100%;
-  margin-top: 0.0em;
-  margin-bottom: 0.0em;
-}
-
-.li-contents
-{
-  font-size: 100%;
-  margin-top: 0.0em;
-  margin-bottom: 0.0em;
-}
-
-.logoTitle 
-{ 
-  text-align: center;
-  font-size: 133%;
-  color: #000080;
-  font-family: Arial, Helvetica, sans-serif;
-}
-
-.logoTable 
-{ 
-  margin-bottom: 0px;
-  margin-left: 0px
-}
-
-.superscript
-{ 
-  vertical-align: super;
-  font-size: 66%;
-}
-
-.term
-{ 
-  font-style: italic; 
-}
-
-.comment
-{
-  color: #000000;
-  background: #ffff00;
-  font-style: italic
-}
-
-.addedErrata12
-{  
-  color: #FF0000; 
-  background-color: #FFEEEE;
-  text-decoration: underline
-}
-
-.deletedErrata12
-{
-  color: #999999;
-  background-color: #EEEEEE;
-  text-decoration: line-through
-}
-
-.added12
-{  
-  color: #FF0000; 
-  text-decoration: underline
-; background-color: #F8F0FF
-}
-
-.deleted12
-{
-  color: #999999;
-  text-decoration: line-through
-; background-color: #f8f0ff
-}
-
-.rfc2119Keyword 
-{ 
-  font-variant: small-caps;
-  font-style: normal;
-}
-
-.remark {  font-style: italic}
-
-li.faq
-{
-  margin-top: 1.5em;
-  margin-bottom: 1.5em;
-}
-
-.faq-question
-{ 
-  color: #000080;
-  font-size: 100%;
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: normal;
-  margin-bottom: 0.4em;
-}
-*/
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/common/logo_digAT.png b/id/server/auth/src/main/webapp/common/logo_digAT.png
new file mode 100644
index 000000000..4f36681e2
Binary files /dev/null and b/id/server/auth/src/main/webapp/common/logo_digAT.png differ
diff --git a/id/server/auth/src/main/webapp/common/main.css b/id/server/auth/src/main/webapp/common/main.css
new file mode 100644
index 000000000..6bd964346
--- /dev/null
+++ b/id/server/auth/src/main/webapp/common/main.css
@@ -0,0 +1,253 @@
+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/index.html b/id/server/auth/src/main/webapp/index.html
index 391195def..381d8d82d 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -1,102 +1,91 @@
-<!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.1.x</title>
-  <link rel="stylesheet" href="./common/MOA.css" type="text/css">
-</head>
-<body link="#990000"> 
-  <table class="logoTable" width="100%" border="0" cellspacing="0" cellpadding="10">
-    <tr>
-      <td align="center" class="logoTitle" width="267"><img src="./common/LogoBKA.png" alt="Logo BKA" width="267" height="37" align="left"></td>
-      <td align="center" class="logoTitle">&nbsp;</td>
-      <td align="center" class="logoTitle" width="123"><img src="./common/LogoEGIZ.png" alt="Logo EGIZ" width="230" height="81" align="right"></td>
-    </tr>
-  </table>
-  <hr/> 
-  <p class="title">MOA-ID 2.1.2</p> 
-<hr/>
-  <h1>Inhalt</h1>
-  <ol>
-    <li><a href="#allgemeines">Allgemeines</a>
-      <ol>
-        <li><a href="#allgemeines_service">Externe Services</a></li>
-      </ol>
-    </li>
-    <li><a href="#ss">MOA-ID-Auth </a>
-      <ol>
-        <li><a href="#ablauf">Ablauf einer Anmeldung</a></li>
-      </ol>
-    </li>
-    <li><a href="#sp">MOA-ID-Configuration</a></li>
-  </ol>
-<hr/>
-  <h1><a name="allgemeines"></a>1 Allgemeines</h1>
-  <p> Das Module MOA-ID-Auth kann von Anwendungen zur Identifizierung und Authentifizierung im Rahmen eines Anmeldeprozesses an einer Online-Applikation verwendet werden. Die Konfiguration des Modules MOA-ID-Auth erfolgt mit Hilfe des Zusatzmodules MOA-ID-Configuration welches eine web-basierte Konfigurationsschnittstelle zur Verf&uuml;gung stellt.</p>
-  <p>Das nachfolgende Blockdiagramm zeigt Struktur von MOA-ID und gibt eine kurze Beschreibung der einzelnen Komponenten.</p>
-  <p><img src="Blockdiagramm.png" alt="Architektur MOA-ID" width="1000" height="678"></p>
-  <p>&nbsp;</p>
-<p>MOA-ID besteht aus folgenden Kernkomponenten:</p>
-  <ol>
-    <li><u>CORE LOGIC</u>: Diese Komponente ist die  zentrale Logik zur Steuerung der einzelnen Prozesse innerhalb MOA-ID 2.x.</li>
-    <li><u>Protocol Adapter</u>: Stellt die in MOA-ID  2.x unterst&uuml;tzten Authentifizierungsprotokolle f&uuml;r die Anbindung von Service Providern  zur Verf&uuml;gung.</li>
-    <li><u>Auth Sources</u>: Stellt die von MOA-ID 2.x unterst&uuml;tzten  Identifikationsmechanismen und Single Sign-On Management Funktionen zur Verf&uuml;gung. Dies sind die &ouml;sterreichische B&uuml;rgerkarte oder Handy-Signatur, die  Anmeldung ausl&auml;ndischer Personen mit Hilfe des STORK Protokoll oder mittels Single Sign-On von einem weiteren vertrauensw&uuml;rdigen Identity Provider (Interfederation).  Dieses Modul beinhaltet somit alle jene Funktionen welche f&uuml;r den Authentifizierungs- oder Abmeldeprocess erforderlich sind. </li>
-    <li><u>Template Generator</u>: Der Template Generator erzeugt f&uuml;r Service Provider die  entsprechenden Login-Masken f&uuml;r die Integration in die eigene Web-Applikation.</li>
-    <li><u>SSO Module</u>: Das Single Sign-On (SSO) Modul verwaltet die zus&auml;tzlichen  Operationen die sich aus der Umsetzung von SSO ergeben. Dies umfasst  im Besonderen das SSO Session-Management.</li>
-    <li><u>Statistic Module</u>: Dieses Modul dient zur Generierung  von anonymisierten Statistikdaten aus den Anmeldeinformationen. </li>
-    <li><u>Monitoring &amp; Testing Module</u>: Dieses Modul implementiert  Methoden mit deren Hilfe einzelne funktionale Bereiche aus MOA-ID-Auth getestet  werden k&ouml;nnen. Somit dient dieses Modul als Schnittstellte zu einem externen  Monitoring-Service.</li>
-    <li><u>Configuration</u><u> Modul</u>: Dieses Modul stellt die Schnittstelle zur  MOA-ID-Auth Konfiguration dar welche in einer Datenbank abgelegt wird. </li>
-    <li><u>Konfigurationstool</u>: Oberfl&auml;che, mit deren  Hilfe MOA-ID konfiguriert werden kann. Dies umfasst sowohl allgemeine  Konfigurationsteile als auch die Konfiguration der einzelnen bei MOA-ID-Auth registrierten Online-Applikationen. Service Provider k&ouml;nnen sich am  Konfigurationstool mittels B&uuml;rgerkarte oder Handy-Signatur anmelden und ihre  Online-Applikationen verwalten.</li>
-  </ol>
-  <h2><a name="allgemeines_service" id="allgemeines_service"></a>1.1 Externe Services</h2>
-<p>F&uuml;r die Anmeldung in Vertretung und die Anmeldung ausl&auml;ndischer Personen werden zus&auml;tzliche externe Services verwendet.</p>
-  <h3><a name="allgemeines_service_ovs" id="allgemeines_service2"></a>1.1.1 Online-Vollmachten</h3>
-<p>Ab der MOA-ID Release 1.5.0 werden Online-Vollmachten (f&uuml;r Anwendungen aus dem &ouml;ffentlichen Bereich) unterst&uuml;tzt. Hierzu werden diese Vollmachten &uuml;ber eine Online-Vollmachten-Service ausgew&auml;hlt. Der Zugang zu diesem Online-Vollmachten Service ist &uuml;ber eine Client-Server Authentifizierung abgesichert. Als Client-Zertifikate werden Zertifikate der Firmen A-Trust bzw. A-CERT, die mit der Verwaltungs- oder Dienstleistereigenschaft versehen sind, akzeptiert. </p>
-  <h3><a name="allgemeines_service_szrgw" id="allgemeines_service3"></a>1.1.2 Ausl&auml;ndische B&uuml;rger</h3>
-  <p> Ab der MOA-ID Release 1.4.7 ist es m&ouml;glich, dass sich auch ausl&auml;ndische B&uuml;rger mittels MOA-ID einloggen k&ouml;nnen. Hierzu wird eine Verbindung zu einem sogenannten Stammzahlenregister-Gateway aufgebaut, dass basierend auf den Zertifikatsdaten des ausl&auml;ndischen B&uuml;rgers eine Eintragung im Erg&auml;nzungsregister f&uuml;r nat&uuml;rliche Personen gem&auml;&szlig; E-Government Gesetz &sect;6(5) vornimmt. Somit ist es m&ouml;glich, dass eine Personenbindung ausgestellt werden kann, die in weitere Folge an MOA-ID weitergeleitet wird. Der Zugang zu diesem Stammzahlenregister-Gateway ist &uuml;ber eine Client-Server Authentifizierung abgesichert. Als Client-Zertifikate werden Zertifikate der Firmen A-Trust bzw. A-CERT, die mit der Verwaltungs- oder Dienstleistereigenschaft versehen sind, akzeptiert. </p>
-<h1><a name="moaidauth" id="moaidauth"></a>2 MOA-ID-Auth</h1>
-<p>Das Modul MOA-ID-Auth dient der Identifizierung und Authentifizierung im Rahmen eines Anmeldevorgangs an einer Online-Applikation. Die Identifizierung und Authentifizierung erfolgt mit B&uuml;rgerkartem, Handy-Signatur oder f&uuml;r aus&auml;ndische Personen mittels STORK.</p>
-<p>Die Funktionalit&auml;t und der Aufbau der Schnittstellen des Modules MOA-ID-Auth in Richtung Online-Applikation wird im Kapitel Protokolle beschriebe.
-<p>F&uuml;r den Betrieb von MOA-ID-Auth ist der Einsatz von MOA-Signaturpr&uuml;fung (MOA-SP) erforderlich.</p>
-<h2><a name="ablauf" id="ablauf"></a> 2.1 Ablauf einer Anmeldung</h2>
-<p>Die nachfolgende Grafik beschreibt den Ablauf eines Abmeldevorgangs an einer Online-Applikation mit Hilfe von MOA-ID-Auth unter Verwendung der B&uuml;rgerkarte oder der Handy-Signatur.</p>
-<p><img src="anmeldeablauf.png" width="947" height="881" alt="Sequenzdiagramm eines Anmeldevorgangs mit MOA-ID-Auth"></p>
-<p>&nbsp;</p>
-<ol>
-  <li>Der Benutzer verbindet sich zu einem Web-Portal (Service Provider) &uuml;ber das die Online-Applikation erreichtbar ist. Nach der Bet&auml;tigung eines Login-Buttons wird der Anmeldevorgang ausgel&ouml;st.</li>
-  <li>Der Benutzer wird zur Identifizierung und Authentifizierung an MOA-ID-Auth weitergeleitet. </li>
-  <li>MOA-ID-Auth validiert die Authentifizierungsanfrage des Service Providers</li>
-  <li>MOA-ID-Auth bietet dem Benutzer eine Auswahl von verf&uuml;gbaren Authentifizierungsmethoden (B&uuml;rgerkarte, Handy-Signatur, STORK) an.</li>
-  <li>Der Benutzer w&auml;hlt die gew&uuml;nschte Authentifizierungsmethode und sendet diese an MOA-ID-Auth.</li>
-  <li>MOA-ID-AUTH erzeugt eine HTML-Seite mit einem &lt;InfoboxReadRequest&gt; zum Auslesen der Personenbindung. Diese HTML-Seite wird an den Browser geschickt.</li>
-  <li>Der Browser schickt den &lt;InfoboxReadRequest&gt; an die ausgew&auml;hlte Bürgerkartenumgebung unter Verwendung des Security-Layer. Die Bürgerkartenumgebung liest die Personenbindung von der B&uuml;rgerkarte und sendet diese an MOA-ID-AUTH. MOA-ID-Auth prüft die Signatur der Personenbindung durch einen Aufruf von MOA-SP.</li>
-  <li>MOA-ID-AUTH erstellt den AUTH-Block. Der AUTH-Block enth&auml;lt     Vor- und Nachname aus der Personenbindung,     URL von MOA-ID-AUTH,     URL und Gesch&auml;ftsbereich der Online-Applikation oder im Falle einer SSO Anmeldung die URL und den Gesch&auml;ftsbereich der MOA-ID-Auth Instanz,     die aktuelle Zeit, das aktuelle Datum und einen Zufallswert f&uuml;r diesen Anmeldevorgang. Anschlie&szlig;end wird eine XML Antwortseite, die das Kommando zum Signieren (&lt;CreateXMLSignatureRequest&gt;) des generierten AUTH-Blocks enth&auml;lt, an die ausgew&auml;hlte Bürgerkartenumgebung, unter Verwendung des Security-Layers, gesendet.</li>
-  <li>Der Request wird von der Bürgerkartenumgebung verarbeitet. Die signierten Daten werden an MOA-ID-AUTH zur&uuml;ckgesendet.</li>
-  <li>MOA-ID-Auth &uuml;berpr&uuml;ft den signierten AUTH-Block und generiert Information f&uuml;r weitere Anmeldungen mittels Single Sign-On.</li>
-  <li>MOA-ID-Auth generiert die Anmeldedaten (Assertion) welche folgende Information enthalten: 
-  	<ul>
-    	<li>die bereichsspezifischen Personenkennzeichen (bPK / wbPK)</li>
-    	<li>Vorname, Nachname und Geburtsdatum (optional)</li>
-    	<li>den signierten AUTH-Block (optional)</li>
-    	<li>die Personenbindung (optional)</li>
-    	<li>das Zertifikat mit dem die Signatur erzeugt wurde (optional)</li>
-    	<li>informationen zum Vertreten im Falle einer Anmeldung in Vertretung (optional)</li>
-    	<li>die elektronische Vollmacht im Falle einer Anmeldung in Vertretung (optional)</li>
-    	<li>informationen aus dem STORK Protokoll im Falle einer Anmeldung mittels STORK (optional)</li>
-    </ul>
-  </li>
-  <li> MOA-ID-Auth sendet die Anmeldedaten an den Service-Provider und setzt im Browser des Benutzers ein SSO Session-Tokken welches f&uuml;r weitere Anmeldevorg&auml;nge verwendet werden kann.</li>
-  <li>Die Anmeldedaten werden vom Service-Provider verarbeitet und der Benutzer wird vom Service-Provider an die Online-Applikation weitergeleitet.  </li>
-</ol>
-<h1><a name="config" id="config"></a>3 MOA-ID-Configuration </h1>
-<p>Das Modul MOA-ID-Configuration stellt eine web-basierte Benutzerschnittstelle zur Konfiguration des Moduls MOA-ID-Auth zur Verf&uuml;gung, wobei sich die Konfiguration in zwei Teilbereiche unterteilt ist. Eine detailierte Aufstellung der einzelnen Konfigurationspunkte befindet sich im Kapitel <a href="../config/config.html">Konfiguration</a>.</p>
-<ol>
-  <li>Allgemeine Konfiguration<br>
-  In diesem Bereich sind alle Basiseinstellungen der MOA-ID-Auth Instanz hinterlegt. Beispiele hierf&uuml;r sind Single Sign-On, unterst&uuml;tze Authentifizierungsprotokolle, Informationen zu MOA-ID-Auth, URLs zu externen Services, ... Eine &Auml;nderung der Basiseinstellung erfordert besondere Benutzerrechte am Konfigurationstool.</li>
-  <li>Online-Applikationen<br>
-  In diesem Abschnitt erfolgt die Konfiguration der einzelnen bei MOA-ID-Auth registrierten Service-Provider. Hierbei handelt es sich um authentifizierungsprotkollspezifische Einstellungen, Bereich des Service-Providers (&ouml;ffentlich / Privatwirtschaftlich), Konfiguration der BKU Auswahl, .... Wobei sich die Konfigurationsm&ouml;glichkeiten je nachdem welche Benutzerrechten vergeben sind, unterscheiden k&ouml;nnen.</li>
-</ol>
-<p>Zus&auml;tzlich unterst&uuml;tzt das Module MOA-ID-Configuration auch eine einfache Bentzerverwaltung mit Rechtevergabe mit deren Hilfe die Verwaltung von Online-Applikatioen an den jeweiligen Service-Provider ausgelagert werden kann. Die Anmeldung am Konfigurationstool erfolgt mittels B&uuml;rgerkarte, Handy-Signature oder STORK, wobei optional auch eine Anmeldung mittels Benutzername und Passwort zur Verf&uuml;gung steht.</p>
-<p>&nbsp;</p>
-</body>
-</html>
+<!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 2.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-2.0.0/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>
+                	
+                </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-2.0.0/doc/handbook/application/application.html#DemoApp_pvp21">Beschreibung</a> konfigurieren.</p>
+        </div>
+        </div>
+
+    </body>
+</html>
\ No newline at end of file
-- 
cgit v1.2.3


From e6e2bbf9a6e4df5e714ab10babae013317bf8422 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 16 Jan 2015 15:11:48 +0100
Subject: Add dti-process-engine support.

---
 id/server/auth/pom.xml                             | 10 ++++++++
 .../src/main/webapp/WEB-INF/applicationContext.xml | 29 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 7db6ce648..529737820 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -188,6 +188,16 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
new file mode 100644
index 000000000..b340133c7
--- /dev/null
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -0,0 +1,29 @@
+<?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:task="http://www.springframework.org/schema/task"
+	xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.1.xsd
+		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">
+
+	<context:annotation-config />
+
+	<bean id="processEngine" class="com.datentechnik.process_engine.ProcessEngineImpl">
+		<property name="transitionConditionExpressionEvaluator">
+			<bean class="com.datentechnik.process_engine.spring.SpringExpressionEvaluator" />
+		</property>
+		<property name="processInstanceMaxIdleTimeSeconds" value="600" />
+		<property name="processDefinitions">
+			<bean class="com.datentechnik.process_engine.spring.ProcessDefinitionsFactoryBean">
+				<property name="resources" value="classpath:resources/processes/*.process.xml" />
+			</bean>
+		</property>
+	</bean>
+	
+	<task:scheduler id="taskScheduler" pool-size="1" />
+	<task:scheduled-tasks scheduler="taskScheduler">
+		<task:scheduled ref="processEngine" method="cleanup" fixed-delay="60000" />
+	</task:scheduled-tasks>
+
+</beans>
-- 
cgit v1.2.3


From a1bb34634bf4f30fc565109358eb51bd1111dc21 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Wed, 21 Jan 2015 08:50:58 +0100
Subject: Add "DefaultAuthentication" process (AT, no mandates, no stork)
 (MOAID-59).

- Fix oa web.xml, switch to servlet 3.0.
- moa-id-auth web.xml
-- Add CharacterEncodingFilter for UTF-8 encoding.
-- Add ProcessEngineSignalServlet.
- Fix invalid template_*.html.
- Add TODO[branch] annotations in order to indicates potential process flow branches.
- Add some missing Javadoc.
- Add property processInstandId to AuthenticationSession.
- Add process engine support.
- Fix HttpServlet init issues.
- Set VerifyAuthenticationBlockServlet and VerifyIdentityLinkServlet deprecated.
---
 .../src/main/webapp/WEB-INF/applicationContext.xml |  2 ++
 id/server/auth/src/main/webapp/WEB-INF/web.xml     | 30 ++++++++++++++++++++++
 .../auth/src/main/webapp/template_handyBKU.html    |  2 +-
 .../auth/src/main/webapp/template_localBKU.html    |  2 +-
 .../auth/src/main/webapp/template_onlineBKU.html   |  2 +-
 5 files changed, 35 insertions(+), 3 deletions(-)

(limited to 'id/server/auth')

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 b340133c7..0f9f05baa 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -25,5 +25,7 @@
 	<task:scheduled-tasks scheduler="taskScheduler">
 		<task:scheduled ref="processEngine" method="cleanup" fixed-delay="60000" />
 	</task:scheduled-tasks>
+	
+	<bean id="authenticationManager" class="at.gv.egovernment.moa.id.moduls.AuthenticationManager" factory-method="getInstance" />
 
 </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 fb3888a3e..477cce57b 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -10,6 +10,23 @@
 		<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>
+		<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>
+
 	<!-- exposes request and response to the current thread -->
 	<filter>
 		<filter-name>requestContextFilter</filter-name>
@@ -20,6 +37,7 @@
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 
+
 <!-- 	<servlet>
 		<servlet-name>SelectBKU</servlet-name>
 		<display-name>SelectBKU</display-name>
@@ -153,6 +171,12 @@
 		<servlet-class>at.gv.egovernment.moa.id.protocols.saml1.GetArtifactServlet</servlet-class>
 	</servlet>
 
+	<servlet>
+		<description>Resumes a suspended process engine 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>
 
 
 
@@ -207,7 +231,10 @@
 		<url-pattern>/idpSingleLogout</url-pattern>
 	</servlet-mapping>	
 	<servlet-mapping>
+		<!--
 		<servlet-name>VerifyIdentityLink</servlet-name>
+		-->
+		<servlet-name>ProcessEngineSignal</servlet-name>
 		<url-pattern>/VerifyIdentityLink</url-pattern>
 	</servlet-mapping>
 	<servlet-mapping>
@@ -229,7 +256,10 @@
 	</servlet-mapping> -->
 	
 	<servlet-mapping>
+		<!--
 		<servlet-name>VerifyAuthBlock</servlet-name>
+		-->
+		<servlet-name>ProcessEngineSignal</servlet-name>
 		<url-pattern>/VerifyAuthBlock</url-pattern>
 	</servlet-mapping>
 <!-- 	<servlet-mapping>
diff --git a/id/server/auth/src/main/webapp/template_handyBKU.html b/id/server/auth/src/main/webapp/template_handyBKU.html
index 91f7fad6f..6c3dc563c 100644
--- a/id/server/auth/src/main/webapp/template_handyBKU.html
+++ b/id/server/auth/src/main/webapp/template_handyBKU.html
@@ -11,7 +11,7 @@
 		</script>
 	</head>
 	<body onLoad="onAnmeldeSubmit()">		 
-      <form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
+      <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>">
diff --git a/id/server/auth/src/main/webapp/template_localBKU.html b/id/server/auth/src/main/webapp/template_localBKU.html
index 88fad25ae..0ec8e52c2 100644
--- a/id/server/auth/src/main/webapp/template_localBKU.html
+++ b/id/server/auth/src/main/webapp/template_localBKU.html
@@ -11,7 +11,7 @@
 		</script>
 	</head>
 	<body onLoad="onAnmeldeSubmit()">	   
-		<form target=<REDIRECTTARGET> name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
+		<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>">
diff --git a/id/server/auth/src/main/webapp/template_onlineBKU.html b/id/server/auth/src/main/webapp/template_onlineBKU.html
index 534d3dc55..39d7bb8e1 100644
--- a/id/server/auth/src/main/webapp/template_onlineBKU.html
+++ b/id/server/auth/src/main/webapp/template_onlineBKU.html
@@ -11,7 +11,7 @@
 		</script>
 	</head>
 	<body onLoad="onAnmeldeSubmit()">	 
-		<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
+		<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>">
-- 
cgit v1.2.3


From ad40ae9233c5f2a32c983962d655e686af546677 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Thu, 22 Jan 2015 12:13:07 +0100
Subject: Add mandate process support (MOAID-60).

- Refactor moa-id auth web.xml
-- Group the servlets with their corresponding mappings.
-- Replace servlets for mappings "/GetMISSessionID", "/VerifyAuthBlock", "/VerifyCertificate" and "/VerifyIdentityLink".
-- Remove disabled declarations.
- Replace link http://jigsaw.w3.org/css-validator/images/vcss-blue with https://... within the internal templates (loginFormFull.html, sendAssertionFormFull.html, ...).
- Set classes deprecated: GetMISSessionIDServlet, VerifyCertificateServlet
- ProcessEngineSignalServlet: make GET delegate to PUT
- Replace some "implements MOAIDAuthConstants" with "import static MOAIDAuthConstants.*".
- Add detailed Javadoc to *Task.java.
- Update DefaultAuthentication.process.xml for mandate
- Add GetMISSessionIDTask and VerifyCertificateTask.
- Add adapter class for iaik.IAIKRuntimeException in order to satisfy some library's bogus dependendies.
---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 272 +++++++------------------
 1 file changed, 72 insertions(+), 200 deletions(-)

(limited to 'id/server/auth')

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 477cce57b..1dd3b7a40 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -36,41 +36,67 @@
 		<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>
-		<servlet-name>SelectBKU</servlet-name>
-		<display-name>SelectBKU</display-name>
-		<description>Select Bürgerkartenartenumgebung</description>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.SelectBKUServlet</servlet-class>
-	</servlet> -->
 	<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>
+	
 	<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>
+	<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>
@@ -78,25 +104,10 @@
 		<servlet-name>IDPSLO</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.IDPSingleLogOutServlet</servlet-class>
 	</servlet>
-	
-	<servlet>
-		<description>Verify identity link coming from security layer</description>
-		<display-name>VerifyIdentityLink</display-name>
-		<servlet-name>VerifyIdentityLink</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<description>Verify the certificate coming from security layer</description>
-		<display-name>VerifyCertificate</display-name>
-		<servlet-name>VerifyCertificate</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<description>Get the MIS session ID coming from security layer</description>
-		<display-name>GetMISSessionID</display-name>
-		<servlet-name>GetMISSessionID</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GetMISSessionIDServlet</servlet-class>
-	</servlet>
+	<servlet-mapping>
+		<servlet-name>IDPSLO</servlet-name>
+		<url-pattern>/idpSingleLogout</url-pattern>
+	</servlet-mapping>
 
 	<servlet>
 		<description>Gets the foreign eID from security layer</description>
@@ -104,223 +115,84 @@
 		<servlet-name>GetForeignID</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GetForeignIDServlet</servlet-class>
 	</servlet>
-<!-- 	<servlet>
-		<servlet-name>ProcessInput</servlet-name>
-		<display-name>ProcessInput</display-name>
-		<description>Process user input needed by infobox validators</description>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ProcessValidatorInputServlet</servlet-class>
-	</servlet> -->
-	<servlet>
-		<description>Verify AUTH block coming from security layer</description>
-		<display-name>VerifyAuthBlock</display-name>
-		<servlet-name>VerifyAuthBlock</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet</servlet-class>
-	</servlet>
-<!-- 	<servlet>
-		<servlet-name>ConfigurationUpdate</servlet-name>
-		<display-name>ConfigurationUpdate</display-name>
-		<description>Update MOA-ID Auth configuration from the configuration
-			file</description>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ConfigurationServlet</servlet-class>
-	</servlet> -->
+	<servlet-mapping>
+		<servlet-name>GetForeignID</servlet-name>
+		<url-pattern>/GetForeignID</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>
 
- 	<!-- JSP servlet -->
-<!--	<servlet>
-		<servlet-name>jspservlet</servlet-name>
-		<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-	</servlet> -->
 	<servlet>
-		<description>Servlet receiving STORK SAML Response Messages from
-			different C-PEPS</description>
+		<description>Servlet receiving STORK SAML Response Messages from different C-PEPS</description>
 		<display-name>PEPSConnectorServlet</display-name>
 		<servlet-name>PEPSConnectorServlet</servlet-name>
-		<servlet-class>
-			at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet</servlet-class>
+		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet</servlet-class>
 	</servlet>
+	<servlet-mapping>
+		<servlet-name>PEPSConnectorServlet</servlet-name>
+		<url-pattern>/PEPSConnector</url-pattern>
+	</servlet-mapping>
+
 	<servlet>
-		<description>Servlet receiving STORK SAML Response Messages from
-			different C-PEPS</description>
+		<description>Servlet receiving STORK SAML Response Messages from different C-PEPS</description>
 		<display-name>PEPSConnectorWithLocalSigningServlet</display-name>
 		<servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
-		<servlet-class>
-			at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet</servlet-class>
+		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet</servlet-class>
 	</servlet>
-
-	<!-- Dispatcher servlets 
-	<servlet>
-		<servlet-name>AuthDispatcherServlet</servlet-name>
-		<display-name>AuthDispatcher Servlet</display-name>
-		<servlet-class>at.gv.egovernment.moa.id.entrypoints.AuthDispatcherServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>-->
+	<servlet-mapping>
+		<servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
+		<url-pattern>/PEPSConnectorWithLocalSigning</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 Registration -->
-	<servlet>
-		<servlet-name>at.gv.egovernment.moa.id.protocols.saml1.GetArtifactServlet</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.protocols.saml1.GetArtifactServlet</servlet-class>
-	</servlet>
+	<servlet-mapping>
+		<servlet-name>DispatcherServlet</servlet-name>
+		<url-pattern>/dispatcher</url-pattern>
+	</servlet-mapping>
 
 	<servlet>
-		<description>Resumes a suspended process engine task.</description>
+		<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>
-		<servlet-name>DispatcherServlet</servlet-name>
-		<url-pattern>/dispatcher</url-pattern>
-	</servlet-mapping>
-	<!-- servlet-mapping>
-		<servlet-name>AuthDispatcherServlet</servlet-name>
-		<url-pattern>/AuthDispatcher</url-pattern>
-	</servlet-mapping -->
-
-
-	<!-- servlet mapping for jsp pages -->
-	<!-- errorpage.jsp (customizeable) -->
-<!-- 	<servlet-mapping>
-		<servlet-name>jspservlet</servlet-name>
-		<url-pattern>/errorpage-auth.jsp</url-pattern>
-	</servlet-mapping>
-	message.jsp (customizeable) used for non error messages (e.g. ConfigurationUpdate)
-	<servlet-mapping>
-		<servlet-name>jspservlet</servlet-name>
-		<url-pattern>/message-auth.jsp</url-pattern>
-	</servlet-mapping> -->
-
-<!-- 	<servlet-mapping>
-		<servlet-name>SelectBKU</servlet-name>
-		<url-pattern>/SelectBKU</url-pattern>
-	</servlet-mapping> -->
-	<servlet-mapping>
-		<servlet-name>GenerateIframeTemplate</servlet-name>
-		<url-pattern>/GenerateIframeTemplate</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>RedirectServlet</servlet-name>
-		<url-pattern>/RedirectServlet</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>MonitoringServlet</servlet-name>
-		<url-pattern>/MonitoringServlet</url-pattern>
-	</servlet-mapping>
 	<servlet-mapping>
-		<servlet-name>SSOSendAssertionServlet</servlet-name>
-		<url-pattern>/SSOSendAssertionServlet</url-pattern>
-	</servlet-mapping>	
- 	<servlet-mapping>
-		<servlet-name>LogOut</servlet-name>
-		<url-pattern>/LogOut</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>IDPSLO</servlet-name>
-		<url-pattern>/idpSingleLogout</url-pattern>
-	</servlet-mapping>	
-	<servlet-mapping>
-		<!--
-		<servlet-name>VerifyIdentityLink</servlet-name>
-		-->
 		<servlet-name>ProcessEngineSignal</servlet-name>
-		<url-pattern>/VerifyIdentityLink</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>VerifyCertificate</servlet-name>
-		<url-pattern>/VerifyCertificate</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>GetMISSessionID</servlet-name>
 		<url-pattern>/GetMISSessionID</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>GetForeignID</servlet-name>
-		<url-pattern>/GetForeignID</url-pattern>
-	</servlet-mapping>
-
-<!-- 	<servlet-mapping>
-		<servlet-name>ProcessInput</servlet-name>
-		<url-pattern>/ProcessInput</url-pattern>
-	</servlet-mapping> -->
-	
-	<servlet-mapping>
-		<!--
-		<servlet-name>VerifyAuthBlock</servlet-name>
-		-->
-		<servlet-name>ProcessEngineSignal</servlet-name>
 		<url-pattern>/VerifyAuthBlock</url-pattern>
+		<url-pattern>/VerifyCertificate</url-pattern>
+		<url-pattern>/VerifyIdentityLink</url-pattern>
 	</servlet-mapping>
-<!-- 	<servlet-mapping>
-		<servlet-name>ConfigurationUpdate</servlet-name>
-		<url-pattern>/ConfigurationUpdate</url-pattern>
-	</servlet-mapping> -->
-	<servlet-mapping>
-		<servlet-name>AxisServlet</servlet-name>
-		<url-pattern>/services/*</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>PEPSConnectorServlet</servlet-name>
-		<url-pattern>/PEPSConnector</url-pattern>
-	</servlet-mapping>
-<servlet-mapping>
-		<servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
-		<url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
-	</servlet-mapping>
-	<!-- Filters -->
-	<!-- <filter> <filter-name>DispatcherDecoratorFilter</filter-name> <filter-class>at.gv.egovernment.moa.id.sso.DispatcherDecoratorFilter</filter-class> 
-		</filter> -->
-
-	<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>
-	<!-- <filter-mapping> <filter-name>DispatcherDecoratorFilter</filter-name> 
-		<url-pattern>/AuthDispatcher</url-pattern> <dispatcher>REQUEST</dispatcher> 
-		<dispatcher>FORWARD</dispatcher> </filter-mapping> <filter-mapping> <filter-name>DispatcherDecoratorFilter</filter-name> 
-		<url-pattern>/StartAuthentication</url-pattern> <dispatcher>REQUEST</dispatcher> 
-		<dispatcher>FORWARD</dispatcher> </filter-mapping> -->
 
 	<session-config>
 		<session-timeout>5</session-timeout>
 	</session-config>
+	
 	<error-page>
 		<error-code>500</error-code>
 		<location>/errorpage.jsp</location>
 	</error-page>
-<!-- 	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>ConfigurationUpdate</web-resource-name>
-			<url-pattern>/ConfigurationUpdate</url-pattern>
-		</web-resource-collection>
-		<auth-constraint>
-			<role-name>moa-admin</role-name>
-		</auth-constraint>
-	</security-constraint> -->
+	
 	<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>
+		<description>The role that is required to log in to the moa Application</description>
 		<role-name>moa-admin</role-name>
 	</security-role>
+
 </web-app>
-- 
cgit v1.2.3


From 745272fe66f04fee6976e6a187e308bb7a5987a1 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 23 Jan 2015 11:22:07 +0100
Subject: Add foreign identity process support (MOAID-61).

- moa-id auth web.xml: Replace servlet mapping "/GetForeignID".
- Fix some javadoc of AuthenticationServer.
- Set GetForeignIDServlet deprecated.
- Remove redundant code across several classes.
- VerifyIdentityLinkTask: Separate identity link verification from subsequent (a) creation of CreateXMLSignatureRequest (ProcessIdentityLinkTask) and (b) creation of InfoBoxReadRequest (CertificateReadRequestTask).
---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'id/server/auth')

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 1dd3b7a40..4548e05d9 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -108,17 +108,6 @@
 		<servlet-name>IDPSLO</servlet-name>
 		<url-pattern>/idpSingleLogout</url-pattern>
 	</servlet-mapping>
-
-	<servlet>
-		<description>Gets the foreign eID from security layer</description>
-		<display-name>GetForeignID</display-name>
-		<servlet-name>GetForeignID</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GetForeignIDServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>GetForeignID</servlet-name>
-		<url-pattern>/GetForeignID</url-pattern>
-	</servlet-mapping>
 	
 	<servlet>
 		<display-name>Apache-Axis Servlet</display-name>
@@ -172,6 +161,7 @@
 	<servlet-mapping>
 		<servlet-name>ProcessEngineSignal</servlet-name>
 		<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>
-- 
cgit v1.2.3


From b187c1470167335ad6142b9b8b730e106348a8f8 Mon Sep 17 00:00:00 2001
From: Gerwin Gsenger <g.gsenger@datentechnik-innovation.at>
Date: Wed, 28 Jan 2015 10:31:33 +0100
Subject: implement ModuleRegistry, implement standard moaid process, start
 ModuleRegistry at moa-id startup, fix typo in package name

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

(limited to 'id/server/auth')

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 0f9f05baa..a4a06d24a 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -27,5 +27,5 @@
 	</task:scheduled-tasks>
 	
 	<bean id="authenticationManager" class="at.gv.egovernment.moa.id.moduls.AuthenticationManager" factory-method="getInstance" />
-
+	<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.moduls.modulregistration.ModuleRegistration" factory-method="getInstance" />
 </beans>
-- 
cgit v1.2.3


From d45b41a740a6267c78a6ea27b7617c3d317db837 Mon Sep 17 00:00:00 2001
From: Christian Wagner <c.wagner@datentechnik-innovation.com>
Date: Thu, 29 Jan 2015 08:18:00 +0100
Subject: integrate process engine from project 'dti-process-engine' -
 INCOMPLETE!

  - commit neccessary in order to avoid blocking the development process

additional small fix due to earlier package renaming
---
 id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'id/server/auth')

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 a4a06d24a..ce8fe8971 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -9,16 +9,18 @@
 
 	<context:annotation-config />
 
-	<bean id="processEngine" class="com.datentechnik.process_engine.ProcessEngineImpl">
+	<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
 		<property name="transitionConditionExpressionEvaluator">
 			<bean class="com.datentechnik.process_engine.spring.SpringExpressionEvaluator" />
 		</property>
 		<property name="processInstanceMaxIdleTimeSeconds" value="600" />
+	<!--
 		<property name="processDefinitions">
 			<bean class="com.datentechnik.process_engine.spring.ProcessDefinitionsFactoryBean">
 				<property name="resources" value="classpath:resources/processes/*.process.xml" />
 			</bean>
 		</property>
+	-->
 	</bean>
 	
 	<task:scheduler id="taskScheduler" pool-size="1" />
@@ -27,5 +29,5 @@
 	</task:scheduled-tasks>
 	
 	<bean id="authenticationManager" class="at.gv.egovernment.moa.id.moduls.AuthenticationManager" factory-method="getInstance" />
-	<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.moduls.modulregistration.ModuleRegistration" factory-method="getInstance" />
+	<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration" factory-method="getInstance" />
 </beans>
-- 
cgit v1.2.3


From 8579cf80c3602f963566d31eaf04f59f68d3bf11 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Thu, 29 Jan 2015 10:56:18 +0100
Subject: Add STORK process (MOAID-58).

- Add STORKAuthentication.process.xml
- Add PepsConnectorTask using code from PEPSConnectorServlet.
- Split code from PEPSConnectorWithLocalSigningServlet into PepsConnectorHandleResponseWithoutSignatureTask and PepsConnectorHandleLocalSignResponseTask.
- Replace SpringExpressionEvaluator within applicationContext.xml with SpringWebExpressionEvaluator (allowing expressions using request parameter(s)).
- Make servlet mappings /PEPSConnectorWithLocalSigning and /PEPSConnector point to the process engine signaling servlet.
- Add many FIXMEs marking problematic code.
- Move code to start stork authentication from StartAuthenticationBuilder to CreateStorkAuthRequestFormTask.
- Mark PEPSConnectorServlet and PEPSConnectorWithLocalSigningServlet deprecated.
- Remove @author tknall from classes assembled using existing (bogus) code.
---
 .../src/main/webapp/WEB-INF/applicationContext.xml |  2 +-
 id/server/auth/src/main/webapp/WEB-INF/web.xml     | 24 ++--------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

(limited to 'id/server/auth')

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 0f9f05baa..8e210c040 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -11,7 +11,7 @@
 
 	<bean id="processEngine" class="com.datentechnik.process_engine.ProcessEngineImpl">
 		<property name="transitionConditionExpressionEvaluator">
-			<bean class="com.datentechnik.process_engine.spring.SpringExpressionEvaluator" />
+			<bean class="com.datentechnik.process_engine.springweb.SpringWebExpressionEvaluator" />
 		</property>
 		<property name="processInstanceMaxIdleTimeSeconds" value="600" />
 		<property name="processDefinitions">
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 4548e05d9..2dbceb4e9 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -119,28 +119,6 @@
 		<url-pattern>/services/*</url-pattern>
 	</servlet-mapping>
 
-	<servlet>
-		<description>Servlet receiving STORK SAML Response Messages from different C-PEPS</description>
-		<display-name>PEPSConnectorServlet</display-name>
-		<servlet-name>PEPSConnectorServlet</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>PEPSConnectorServlet</servlet-name>
-		<url-pattern>/PEPSConnector</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<description>Servlet receiving STORK SAML Response Messages from different C-PEPS</description>
-		<display-name>PEPSConnectorWithLocalSigningServlet</display-name>
-		<servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
-		<url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
-	</servlet-mapping>
-	
 	<servlet>
 		<display-name>Dispatcher Servlet</display-name>
 		<servlet-name>DispatcherServlet</servlet-name>
@@ -165,6 +143,8 @@
 		<url-pattern>/VerifyAuthBlock</url-pattern>
 		<url-pattern>/VerifyCertificate</url-pattern>
 		<url-pattern>/VerifyIdentityLink</url-pattern>
+		<url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
+		<url-pattern>/PEPSConnector</url-pattern>
 	</servlet-mapping>
 
 	<session-config>
-- 
cgit v1.2.3


From a3002d5966703675e982f5699b7a829d2dc22d84 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Thu, 29 Jan 2015 13:47:36 +0100
Subject: Integrate processes with module discovery.

- Fix AuthModuleImpl process resource uri.
- Create package at.gv.egovernment.moa.id.auth.modules with submodule "internal" and "stork".
- Rename AuthModuleImpl to DefaultAuthModuleImpl (placed in at.gv.egovernment.moa.id.auth.modules.internal).
- Move stork specific tasks to "...stork.tasks" and internal modules to "...internal.tasks".
- Fix bean classes in applicationContext.xml
- Move process descriptions to at.gv.egovernment.moa.id.auth.modules.[internal|stork].
- Add STORKAuthModuleImpl.
---
 id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'id/server/auth')

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 563fd6ec7..65a9e7176 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -11,7 +11,10 @@
 
 	<bean id="processEngine" class="com.datentechnik.process_engine.ProcessEngineImpl">
 		<property name="transitionConditionExpressionEvaluator">
+		<!--
 			<bean class="com.datentechnik.process_engine.springweb.SpringWebExpressionEvaluator" />
+		-->
+			<bean class="com.datentechnik.process_engine.spring.SpringExpressionEvaluator" />
 		</property>
 		<property name="processInstanceMaxIdleTimeSeconds" value="600" />
 		<property name="processDefinitions">
@@ -27,5 +30,5 @@
 	</task:scheduled-tasks>
 	
 	<bean id="authenticationManager" class="at.gv.egovernment.moa.id.moduls.AuthenticationManager" factory-method="getInstance" />
-	<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.moduls.modulregistration.ModuleRegistration" factory-method="getInstance" />
+	<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration" factory-method="getInstance" />
 </beans>
-- 
cgit v1.2.3


From c6f543e06c02c0a2635eac2e9b99c2554e6e27bd Mon Sep 17 00:00:00 2001
From: Christian Wagner <c.wagner@datentechnik-innovation.com>
Date: Thu, 29 Jan 2015 14:39:11 +0100
Subject: integrate process engine from project 'dti-process-engine'

  - fix unit tests
  - correct namespaces
  - refactor package name
---
 id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/auth')

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 ce8fe8971..a251064f6 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -11,7 +11,7 @@
 
 	<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
 		<property name="transitionConditionExpressionEvaluator">
-			<bean class="com.datentechnik.process_engine.spring.SpringExpressionEvaluator" />
+			<bean class="at.gv.egovernment.moa.id.process.spring.SpringExpressionEvaluator" />
 		</property>
 		<property name="processInstanceMaxIdleTimeSeconds" value="600" />
 	<!--
-- 
cgit v1.2.3


From 88f2ac75cf316c755e35303cf2d6faa2343b9408 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Thu, 29 Jan 2015 17:13:21 +0100
Subject: Perform some cleanup

- Remove ProcessDefinitionFactoryBean from applicationContext.xml.
- Minor code cleanup.
---
 id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml | 7 ++-----
 id/server/auth/src/main/webapp/WEB-INF/web.xml                | 2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'id/server/auth')

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 65a9e7176..818524e49 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -17,11 +17,6 @@
 			<bean class="com.datentechnik.process_engine.spring.SpringExpressionEvaluator" />
 		</property>
 		<property name="processInstanceMaxIdleTimeSeconds" value="600" />
-		<property name="processDefinitions">
-			<bean class="com.datentechnik.process_engine.spring.ProcessDefinitionsFactoryBean">
-				<property name="resources" value="classpath:resources/processes/*.process.xml" />
-			</bean>
-		</property>
 	</bean>
 	
 	<task:scheduler id="taskScheduler" pool-size="1" />
@@ -30,5 +25,7 @@
 	</task:scheduled-tasks>
 	
 	<bean id="authenticationManager" class="at.gv.egovernment.moa.id.moduls.AuthenticationManager" factory-method="getInstance" />
+
 	<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration" factory-method="getInstance" />
+
 </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 2dbceb4e9..10c772aca 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -138,6 +138,8 @@
 	</servlet>
 	<servlet-mapping>
 		<servlet-name>ProcessEngineSignal</servlet-name>
+		<url-pattern>/signalProcess</url-pattern>
+		<!-- legacy url patterns -->
 		<url-pattern>/GetMISSessionID</url-pattern>
 		<url-pattern>/GetForeignID</url-pattern>
 		<url-pattern>/VerifyAuthBlock</url-pattern>
-- 
cgit v1.2.3


From 6371e01c520de77b0f37f59c72dbe20fce88c91a Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 30 Jan 2015 08:53:27 +0100
Subject: Add Spring based discovery for STORKAuthModule

- Add wildcard import to applicationContext.xml
- Add some javadoc to AuthModule interface.
- Remove STORKAuthModuleImpl from serviceloader based registration.
---
 id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml | 3 +++
 id/server/auth/src/main/webapp/WEB-INF/web.xml                | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'id/server/auth')

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 818524e49..d9e254451 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -27,5 +27,8 @@
 	<bean id="authenticationManager" class="at.gv.egovernment.moa.id.moduls.AuthenticationManager" factory-method="getInstance" />
 
 	<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration" factory-method="getInstance" />
+	
+	<!-- import auth modules -->
+	<import resource="classpath*:**/*.authmodule.beans.xml" />
 
 </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 10c772aca..f81e01ccd 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -138,8 +138,9 @@
 	</servlet>
 	<servlet-mapping>
 		<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 -->
+		<!-- legacy url patterns for asynchronous tasks -->
 		<url-pattern>/GetMISSessionID</url-pattern>
 		<url-pattern>/GetForeignID</url-pattern>
 		<url-pattern>/VerifyAuthBlock</url-pattern>
-- 
cgit v1.2.3


From 373641cfb0e404e89f4d9a011ae53d8b8cfc06c5 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 30 Jan 2015 10:45:59 +0100
Subject: Add dynamic servlet registration for STORK processes.

- Add STORKWebApplicationInitializer.java
- Adjust web.xml
- Move STORK.authmodule.beans.xml to src/main/resources/...
---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'id/server/auth')

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 f81e01ccd..41c46bd22 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -140,14 +140,17 @@
 		<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 -->
+		<!-- 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 -->
+		<!--
 		<url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
 		<url-pattern>/PEPSConnector</url-pattern>
+		-->
 	</servlet-mapping>
 
 	<session-config>
-- 
cgit v1.2.3


From 9c76562c98ff7ec8ccb2749ccd85309bfd3096b6 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 30 Jan 2015 13:47:25 +0100
Subject: Fix applicationContext.xml and STORKAuthentication.process.xml

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

(limited to 'id/server/auth')

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 2c699f24d..df59c2739 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -11,7 +11,7 @@
 
 	<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
 		<property name="transitionConditionExpressionEvaluator">
-			<bean class="com.datentechnik.process_engine.spring.SpringExpressionEvaluator" />
+			<bean class="at.gv.egovernment.moa.id.process.spring.SpringExpressionEvaluator" />
 		</property>
 		<property name="processInstanceMaxIdleTimeSeconds" value="600" />
 	</bean>
-- 
cgit v1.2.3


From 23fc42a3c273ceb05938c741508537bfaedab00a Mon Sep 17 00:00:00 2001
From: Christian Wagner <c.wagner@datentechnik-innovation.com>
Date: Fri, 30 Jan 2015 14:24:45 +0100
Subject: add persistence to process-engine

additionally remove unnecessary method in the DAO
---
 .../auth/src/main/webapp/WEB-INF/applicationContext.xml     | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'id/server/auth')

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 a251064f6..c7b4e6419 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -13,21 +13,8 @@
 		<property name="transitionConditionExpressionEvaluator">
 			<bean class="at.gv.egovernment.moa.id.process.spring.SpringExpressionEvaluator" />
 		</property>
-		<property name="processInstanceMaxIdleTimeSeconds" value="600" />
-	<!--
-		<property name="processDefinitions">
-			<bean class="com.datentechnik.process_engine.spring.ProcessDefinitionsFactoryBean">
-				<property name="resources" value="classpath:resources/processes/*.process.xml" />
-			</bean>
-		</property>
-	-->
 	</bean>
 	
-	<task:scheduler id="taskScheduler" pool-size="1" />
-	<task:scheduled-tasks scheduler="taskScheduler">
-		<task:scheduled ref="processEngine" method="cleanup" fixed-delay="60000" />
-	</task:scheduled-tasks>
-	
 	<bean id="authenticationManager" class="at.gv.egovernment.moa.id.moduls.AuthenticationManager" factory-method="getInstance" />
 	<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration" factory-method="getInstance" />
 </beans>
-- 
cgit v1.2.3


From 4b6fd327b29ff84f61914f33b6361fa31441c92e Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Wed, 4 Feb 2015 11:31:43 +0100
Subject: Create separate module STORK (MOAID-67)

- Add new maven module moa-id-modules and sub module moa-id-module-stork.
- Move stork relates processes and task to module moa-id-module-stork.
- Move module registration to modules package.
---
 id/server/auth/pom.xml                                        | 4 ++++
 id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 529737820..df45568dc 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -137,6 +137,10 @@
             <artifactId>oasis-dss-api</artifactId>
             <version>1.0.0-RELEASE</version>
         </dependency>
+		<dependency>
+			<groupId>MOA.id.server.modules</groupId>
+			<artifactId>moa-id-module-stork</artifactId>
+		</dependency>
 
         <!-- transitive dependencies we don't want to include into the war -->
 		<dependency>
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 1fe3b4254..fabe6cd9c 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -15,9 +15,9 @@
 	
 	<bean id="authenticationManager" class="at.gv.egovernment.moa.id.moduls.AuthenticationManager" factory-method="getInstance" />
 
-	<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration" factory-method="getInstance" />
-	
 	<!-- 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 a9dc7e094a8732f9826ab77648758dd39adc7324 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Wed, 4 Feb 2015 13:54:32 +0100
Subject: Add logging for automatic servlet registration.

---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'id/server/auth')

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 41c46bd22..930b10f43 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -137,16 +137,23 @@
 		<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 -->
+		
+		<!--
+			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>
-- 
cgit v1.2.3


From 74a42b6128f6f8d21a65dddb9405cd52ebbc0520 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Wed, 4 Feb 2015 15:37:10 +0100
Subject: Create exemplary AuthServlet module (MOAID-68)

- Create new module moa-id-module-monitoring.
- Move MonitoringServlet, DatabaseTestModule, IdentityLinkTestModule, TestManager and TestModuleInterface to new module.
- Update pom.xml, adding new module dependency.
- Update web.xml, disabling static servlet registration.
- Add @WebServlet servlet registration for MonitoringServlet.
---
 id/server/auth/pom.xml                         | 8 ++++++++
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 3 +++
 2 files changed, 11 insertions(+)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index df45568dc..cf394b7ad 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -137,10 +137,18 @@
             <artifactId>oasis-dss-api</artifactId>
             <version>1.0.0-RELEASE</version>
         </dependency>
+        
+        <!-- Adding stork module dependency automatically adds stork capabilities. -->
 		<dependency>
 			<groupId>MOA.id.server.modules</groupId>
 			<artifactId>moa-id-module-stork</artifactId>
 		</dependency>
+		
+		<!-- Adding monitoring module dependency automatically adds monitoring capabilities. -->
+		<dependency>
+			<groupId>MOA.id.server.modules</groupId>
+			<artifactId>moa-id-module-monitoring</artifactId>
+		</dependency>
 
         <!-- transitive dependencies we don't want to include into the war -->
 		<dependency>
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 930b10f43..5afc0dee7 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -67,6 +67,8 @@
 		<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>
@@ -76,6 +78,7 @@
 		<servlet-name>MonitoringServlet</servlet-name>
 		<url-pattern>/MonitoringServlet</url-pattern>
 	</servlet-mapping>
+	-->
 	
 	<servlet>
 		<display-name>SSOSendAssertionServlet</display-name>
-- 
cgit v1.2.3


From b864faef2864cc28df98d778e2221bf2cf911954 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Thu, 5 Feb 2015 16:56:04 +0100
Subject: Perform some cleanup tasks

- Rename AbstractSpringWebSupportedTask to MoaIdTask.
- Remove some unnecessary code.
---
 id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/auth')

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 fabe6cd9c..a3f834457 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -9,7 +9,7 @@
 
 	<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
 		<property name="transitionConditionExpressionEvaluator">
-			<bean class="at.gv.egovernment.moa.id.process.spring.SpringExpressionEvaluator" />
+			<bean class="at.gv.egovernment.moa.id.process.springweb.SpringWebExpressionEvaluator" />
 		</property>
 	</bean>
 	
-- 
cgit v1.2.3


From 426aa9b3dc4205e4c2d82924dba5a2473b48358a Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 26 Feb 2015 12:46:17 +0100
Subject: change Version to 2.2.0

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

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index 381d8d82d..982c850a8 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta http-equiv="content-type" content="text/html; charset=utf8" >
-        <title>MOA-ID 2.1.x</title>
+        <title>MOA-ID 2.2.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'>
-- 
cgit v1.2.3


From 4df561f9f19966c92cd658efa0cd3942a0a091d4 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 5 May 2015 16:10:56 +0200
Subject: moved consent request before attributes are being collected

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

(limited to 'id/server/auth')

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 54debca81..8f01ca22b 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -74,7 +74,7 @@
         <to type="forward">/dispatcher?mod=id_stork2&amp;action=AttributeCollector&amp;%{query-string}</to>
     </rule>
     <rule match-type="regex">
-        <from>^/stork2/CompleteAuthentication$</from>
+        <from>^/stork2/GetConsent$</from>
         <to type="forward">/dispatcher?mod=id_stork2&amp;action=ConsentEvaluator&amp;%{query-string}</to>
     </rule>
     <rule match-type="regex">
-- 
cgit v1.2.3