From eea3a11dd7a8f26bbaae371646efe01530728ff4 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Wed, 25 May 2022 17:35:52 +1000
Subject: [PATCH] WIP deploy ee10 and ee9 webapps.

---
 .../src/main/config/modules/ee10-security.mod |  3 +
 .../src/main/config/modules/ee10-servlet.mod  |  4 ++
 .../jetty/ee10/servlet/ServletHandler.java    |  1 +
 .../src/main/config/etc/jetty-ee10-deploy.xml | 63 +++++++++++++++++++
 ...jetty-webapp.xml => jetty-ee10-webapp.xml} |  0
 .../src/main/config/modules/ee10-deploy.mod   | 33 ++++++++++
 .../src/main/config/modules/ee10-webapp.mod   |  6 ++
 .../src/main/config/modules/ee9-webapp.mod    |  5 +-
 8 files changed, 113 insertions(+), 2 deletions(-)
 create mode 100644 jetty-ee10/jetty-ee10-webapp/src/main/config/etc/jetty-ee10-deploy.xml
 rename jetty-ee10/jetty-ee10-webapp/src/main/config/etc/{jetty-webapp.xml => jetty-ee10-webapp.xml} (100%)
 create mode 100644 jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-deploy.mod

diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod
index 749a7fe0be1..e3967377b0a 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod
+++ b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod
@@ -3,6 +3,9 @@
 [description]
 Adds servlet standard security handling to the classpath.
 
+[environment]
+ee10
+
 [depend]
 server
 
diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod
index 841043a992f..2dc317f5966 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod
+++ b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod
@@ -3,9 +3,13 @@
 [description]
 Enables standard Servlet handling.
 
+[environment]
+ee10
+
 [depend]
 server
 sessions
 
 [lib]
+lib/jetty-jakarta-servlet-api-6.0.0-SNAPSHOT.jar
 lib/jetty-ee10-servlet-${jetty.version}.jar
diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java
index 9aedc609a15..a232574c293 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java
+++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java
@@ -1503,6 +1503,7 @@ public class ServletHandler extends Handler.Wrapper
         protected void doGet(HttpServletRequest req, HttpServletResponse resp)
             throws ServletException, IOException
         {
+            //TODO
             resp.sendError(HttpServletResponse.SC_NOT_FOUND);
         }
     }
diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/jetty-ee10-deploy.xml b/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/jetty-ee10-deploy.xml
new file mode 100644
index 00000000000..32a7be79b94
--- /dev/null
+++ b/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/jetty-ee10-deploy.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
+
+<!-- =============================================================== -->
+<!-- Create the deployment manager                                   -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- The deplyment manager handles the lifecycle of deploying web    -->
+<!-- applications. Apps are provided by instances of the             -->
+<!-- AppProvider interface.                                          -->
+<!-- =============================================================== -->
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+  <Call id="DeploymentManager" name="getBean">
+    <Arg><Call class="java.lang.Class" name="forName"><Arg>org.eclipse.jetty.deploy.DeploymentManager</Arg></Call></Arg>
+  </Call>
+  <Ref refid="Environment">
+    <Call name="setAttribute">
+      <Arg>contextHandlerClass</Arg>
+      <Arg><Property name="contextHandlerClass"/></Arg>
+    </Call>
+  </Ref>
+  <Ref refid="DeploymentManager">
+    <Call name="addAppProvider">
+      <Arg>
+        <New id="WebAppProvider" class="org.eclipse.jetty.deploy.providers.ContextProvider">
+          <Set name="defaultEnvironment">ee10</Set>
+          <Set name="monitoredDirName">
+            <Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration">
+              <Arg>
+                <Property name="jetty.base" />
+              </Arg>
+              <Arg>
+                <Property name="jetty.deploy.monitoredDir" default="webapps-ee10" />
+              </Arg>
+            </Call>
+          </Set>
+          <Set name="defaultsDescriptor">
+            <Property>
+              <Name>jetty.deploy.defaultsDescriptorPath</Name>
+              <Default>
+                <Property name="jetty.home" default="." />/etc/webdefault-ee10.xml
+              </Default>
+            </Property>
+          </Set>
+          <Set name="scanInterval">
+            <Property name="jetty.deploy.scanInterval" default="1" />
+          </Set>
+          <Set name="extractWars">
+            <Property name="jetty.deploy.extractWars" default="true" />
+          </Set>
+          <Set name="configurationManager">
+            <New class="org.eclipse.jetty.deploy.PropertiesConfigurationManager">
+              <!-- file of context configuration properties
+              <Set name="file"><SystemProperty name="jetty.base"/>/etc/some.properties</Set>
+              -->
+              <!-- set a context configuration property
+              <Call name="put"><Arg>name</Arg><Arg>value</Arg></Call>
+              -->
+            </New>
+          </Set>
+        </New>
+      </Arg>
+    </Call>
+  </Ref>
+</Configure>
diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/jetty-webapp.xml b/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/jetty-ee10-webapp.xml
similarity index 100%
rename from jetty-ee10/jetty-ee10-webapp/src/main/config/etc/jetty-webapp.xml
rename to jetty-ee10/jetty-ee10-webapp/src/main/config/etc/jetty-ee10-webapp.xml
diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-deploy.mod b/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-deploy.mod
new file mode 100644
index 00000000000..b97198291ea
--- /dev/null
+++ b/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-deploy.mod
@@ -0,0 +1,33 @@
+[description]
+Enables web application deployment from the $JETTY_BASE/webapps/ directory.
+
+[environment]
+ee10
+
+[depend]
+deploy
+ee10-webapp
+
+[lib]
+
+[files]
+webapps-ee10/
+
+[xml]
+etc/jetty-ee10-deploy.xml
+
+[ini-template]
+# Monitored directory name (relative to $jetty.base)
+# jetty.deploy.monitoredDir=webapps-ee10
+# - OR -
+# Monitored directory path (fully qualified)
+# jetty.deploy.monitoredPath=/var/www/webapps-ee10
+
+# Defaults Descriptor for all deployed webapps
+# jetty.deploy.defaultsDescriptorPath=${jetty.base}/etc/webdefault-ee10.xml
+
+# Monitored directory scan period (seconds)
+# jetty.deploy.scanInterval=1
+
+# Whether to extract *.war files
+# jetty.deploy.extractWars=true
diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod b/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod
index d4afd0f30e1..862f21df770 100644
--- a/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod
+++ b/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod
@@ -4,6 +4,9 @@
 Adds support for servlet specification web applications to the server classpath.
 Without this, only Jetty-specific handlers may be deployed.
 
+[environment]
+ee10
+
 [depend]
 ee10-servlet
 ee10-security
@@ -30,5 +33,8 @@ lib/jetty-ee10-webapp-${jetty.version}.jar
 #jetty.webapp.addSystemClasses+=,org.example.
 #jetty.webapp.addServerClasses+=,org.example.
 
+[ini]
+contextHandlerClass=org.eclipse.jetty.ee10.webapp.WebAppContext
+
 [jpms]
 add-modules:java.instrument
diff --git a/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod b/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod
index 24d987469dd..46d6a77bb81 100644
--- a/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod
+++ b/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod
@@ -17,7 +17,6 @@ etc/jetty-ee9-webapp.xml
 [lib]
 lib/jetty-ee9-webapp-${jetty.version}.jar
 
-
 [ini-template]
 ## Add to the server wide default jars and packages protected or hidden from webapps.
 ## System classes are protected and cannot be overridden by a webapp.
@@ -33,7 +32,9 @@ lib/jetty-ee9-webapp-${jetty.version}.jar
 ##
 #jetty.webapp.addSystemClasses+=,org.example.
 #jetty.webapp.addServerClasses+=,org.example.
-contextHandlerClass = org.eclipse.jetty.ee9.webapp.WebAppContext
+
+[ini]
+contextHandlerClass=org.eclipse.jetty.ee9.webapp.WebAppContext
 
 [jpms]
 add-modules:java.instrument