Adding a "static" handler for serving content in /static

diff --git a/src/org/cacert/gigi/Launcher.java b/src/org/cacert/gigi/Launcher.java
index d0c9a44cb8a4ce4bce90705245005bf37b3a0c11..1d9716541a7eac7ebc532bf7757b7836001bb93e 100644 (file)
--- a/src/org/cacert/gigi/Launcher.java
+++ b/src/org/cacert/gigi/Launcher.java
@@ -14,12 +14,16 @@ import javax.net.ssl.TrustManagerFactory;
 
 import org.cacert.gigi.natives.SetUID;
 import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.server.handler.ResourceHandler;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.log.Log;
@@ -42,10 +46,11 @@ public class Launcher {
                connector.setHost("127.0.0.1");
                connector.setPort(443);
                s.setConnectors(new Connector[]{connector});
-               ServletContextHandler sh = new ServletContextHandler(
-                               ServletContextHandler.SESSIONS);
-               s.setHandler(sh);
-               sh.addServlet(new ServletHolder(new Gigi()), "/*");
+
+               HandlerList hl = new HandlerList();
+               hl.setHandlers(new Handler[]{generateStaticContext(),
+                               generateGigiContext()});
+               s.setHandler(hl);
                s.start();
                if (connector.getPort() <= 1024
                                && !System.getProperty("os.name").toLowerCase().contains("win")) {
@@ -56,6 +61,22 @@ public class Launcher {
                }
        }
 
+       private static ServletContextHandler generateGigiContext() {
+               ServletContextHandler servlet = new ServletContextHandler(
+                               ServletContextHandler.SESSIONS);
+               servlet.addServlet(new ServletHolder(new Gigi()), "/*");
+               return servlet;
+       }
+
+       private static ContextHandler generateStaticContext() {
+               ResourceHandler rh = new ResourceHandler();
+               rh.setResourceBase("static");
+               ContextHandler ch = new ContextHandler();
+               ch.setHandler(rh);
+               ch.setContextPath("/static");
+               return ch;
+       }
+
        private static SslContextFactory generateSSLContextFactory()
                        throws NoSuchAlgorithmException, KeyStoreException, IOException,
                        CertificateException, FileNotFoundException {