From d45a99f76d648f30f96d4eb368d7b1d45ab11164 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Tue, 10 Sep 2024 16:16:18 -0500 Subject: [PATCH] Migrate js plugins to ResourceServlet --- .../io/deephaven/server/jetty/JettyBackedGrpcServer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/jetty/src/main/java/io/deephaven/server/jetty/JettyBackedGrpcServer.java b/server/jetty/src/main/java/io/deephaven/server/jetty/JettyBackedGrpcServer.java index 8c5f1dbee2d..6e90a921277 100644 --- a/server/jetty/src/main/java/io/deephaven/server/jetty/JettyBackedGrpcServer.java +++ b/server/jetty/src/main/java/io/deephaven/server/jetty/JettyBackedGrpcServer.java @@ -27,6 +27,7 @@ import org.eclipse.jetty.ee10.servlet.DefaultServlet; import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler; import org.eclipse.jetty.ee10.servlet.FilterHolder; +import org.eclipse.jetty.ee10.servlet.ResourceServlet; import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jetty.ee10.servlet.security.ConstraintSecurityHandler; import org.eclipse.jetty.ee10.webapp.WebAppContext; @@ -365,11 +366,11 @@ public void onClosed(Connection connection) { } private static ServletHolder servletHolder(String name, URI filesystemUri) { - final ServletHolder jsPlugins = new ServletHolder(name, DefaultServlet.class); + final ServletHolder jsPlugins = new ServletHolder(name, ResourceServlet.class); // Note, the URI needs explicitly be parseable as a directory URL ending in "!/", a requirement of the jetty // resource creation implementation, see // org.eclipse.jetty.util.resource.Resource.newResource(java.lang.String, boolean) - jsPlugins.setInitParameter("resourceBase", filesystemUri.toString()); + jsPlugins.setInitParameter("baseResource", filesystemUri.toString()); jsPlugins.setInitParameter("pathInfoOnly", "true"); jsPlugins.setInitParameter("dirAllowed", "false"); jsPlugins.setAsyncSupported(true);