Adding 404 Error page.

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 6d6ddb6ec7a9ccea7e8c7dbc594976b1534507a9..38a2f0ab35abf5633806205b34a0c22c81990c08 100644 (file)
--- 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 b3c437ed993072afe382412c4a638c42d7c939e8..5d0acb6da3cb7cf0325825a7c50c787e69f5ff60 100644 (file)
--- 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 });