Move Policy handler to "www"-Front.

diff --git a/src/org/cacert/gigi/Launcher.java b/src/org/cacert/gigi/Launcher.java
index 3e87d42e2dfe4bab07b9a29fd232725bde26263b..2d8ab7abc7d6146b1afc98f52422cdfc1bb3a1c3 100644 (file)
--- a/src/org/cacert/gigi/Launcher.java
+++ b/src/org/cacert/gigi/Launcher.java
@@ -146,7 +146,7 @@ public class Launcher {
                servlet.addServlet(new ServletHolder(new Gigi(conf)), "/*");
 
                HandlerList hl = new HandlerList();
-               hl.setHandlers(new Handler[]{servlet, hw});
+               hl.setHandlers(new Handler[]{hw, servlet});
 
                ContextHandler ch = new ContextHandler();
                ch.setVirtualHosts(new String[]{ServerConstants.getWwwHostName(),

diff --git a/src/org/cacert/gigi/PolicyRedirector.java b/src/org/cacert/gigi/PolicyRedirector.java
index 300f8800ad57d7f4d7c5420865531a20fbe59d1e..3e143378aa0ff9590a80ffc923dc09c519dd5bd2 100644 (file)
--- a/src/org/cacert/gigi/PolicyRedirector.java
+++ b/src/org/cacert/gigi/PolicyRedirector.java
@@ -14,7 +14,6 @@ public class PolicyRedirector extends HandlerWrapper {
        public void handle(String target, Request baseRequest,
                        HttpServletRequest request, HttpServletResponse response)
                        throws IOException, ServletException {
-               System.out.println("h1"+target);
                if (target.startsWith("/policy/") && target.endsWith(".php")) {
                        target = target.replace(".php", ".html");
                        response.sendRedirect(target);