Jetty 12.0.x resource Servlet

documentation/jetty-asciidoctor-extensions/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.jetty.documentation</groupId>
     <artifactId>documentation</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.12-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-asciidoctor-extensions</artifactId>
   <packaging>jar</packaging>

documentation/jetty-documentation/pom.xml

@@ -5,10 +5,10 @@
   <parent>
     <groupId>org.eclipse.jetty.documentation</groupId>
     <artifactId>documentation</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.12-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-documentation</artifactId>
-  <packaging>pom</packaging>
+  <packaging>jar</packaging>
   <name>Documentation :: Guides</name>
 
   <properties>
@@ -49,15 +49,20 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-home</artifactId>
-      <version>${project.version}</version>
-      <type>zip</type>
-      <optional>true</optional>
+      <artifactId>jetty-infinispan-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-infinispan-embedded-query</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-infinispan-remote-query</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>

documentation/jetty-documentation/src/main/asciidoc/programming-guide/server/http/server-http-handler-use.adoc

@@ -654,3 +654,10 @@ Below you can find an example of how to setup `DefaultServlet`:
 ----
 include::../../{doc_code}/org/eclipse/jetty/docs/programming/server/http/HTTPServerDocs.java[tags=defaultServlet]
 ----
+
+If you wish to serve resources from a non-default location, then the `ResourceServlet` should be used instead of the `DefaultServlet`. Below you can find an example of how to setup both a `DefaultServlet` and a `ResourceServlet`:
+
+[source,java,indent=0]
+----
+include::../../{doc_code}/org/eclipse/jetty/docs/programming/server/http/HTTPServerDocs.java[tags=resourceServlet]
+----

documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/http/HTTPServerDocs.java

@@ -34,6 +34,7 @@
 import org.eclipse.jetty.client.ContentResponse;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.ee10.servlet.DefaultServlet;
+import org.eclipse.jetty.ee10.servlet.ResourceServlet;
 import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.ee10.webapp.WebAppContext;
@@ -1220,11 +1221,32 @@ public void defaultServlet()
         // Add the DefaultServlet to serve static content.
         ServletHolder servletHolder = context.addServlet(DefaultServlet.class, "/");
         // Configure the DefaultServlet with init-parameters.
-        servletHolder.setInitParameter("resourceBase", "/path/to/static/resources/");
+        servletHolder.setInitParameter("maxCacheSize", "8388608");
+        servletHolder.setInitParameter("dirAllowed", "true");
         servletHolder.setAsyncSupported(true);
         // end::defaultServlet[]
     }
 
+    public void resourceServlet()
+    {
+        // tag::resourceServlet[]
+        // Create a ServletContextHandler with contextPath.
+        ServletContextHandler context = new ServletContextHandler();
+        context.setContextPath("/app");
+
+        // Add the ResourceServlet to serve static content from a specific location.
+        ServletHolder servletHolder = context.addServlet(ResourceServlet.class, "/static/*");
+        // Configure the ResourceServlet with init-parameters.
+        servletHolder.setInitParameter("baseResource", "/absolute/path/to/static/resources/");
+        servletHolder.setInitParameter("pathInfoOnly", "true");
+        servletHolder.setAsyncSupported(true);
+
+        // Add the DefaultServlet to serve static content from the resource base
+        ServletHolder defaultHolder = context.addServlet(DefaultServlet.class, "/");
+        defaultHolder.setAsyncSupported(true);
+        // end::resourceServlet[]
+    }
+
     public void serverGzipHandler() throws Exception
     {
         // tag::serverGzipHandler[]

documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/server/http/HTTPServerDocs.java

@@ -1220,7 +1220,7 @@ public void defaultServlet()
         // Add the DefaultServlet to serve static content.
         ServletHolder servletHolder = context.addServlet(DefaultServlet.class, "/");
         // Configure the DefaultServlet with init-parameters.
-        servletHolder.setInitParameter("resourceBase", "/path/to/static/resources/");
+        servletHolder.setInitParameter("baseResource", "/path/to/static/resources/");
         servletHolder.setAsyncSupported(true);
         // end::defaultServlet[]
     }

documentation/pom.xml

@@ -14,5 +14,7 @@
 
   <modules>
     <module>jetty</module>
+    <module>jetty-asciidoctor-extensions</module>
+    <module>jetty-documentation</module>
   </modules>
 </project>

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java

@@ -919,6 +919,12 @@ public Request getWrapped()
         {
             return _request;
         }
+
+        @Override
+        public String toString()
+        {
+            return "%s@%x{%s}".formatted(getClass().getSimpleName(), hashCode(), getWrapped());
+        }
     }
 
     @SuppressWarnings("unchecked")