Merge pull request #1744 from laurentg/local-http-handler

Add "--clientFiles" option to serve local files by http.
opentripplanner · Feb 19, 2015 · 03b76f6 · 03b76f6
2 parents 13aa3a3 + beab6d7
commit 03b76f6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/main/java/org/opentripplanner/standalone/CommandLineParameters.java b/src/main/java/org/opentripplanner/standalone/CommandLineParameters.java
@@ -152,6 +152,10 @@ public class CommandLineParameters implements Cloneable {
             description = "Path to directory containing PointSets. Defaults to BASE_PATH/pointsets.")
     public File pointSetDirectory;
 
+    @Parameter(names = {"--clientFiles"}, validateWith = ReadableDirectory.class,
+            description = "Path to directory containing local client files to serve.")
+    public File clientDirectory = null;
+
     @Parameter(names = {"--router"}, validateWith = RouterId.class,
             description = "One or more router IDs to build and/or serve, first one being the default.")
     public List<String> routerIds;

diff --git a/src/main/java/org/opentripplanner/standalone/GrizzlyServer.java b/src/main/java/org/opentripplanner/standalone/GrizzlyServer.java
@@ -9,6 +9,7 @@
 import org.glassfish.grizzly.http.server.HttpHandler;
 import org.glassfish.grizzly.http.server.HttpServer;
 import org.glassfish.grizzly.http.server.NetworkListener;
+import org.glassfish.grizzly.http.server.StaticHttpHandler;
 import org.glassfish.grizzly.ssl.SSLContextConfigurator;
 import org.glassfish.grizzly.ssl.SSLEngineConfigurator;
 import org.glassfish.grizzly.threadpool.ThreadPoolConfig;
@@ -97,6 +98,17 @@ public void run() {
         HttpHandler staticHandler = new CLStaticHttpHandler(GrizzlyServer.class.getClassLoader(), "/client/");
         httpServer.getServerConfiguration().addHttpHandler(staticHandler, "/");
 
+        /*
+         * 3. A static content handler to serve local files from the filesystem, under the "local"
+         * path.
+         */
+        if (params.clientDirectory != null) {
+            StaticHttpHandler localHandler = new StaticHttpHandler(
+                    params.clientDirectory.getAbsolutePath());
+            localHandler.setFileCacheEnabled(false);
+            httpServer.getServerConfiguration().addHttpHandler(localHandler, "/local");
+        }
+
         /* 3. Test alternate method (no Jersey). */
         // As in servlets, * is needed in base path to identify the "rest" of the path.
         // GraphService gs = (GraphService) iocFactory.getComponentProvider(GraphService.class).getInstance();