From 0bba0bc774c186f975f2f39697006a65f78852e9 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Tue, 28 Jan 2014 17:08:28 +0100
Subject: [PATCH] =?utf8?q?Fehler-Seiten=20angelegt=20und=20zugeh=C3=B6rige?=
 =?utf8?q?=20Test-Links=20aufgenommen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/404.jsp               |  1 +
 src/main/webapp/WEB-INF/error.jsp             | 36 +++++++++++++++++++
 .../WEB-INF/templates/test/experimente.jsp    |  4 ++-
 src/main/webapp/WEB-INF/views/test/error.jsp  | 12 +++++++
 src/main/webapp/WEB-INF/web.xml               |  3 ++
 5 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 src/main/webapp/WEB-INF/error.jsp
 create mode 100644 src/main/webapp/WEB-INF/views/test/error.jsp

diff --git a/src/main/webapp/WEB-INF/404.jsp b/src/main/webapp/WEB-INF/404.jsp
index 11c449fe..92187072 100644
--- a/src/main/webapp/WEB-INF/404.jsp
+++ b/src/main/webapp/WEB-INF/404.jsp
@@ -1,6 +1,7 @@
 <%@page contentType="text/html;charset=UTF-8"%>
 <%@page pageEncoding="UTF-8"%>
 <%@page session="false" %>
+<%@page isErrorPage="true" %>
 <%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
 <%@taglib uri="http://www.springframework.org/tags" prefix="s"%>
 <s:url var="base" value="/" />
diff --git a/src/main/webapp/WEB-INF/error.jsp b/src/main/webapp/WEB-INF/error.jsp
new file mode 100644
index 00000000..5644494b
--- /dev/null
+++ b/src/main/webapp/WEB-INF/error.jsp
@@ -0,0 +1,36 @@
+<%@page contentType="text/html;charset=UTF-8"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page session="false" %>
+<%@page isErrorPage="true" %>
+<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
+<%@taglib uri="http://www.springframework.org/tags" prefix="s"%>
+<s:url var="base" value="/" />
+<t:insertDefinition name="NOMENU">
+  <t:putAttribute name="contentclass" value="nomenu withbackground" type="string"/>
+  <t:putAttribute name="title" value="An unexpected Error occured!" type="string"/>
+  <t:putAttribute name="breadcrumb">
+    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
+    <li class="b"><strong class="b">!#%*§</strong></li>
+  </t:putAttribute>
+  <t:putAttribute name="maincontent" type="string">
+    <span class="background sehrhell" id="bs1">x</span>
+    <span class="background heller" id="bs2">#</span>
+    <span class="background sehrhell" id="bs3">*</span>
+    <span class="background heller" id="bs4">%</span>
+    <span class="background sehrhell" id="bs5">§</span>
+    <span class="background sehrhell" id="bs6">?</span>
+    <span class="background heller" id="bs7">?</span>
+    <span class="background heller" id="bs8">?</span>
+    <span class="background heller" id="bs9">?</span>
+    <p>We do not know, what happend.</p>
+    <p>But we can tell you: WE ARE SORRY!</p>
+    <p>Really.</p>
+    <ul>
+      <li>${pageContext.errorData.statusCode}</li>
+      <li>${pageContext.errorData.requestURI}</li>
+      <li>${pageContext.errorData.servletName}</li>
+      <li>${pageContext.errorData.throwable}</li>
+    </ul>
+  </t:putAttribute>
+  <t:putAttribute name="marginalcontent" type="string" value=""/>
+</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/templates/test/experimente.jsp b/src/main/webapp/WEB-INF/templates/test/experimente.jsp
index 91608d36..cb00a9c1 100644
--- a/src/main/webapp/WEB-INF/templates/test/experimente.jsp
+++ b/src/main/webapp/WEB-INF/templates/test/experimente.jsp
@@ -3,10 +3,12 @@
 <%@page session="false" %>
 <%@taglib uri="http://www.springframework.org/tags" prefix="s"%>
 <s:url var="base" value="/" />
-<h2>HTML-Elemente</h2>
+<h2>HTML-Elemente / spezielle Seiten</h2>
 <ul>
   <li><a href="${base}test/formulare.html">Formulare</a></li>
   <li><a href="${base}test/symbole.html">Symbol-Font</a></li>
+  <li><a href="${base}test/gibts-ja-gar-nicht.html">404-Fehlerseite</a></li>
+  <li><a href="${base}test/error.html">Fehlerseite für andere Fehler</a></li>
 </ul>
 <h2>Layout-Grenzfälle</h2>
 <ul>
diff --git a/src/main/webapp/WEB-INF/views/test/error.jsp b/src/main/webapp/WEB-INF/views/test/error.jsp
new file mode 100644
index 00000000..5e8e4e1f
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/test/error.jsp
@@ -0,0 +1,12 @@
+<%@page contentType="text/html;charset=UTF-8"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page session="false" %>
+<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
+<%@taglib uri="http://www.springframework.org/tags" prefix="s"%>
+<s:url var="base" value="/" />
+<t:insertDefinition name="test">
+  <t:putAttribute name="title" value="Diese Seite erzeugt einen Fehler!" type="string"/>
+  <t:putAttribute name="maincontent" type="string">
+    <% Integer.parseInt("foo"); //throws an exception %>
+  </t:putAttribute>
+</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 6a618b8c..6eb68dab 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -62,5 +62,8 @@
     <error-code>404</error-code>
     <location>/WEB-INF/404.jsp</location>
   </error-page>
+  <error-page>
+    <location>/WEB-INF/error.jsp</location>
+  </error-page>
 
 </web-app>
-- 
2.20.1