Rename servlet demos

* servlet-security to ee10-servlet-security * servlet-config to ee10-servlet-config
jetty · Feb 2, 2024 · 396a022 · 396a022
1 parent 7bf0e80
commit 396a022
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/embedded/servlet-config/pom.xml → embedded/ee10-servlet-config/pom.xml b/embedded/servlet-config/pom.xml → embedded/ee10-servlet-config/pom.xml
@@ -6,10 +6,10 @@
     <artifactId>jetty-embedded-examples</artifactId>
     <version>12.0.x</version>
   </parent>
-  <artifactId>servlet-config</artifactId>
+  <artifactId>ee10-servlet-config</artifactId>
   <version>12.0.x</version>
   <packaging>jar</packaging>
-  <name>Jetty Examples :: Jetty 12.0.x :: Embedded :: Servlet Configuration</name>
+  <name>Jetty Examples :: Jetty 12.0.x :: Embedded :: EE10 Servlet Configuration</name>
 
   <dependencies>
     <dependency>

diff --git a/...va/examples/AddFilterMultipleMapping.java → ...va/examples/AddFilterMultipleMapping.java b/...va/examples/AddFilterMultipleMapping.java → ...va/examples/AddFilterMultipleMapping.java
@@ -17,6 +17,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.util.EnumSet;
+
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterChain;
@@ -25,14 +26,12 @@
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletResponse;
-
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.ee10.servlet.DefaultServlet;
 import org.eclipse.jetty.ee10.servlet.FilterHolder;
 import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.ee10.servlet.ServletHolder;
-import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.util.resource.ResourceFactory;
 
 public class AddFilterMultipleMapping

diff --git a/...src/main/resources/static-root/hello.html → ...src/main/resources/static-root/hello.html b/...src/main/resources/static-root/hello.html → ...src/main/resources/static-root/hello.html
diff --git a/embedded/servlet-security/pom.xml → embedded/ee10-servlet-security/pom.xml b/embedded/servlet-security/pom.xml → embedded/ee10-servlet-security/pom.xml
@@ -6,10 +6,10 @@
     <artifactId>jetty-embedded-examples</artifactId>
     <version>12.0.x</version>
   </parent>
-  <artifactId>servlet-security</artifactId>
+  <artifactId>ee10-servlet-security</artifactId>
   <version>12.0.x</version>
   <packaging>jar</packaging>
-  <name>Jetty Examples :: Jetty 12.0.x :: Embedded :: Servlet Security Constraints</name>
+  <name>Jetty Examples :: Jetty 12.0.x :: Embedded :: EE10 Servlet Security Constraints</name>
 
   <dependencies>
     <dependency>

diff --git a/.../src/main/java/examples/HelloServlet.java → .../src/main/java/examples/HelloServlet.java b/.../src/main/java/examples/HelloServlet.java → .../src/main/java/examples/HelloServlet.java
@@ -14,6 +14,7 @@
 package examples;
 
 import java.io.IOException;
+
 import jakarta.servlet.ServletConfig;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServlet;

diff --git a/...les/ServletTransportGuaranteeExample.java → ...les/ServletTransportGuaranteeExample.java b/...les/ServletTransportGuaranteeExample.java → ...les/ServletTransportGuaranteeExample.java
diff --git a/...-security/src/main/resources/ssl/keystore → ...-security/src/main/resources/ssl/keystore b/...-security/src/main/resources/ssl/keystore → ...-security/src/main/resources/ssl/keystore
diff --git a/embedded/pom.xml b/embedded/pom.xml
@@ -20,6 +20,8 @@
     <module>deploying</module>
     <module>ee8-webapp-context</module>
     <module>ee10-file-server</module>
+    <module>ee10-servlet-config</module>
+    <module>ee10-servlet-security</module>
     <module>ee10-webapp-context</module>
     <module>error-handling</module>
     <module>file-server</module>
@@ -29,8 +31,6 @@
     <module>jndi</module>
     <module>redirect</module>
     <module>rewrite</module>
-    <module>servlet-config</module>
-    <module>servlet-security</module>
     <module>simple-server</module>
     <module>virtual-hosts</module>
     <module>websocket-jakarta-api</module>