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/src/main/webapp/WEB-INF')

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