Adding embedded-servlet-server 10.0.x

jetty · Feb 5, 2024 · 5a865a0 · 5a865a0
1 parent a09aef2
commit 5a865a0
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/embedded/file-server/pom.xml b/embedded/file-server/pom.xml
@@ -18,6 +18,12 @@
       <version>${jetty.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-slf4j-impl</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>

diff --git a/embedded/file-server/src/test/java/examples/ResourceHandlerFromFileSystemTest.java b/embedded/file-server/src/test/java/examples/ResourceHandlerFromFileSystemTest.java
@@ -18,7 +18,6 @@
 
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.toolchain.test.FS;
-import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -41,7 +40,7 @@ public class ResourceHandlerFromFileSystemTest
     @BeforeEach
     public void startServer() throws Exception
     {
-        Path resourcesRoot = MavenTestingUtils.getTargetTestingPath(ResourceHandlerFromFileSystemTest.class.getSimpleName());
+        Path resourcesRoot = StaticFileGen.tempDir("static-huge");
         FS.ensureDirExists(resourcesRoot);
 
         exampleSha = StaticFileGen.generate(resourcesRoot.resolve("example.png"), exampleSize);

diff --git a/embedded/file-server/src/test/java/examples/ServletFileServerMultipleLocationsTest.java b/embedded/file-server/src/test/java/examples/ServletFileServerMultipleLocationsTest.java
@@ -19,7 +19,6 @@
 
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.toolchain.test.FS;
-import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -42,7 +41,7 @@ public class ServletFileServerMultipleLocationsTest
     @BeforeEach
     public void startServer() throws Exception
     {
-        Path resourcesRoot = MavenTestingUtils.getTargetTestingPath(ServletFileServerMultipleLocations.class.getSimpleName());
+        Path resourcesRoot = StaticFileGen.tempDir("static-huge");
         FS.ensureDirExists(resourcesRoot);
 
         exampleSha = StaticFileGen.generate(resourcesRoot.resolve("example.png"), exampleSize);

diff --git a/embedded/file-server/src/test/java/examples/StaticFileGen.java b/embedded/file-server/src/test/java/examples/StaticFileGen.java
@@ -25,6 +25,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
+import org.eclipse.jetty.toolchain.test.FS;
 import org.eclipse.jetty.toolchain.test.Hex;
 import org.eclipse.jetty.toolchain.test.Sha1Sum;
 import org.eclipse.jetty.util.IO;
@@ -81,6 +82,14 @@ public static String generate(Path staticFile, long size) throws IOException, No
         return Sha1Sum.calculate(staticFile);
     }
 
+    public static Path tempDir(String directoryName)
+    {
+        Path systemTemp = Path.of(System.getProperty("java.io.tmpdir"));
+        Path tempDir = systemTemp.resolve(directoryName);
+        FS.ensureDirExists(tempDir);
+        return tempDir;
+    }
+
     public static void verify(InputStream inputStream, long expectedSize, String expectedSha1) throws NoSuchAlgorithmException, IOException
     {
         MessageDigest digest = MessageDigest.getInstance("SHA1");

diff --git a/embedded/servlet-server/pom.xml b/embedded/servlet-server/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.eclipse.jetty.examples.embedded</groupId>
     <artifactId>jetty-embedded-examples</artifactId>
-    <version>9.4.x</version>
+    <version>10.0.x</version>
   </parent>
   <artifactId>servlet-server</artifactId>
-  <version>9.4.x</version>
+  <version>10.0.x</version>
   <packaging>jar</packaging>
-  <name>Jetty Examples :: Jetty 9.4.x :: Embedded :: Servlet Server</name>
+  <name>Jetty Examples :: Jetty 10.0.x :: Embedded :: Servlet Server</name>
 
   <dependencies>
     <dependency>
@@ -18,6 +18,12 @@
       <version>${jetty.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-slf4j-impl</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>

diff --git a/embedded/servlet-server/src/main/java/examples/EmbedMe.java b/embedded/servlet-server/src/main/java/examples/EmbedMe.java
@@ -23,14 +23,14 @@
 import java.util.stream.Stream;
 
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.webapp.WebAppContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class EmbedMe
 {
-    private static final Logger LOG = Log.getLogger(EmbedMe.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EmbedMe.class);
 
     public static void main(String[] args) throws Exception
     {