From 02bd4aa9865e7a57c805ea11802729016d08ad49 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 10 Jul 2014 21:51:23 +0200
Subject: [PATCH] Adding 404 Error page.

---
 src/org/cacert/gigi/Gigi.java     | 2 ++
 src/org/cacert/gigi/Launcher.java | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 6d6ddb6e..38a2f0ab 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -30,6 +30,7 @@ import org.cacert.gigi.pages.account.MailCertificateAdd;
 import org.cacert.gigi.pages.account.MailCertificates;
 import org.cacert.gigi.pages.account.MailOverview;
 import org.cacert.gigi.pages.account.MyDetails;
+import org.cacert.gigi.pages.error.PageNotFound;
 import org.cacert.gigi.pages.main.RegisterPage;
 import org.cacert.gigi.pages.wot.AssurePage;
 import org.cacert.gigi.util.ServerConstants;
@@ -49,6 +50,7 @@ public class Gigi extends HttpServlet {
 
 	@Override
 	public void init() throws ServletException {
+		pages.put("/error", new PageNotFound());
 		pages.put("/login", new LoginPage("CACert - Login"));
 		pages.put("/", new MainPage("CACert - Home"));
 		pages.put("/secure", new TestSecure());
diff --git a/src/org/cacert/gigi/Launcher.java b/src/org/cacert/gigi/Launcher.java
index b3c437ed..5d0acb6d 100644
--- a/src/org/cacert/gigi/Launcher.java
+++ b/src/org/cacert/gigi/Launcher.java
@@ -31,6 +31,7 @@ import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.log.Log;
@@ -132,6 +133,9 @@ public class Launcher {
 		ServletContextHandler servlet = new ServletContextHandler(ServletContextHandler.SESSIONS);
 		servlet.setInitParameter(SessionManager.__SessionCookieProperty, "CACert-Session");
 		servlet.addServlet(new ServletHolder(new Gigi(conf)), "/*");
+		ErrorPageErrorHandler epeh = new ErrorPageErrorHandler();
+		epeh.addErrorPage(404, "/error");
+		servlet.setErrorHandler(epeh);
 
 		HandlerList hl = new HandlerList();
 		hl.setHandlers(new Handler[] { hw, servlet });
-- 
2.39.2