3 files changed, 84 insertions, 0 deletions
diff --git a/id.server/html/proxy/WEB-INF/web.xml b/id.server/html/proxy/WEB-INF/web.xml
index 9145a48d6..ab67855c2 100644
--- a/id.server/html/proxy/WEB-INF/web.xml
+++ b/id.server/html/proxy/WEB-INF/web.xml
@@ -16,6 +16,25 @@
 		<description>Update MOA-ID Proxy configuration from the configuration file</description>
 		<servlet-class>at.gv.egovernment.moa.id.proxy.servlet.ConfigurationServlet</servlet-class>
 	</servlet>
+	
+	<!-- JSP servlet -->
+	<servlet>
+        <servlet-name>jspservlet</servlet-name>
+        <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
+    </servlet>
+    
+	<!-- servlet mapping for jsp pages -->
+	<!-- errorpage.jsp (customizeable) -->
+	<servlet-mapping>
+        <servlet-name>jspservlet</servlet-name>
+        <url-pattern>/errorpage-proxy.jsp</url-pattern>
+    </servlet-mapping>		
+    <!-- message-proxy.jsp (customizeable) used for non error messages (e.g. ConfigurationUpdate) -->
+	<servlet-mapping>
+        <servlet-name>jspservlet</servlet-name>
+        <url-pattern>/message-proxy.jsp</url-pattern>
+    </servlet-mapping>		
+
 	<servlet-mapping>
 		<servlet-name>ConfigurationUpdate</servlet-name>
 		<url-pattern>/ConfigurationUpdate</url-pattern>
@@ -27,6 +46,10 @@
 	<session-config>
 		<session-timeout>30</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>
diff --git a/id.server/html/proxy/errorpage-proxy.jsp b/id.server/html/proxy/errorpage-proxy.jsp
new file mode 100644
index 000000000..afb4b2281
--- /dev/null
+++ b/id.server/html/proxy/errorpage-proxy.jsp
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<title>Ein Fehler ist aufgetreten</title>
+</head>
+<% Throwable exceptionThrown = (Throwable)request.getAttribute("ExceptionThrown");
+   String errorMessage = (String)request.getAttribute("ErrorMessage");
+   String wrongParameters = (String)request.getAttribute("WrongParameters");
+%>
+
+<body>
+<h1>Fehler bei der Anmeldung</h1>
+<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
+
+<% if (errorMessage != null) { %>
+<p>
+<%= errorMessage%><br>
+</p>
+<% } %>
+<% if (exceptionThrown != null) { %>
+<p> 
+<%= exceptionThrown.getMessage()%>
+</p>
+<% } %>
+<% if (wrongParameters != null) { %>
+<p>Die Angabe der Parameter ist unvollst&auml;ndig.<br></p>
+<b> <%= wrongParameters %> </b><br>
+<p>
+   Beispiele f&uuml;r korrekte Links zur MOA-ID Authentisierung sind:
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>Die Angabe der Parameter <tt>&quot;Template&quot;</tt> und <tt>&quot;BKUSelectionTemplate&quot;</tt> ist optional.</p>
+<% } %>
+</body>
+</html>
+\ No newline at end of file
diff --git a/id.server/html/proxy/message-proxy.jsp b/id.server/html/proxy/message-proxy.jsp
new file mode 100644
index 000000000..0d970898a
--- /dev/null
+++ b/id.server/html/proxy/message-proxy.jsp
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<title>MOA-ID Proxy</title>
+</head>
+<% String message = (String)request.getAttribute("Message");
+%>
+
+<body>
+<h1>MOA-ID Proxy</h1>
+
+<% if (message != null) { %>
+<p>
+<%= message%><br>
+</p>
+<% } %>
+
+</body>
+</html>
+\ No newline at end of file