diff --git a/webapps/hello-servlet-3/pom.xml b/webapps/hello-servlet-3/pom.xml
new file mode 100644
index 0000000..e176cda
--- /dev/null
+++ b/webapps/hello-servlet-3/pom.xml
@@ -0,0 +1,27 @@
+
+
+ 4.0.0
+
+ org.eclipse.jetty.examples.webapps
+ jetty-webapp-examples
+ 12.0.x
+
+ hello-servlet-3
+ 12.0.x
+ war
+ Jetty Examples :: Jetty 12.0.x :: Hello WebApp (Servlet 3.1)
+
+
+
+ javax.servlet
+ javax.servlet-api
+ 3.1.0
+ provided
+
+
+
+
+ hello
+
+
+
diff --git a/webapps/hello-servlet-3/src/main/java/examples/HelloServlet.java b/webapps/hello-servlet-3/src/main/java/examples/HelloServlet.java
new file mode 100644
index 0000000..e79e4fa
--- /dev/null
+++ b/webapps/hello-servlet-3/src/main/java/examples/HelloServlet.java
@@ -0,0 +1,45 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+package examples;
+
+import java.io.IOException;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class HelloServlet extends HttpServlet
+{
+ private String msg;
+
+ @Override
+ public void init(ServletConfig config) throws ServletException
+ {
+ super.init(config);
+
+ msg = config.getInitParameter("message");
+ if (msg == null)
+ {
+ msg = "User";
+ }
+ }
+
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException
+ {
+ response.setContentType("text/plain");
+ response.getWriter().printf("%s%n", msg);
+ }
+}
diff --git a/webapps/hello-servlet-3/src/main/webapp/WEB-INF/web.xml b/webapps/hello-servlet-3/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..debf554
--- /dev/null
+++ b/webapps/hello-servlet-3/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,26 @@
+
+
+
+ hello webapp
+
+ hello
+ examples.HelloServlet
+
+ message
+ Hello from webapps/hello
+
+
+
+
+ hello
+ /hello
+
+
+
+ hello.html
+
+
\ No newline at end of file
diff --git a/webapps/hello-servlet-3/src/main/webapp/hello.html b/webapps/hello-servlet-3/src/main/webapp/hello.html
new file mode 100644
index 0000000..4550829
--- /dev/null
+++ b/webapps/hello-servlet-3/src/main/webapp/hello.html
@@ -0,0 +1,12 @@
+
+
+ Hello Example
+
+
+This is the classpath's hello-webapp /hello.html
+
+ See the /hello
servlet output
+
+
+
+
\ No newline at end of file
diff --git a/webapps/hello/pom.xml b/webapps/hello-servlet-5/pom.xml
similarity index 70%
rename from webapps/hello/pom.xml
rename to webapps/hello-servlet-5/pom.xml
index 3bb4a37..c06a840 100644
--- a/webapps/hello/pom.xml
+++ b/webapps/hello-servlet-5/pom.xml
@@ -6,13 +6,21 @@
jetty-webapp-examples
12.0.x
- hello
+ hello-servlet-5
12.0.x
war
Jetty Examples :: Jetty 12.0.x :: Hello WebApp
+
+
+ jakarta.servlet
+ jakarta.servlet-api
+ 5.0.0
+ provided
+
+
+
hello
-
diff --git a/embedded/webapp-context/src/main/java/examples/HelloServlet.java b/webapps/hello-servlet-5/src/main/java/examples/HelloServlet.java
similarity index 99%
rename from embedded/webapp-context/src/main/java/examples/HelloServlet.java
rename to webapps/hello-servlet-5/src/main/java/examples/HelloServlet.java
index ac1d5e7..c5e5173 100644
--- a/embedded/webapp-context/src/main/java/examples/HelloServlet.java
+++ b/webapps/hello-servlet-5/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/webapps/hello/src/main/webapp/WEB-INF/web.xml b/webapps/hello-servlet-5/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapps/hello/src/main/webapp/WEB-INF/web.xml
rename to webapps/hello-servlet-5/src/main/webapp/WEB-INF/web.xml
diff --git a/webapps/hello-servlet-5/src/main/webapp/hello.html b/webapps/hello-servlet-5/src/main/webapp/hello.html
new file mode 100644
index 0000000..4550829
--- /dev/null
+++ b/webapps/hello-servlet-5/src/main/webapp/hello.html
@@ -0,0 +1,12 @@
+
+
+ Hello Example
+
+
+This is the classpath's hello-webapp /hello.html
+
+ See the /hello
servlet output
+
+
+
+
\ No newline at end of file
diff --git a/webapps/pom.xml b/webapps/pom.xml
index 372e4ed..37d8328 100644
--- a/webapps/pom.xml
+++ b/webapps/pom.xml
@@ -10,19 +10,10 @@
jetty-webapp-examples
12.0.x
pom
- Jetty Examples :: Jetty 12.0.x :: WebApps
+ Jetty Examples :: Jetty 12.0.x :: Hello WebApp (Servlet 5)
- hello
+ hello-servlet-3
+ hello-servlet-5
-
-
-
- jakarta.servlet
- jakarta.servlet-api
- 5.0.0
- provided
-
-
-