From 43c662a3ac51101b35f96d497d5bcf7a1cbce41d Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Mon, 30 May 2022 18:50:23 +1000
Subject: [PATCH] Fix more ee10 modules.

---
 .../config/etc/jetty-rewrite-customizer.xml   |   2 +
 .../src/main/config/etc/jetty-rewrite.xml     |   5 +-
 .../java/org/eclipse/jetty/server/Server.java |   3 +-
 .../jetty/util/component/Environment.java     |   7 +++
 .../{annotations.mod => ee10-annotations.mod} |  10 ++--
 .../{apache-jsp.mod => ee10-apache-jsp.mod}   |   7 ++-
 .../cdi/{jetty-cdi.xml => jetty-ee10-cdi.xml} |   0
 ...cdi-decorate.mod => ee10-cdi-decorate.mod} |   5 +-
 .../modules/{cdi-spi.mod => ee10-cdi-spi.mod} |   5 +-
 .../config/modules/{cdi.mod => ee10-cdi.mod}  |   7 ++-
 .../main/config/modules/demo-ee10-jaas.mod    |   2 +-
 .../config/modules/demo.d/demo-ee10-jaas.xml  |   4 +-
 .../main/config/modules/demo-ee10-jetty.mod   |   6 +--
 .../config/modules/demo.d/demo-ee10-jetty.xml |   4 +-
 .../demo.d/demo-ee10-rewrite-rules.xml        |  45 +++++++----------
 .../config/modules/demo.d/demo-ee10-jndi.xml  |   2 +-
 .../src/main/config/modules/demo-ee10-jsp.mod |   4 +-
 .../modules/demo-ee10-mock-resources.mod      |   5 +-
 .../main/config/modules/demo-ee10-spec.mod    |   8 +--
 .../config/modules/demo.d/demo-ee10-spec.xml  |   2 +-
 ...sfish-jstl.mod => ee10-glassfish-jstl.mod} |   5 +-
 .../{jetty-jaas.xml => jetty-ee10-jaas.xml}   |   0
 .../modules/{jaas.mod => ee10-jaas.mod}       |   7 ++-
 ... => jetty-ee10-jaspi-authmoduleconfig.xml} |   0
 ...fault.xml => jetty-ee10-jaspi-default.xml} |   2 +-
 ...spi-demo.xml => jetty-ee10-jaspi-demo.xml} |   8 +--
 ...e10-jaspi-default-auth-config-factory.mod} |   7 ++-
 .../{jaspi-demo.mod => ee10-jaspi-demo.mod}   |   7 ++-
 .../src/main/config/modules/ee10-jaspi.mod    |  25 ++++++++++
 .../src/main/config/modules/jaspi.mod         |  22 --------
 ...jetty-openid.xml => jetty-ee10-openid.xml} |   0
 .../modules/{openid.mod => ee10-openid.mod}   |  15 +++---
 ...=> jetty-ee10-openid-baseloginservice.xml} |   4 +-
 .../{jetty-plus.xml => jetty-ee10-plus.xml}   |   0
 .../src/main/config/modules/ee10-plus.mod     |  15 ++++++
 .../src/main/config/modules/plus.mod          |  12 -----
 .../{jetty-proxy.xml => jetty-ee10-proxy.xml} |   0
 .../modules/{proxy.mod => ee10-proxy.mod}     |  11 ++--
 ...ickstart.xml => jetty-ee10-quickstart.xml} |   2 +-
 .../{quickstart.mod => ee10-quickstart.mod}   |   9 ++--
 ...p.xml => jetty-ee10-quickstart-webapp.xml} |   0
 .../ee10/servlet/ServletContextHandler.java   |   3 +-
 .../{servlets.mod => ee10-servlets.mod}       |   7 ++-
 .../jetty/ee10/webapp/JaasConfiguration.java  |   2 +-
 .../jetty/ee10/webapp/JaspiConfiguration.java |   2 +-
 .../jetty/ee10/webapp/JspConfiguration.java   |   2 +-
 .../jetty/ee10/webapp/WebAppContext.java      |   6 +++
 .../config/modules/ee10-websocket-jakarta.mod |  27 ++++++++++
 .../main/config/modules/websocket-jakarta.mod |  24 ---------
 .../config/JakartaWebSocketConfiguration.java |   8 +--
 .../modules/ee10-websocket-jetty-client.mod   |  26 ++++++++++
 .../config/modules/websocket-jetty-client.mod |  23 ---------
 .../config/modules/ee10-websocket-jetty.mod   |  24 +++++++++
 .../main/config/modules/websocket-jetty.mod   |  21 --------
 jetty-home/pom.xml                            |  47 +++++++++++-------
 .../src/main/resources/modules/demo-realm.mod |  21 --------
 .../src/main/resources/modules/demo-root.mod  |  19 -------
 ...rties => jetty-ee10-demo-realm.properties} |   0
 ...mo-realm.xml => jetty-ee10-demo-realm.xml} |   4 +-
 .../{root => root-ee10}/images/jetty-pic.png  | Bin
 .../images/webtide_logo.jpg                   | Bin
 .../demo.d/{root => root-ee10}/index.html     |   0
 .../demo.d/{root => root-ee10}/jetty.css      |   0
 .../resources/modules/ee10-demo-realm.mod     |  24 +++++++++
 .../main/resources/modules/ee10-demo-root.mod |  22 ++++++++
 .../modules/{demo.mod => ee10-demo.mod}       |  23 +++++----
 .../modules/{jsp.mod => ee10-jsp.mod}         |  10 ++--
 .../modules/{jstl.mod => ee10-jstl.mod}       |   8 +--
 68 files changed, 365 insertions(+), 272 deletions(-)
 rename jetty-ee10/jetty-ee10-annotations/src/main/config/modules/{annotations.mod => ee10-annotations.mod} (68%)
 rename jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/{apache-jsp.mod => ee10-apache-jsp.mod} (78%)
 rename jetty-ee10/jetty-ee10-cdi/src/main/config/etc/cdi/{jetty-cdi.xml => jetty-ee10-cdi.xml} (100%)
 rename jetty-ee10/jetty-ee10-cdi/src/main/config/modules/{cdi-decorate.mod => ee10-cdi-decorate.mod} (92%)
 rename jetty-ee10/jetty-ee10-cdi/src/main/config/modules/{cdi-spi.mod => ee10-cdi-spi.mod} (91%)
 rename jetty-ee10/jetty-ee10-cdi/src/main/config/modules/{cdi.mod => ee10-cdi.mod} (91%)
 rename jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/{glassfish-jstl.mod => ee10-glassfish-jstl.mod} (77%)
 rename jetty-ee10/jetty-ee10-jaas/src/main/config/etc/{jetty-jaas.xml => jetty-ee10-jaas.xml} (100%)
 rename jetty-ee10/jetty-ee10-jaas/src/main/config/modules/{jaas.mod => ee10-jaas.mod} (80%)
 rename jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/{jaspi-authmoduleconfig.xml => jetty-ee10-jaspi-authmoduleconfig.xml} (100%)
 rename jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/{jaspi-default.xml => jetty-ee10-jaspi-default.xml} (94%)
 rename jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/{jaspi-demo.xml => jetty-ee10-jaspi-demo.xml} (85%)
 rename jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/{jaspi-default-auth-config-factory.mod => ee10-jaspi-default-auth-config-factory.mod} (75%)
 rename jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/{jaspi-demo.mod => ee10-jaspi-demo.mod} (61%)
 create mode 100644 jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod
 delete mode 100644 jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/jaspi.mod
 rename jetty-ee10/jetty-ee10-openid/src/main/config/etc/{jetty-openid.xml => jetty-ee10-openid.xml} (100%)
 rename jetty-ee10/jetty-ee10-openid/src/main/config/modules/{openid.mod => ee10-openid.mod} (81%)
 rename jetty-ee10/jetty-ee10-openid/src/main/config/modules/openid/{openid-baseloginservice.xml => jetty-ee10-openid-baseloginservice.xml} (78%)
 rename jetty-ee10/jetty-ee10-plus/src/main/config/etc/{jetty-plus.xml => jetty-ee10-plus.xml} (100%)
 create mode 100644 jetty-ee10/jetty-ee10-plus/src/main/config/modules/ee10-plus.mod
 delete mode 100644 jetty-ee10/jetty-ee10-plus/src/main/config/modules/plus.mod
 rename jetty-ee10/jetty-ee10-proxy/src/main/config/etc/{jetty-proxy.xml => jetty-ee10-proxy.xml} (100%)
 rename jetty-ee10/jetty-ee10-proxy/src/main/config/modules/{proxy.mod => ee10-proxy.mod} (71%)
 rename jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/{jetty-quickstart.xml => jetty-ee10-quickstart.xml} (93%)
 rename jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/{quickstart.mod => ee10-quickstart.mod} (65%)
 rename jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/jetty-quickstart.d/{quickstart-webapp.xml => jetty-ee10-quickstart-webapp.xml} (100%)
 rename jetty-ee10/jetty-ee10-servlets/src/main/config/modules/{servlets.mod => ee10-servlets.mod} (82%)
 create mode 100644 jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod
 delete mode 100644 jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/websocket-jakarta.mod
 create mode 100644 jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/config/modules/ee10-websocket-jetty-client.mod
 delete mode 100644 jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod
 create mode 100644 jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/config/modules/ee10-websocket-jetty.mod
 delete mode 100644 jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/config/modules/websocket-jetty.mod
 delete mode 100644 jetty-home/src/main/resources/modules/demo-realm.mod
 delete mode 100644 jetty-home/src/main/resources/modules/demo-root.mod
 rename jetty-home/src/main/resources/modules/demo.d/{demo-realm.properties => jetty-ee10-demo-realm.properties} (100%)
 rename jetty-home/src/main/resources/modules/demo.d/{demo-realm.xml => jetty-ee10-demo-realm.xml} (87%)
 rename jetty-home/src/main/resources/modules/demo.d/{root => root-ee10}/images/jetty-pic.png (100%)
 rename jetty-home/src/main/resources/modules/demo.d/{root => root-ee10}/images/webtide_logo.jpg (100%)
 rename jetty-home/src/main/resources/modules/demo.d/{root => root-ee10}/index.html (100%)
 rename jetty-home/src/main/resources/modules/demo.d/{root => root-ee10}/jetty.css (100%)
 create mode 100644 jetty-home/src/main/resources/modules/ee10-demo-realm.mod
 create mode 100644 jetty-home/src/main/resources/modules/ee10-demo-root.mod
 rename jetty-home/src/main/resources/modules/{demo.mod => ee10-demo.mod} (66%)
 rename jetty-home/src/main/resources/modules/{jsp.mod => ee10-jsp.mod} (73%)
 rename jetty-home/src/main/resources/modules/{jstl.mod => ee10-jstl.mod} (79%)

diff --git a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml
index 6a9bf7999c2..b09acc466cd 100644
--- a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml
+++ b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml
@@ -4,6 +4,7 @@
   <!-- =========================================================== -->
   <!-- configure rewrite rule container as a customizer            -->
   <!-- =========================================================== -->
+  <!-- TODO no longer needed?
   <Call name="addCustomizer">
     <Arg>
       <New id="Rewrite" class="org.eclipse.jetty.rewrite.RewriteCustomizer">
@@ -13,5 +14,6 @@
       </New>
     </Arg>
   </Call>  
+  -->
 </Configure>
 
diff --git a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml
index 811db939e40..33729e7cd92 100644
--- a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml
+++ b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml
@@ -8,19 +8,22 @@
   <Call name="insertHandler">
     <Arg>
       <New class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
+        <!-- TODO
         <Set name="rewriteRequestURI" property="jetty.rewrite.rewriteRequestURI"/>
         <Set name="rewritePathInfo" property="jetty.rewrite.rewritePathInfo"/>
+        -->
         <Set name="originalPathAttribute"><Property name="jetty.rewrite.originalPathAttribute" default="requestedPath"/></Set>
      
 	    <!-- Set DispatcherTypes  -->
+        <!-- TODO
 	    <Set name="dispatcherTypes">
 	      <Array type="jakarta.servlet.DispatcherType">
 	        <Item><Call class="jakarta.servlet.DispatcherType" name="valueOf"><Arg>REQUEST</Arg></Call></Item>
 	        <Item><Call class="jakarta.servlet.DispatcherType" name="valueOf"><Arg>ASYNC</Arg></Call></Item>
 	      </Array>
     	</Set>
-
         <Get id="Rewrite" name="ruleContainer" />
+        -->
         <!-- see rewrite-rules.xml in $JETTY_BASE for how to add a rule(s) -->
       </New>
     </Arg>
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
index c5521981935..5c84d73a85e 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
@@ -42,6 +42,7 @@ import org.eclipse.jetty.util.Uptime;
 import org.eclipse.jetty.util.annotation.ManagedAttribute;
 import org.eclipse.jetty.util.annotation.Name;
 import org.eclipse.jetty.util.component.AttributeContainerMap;
+import org.eclipse.jetty.util.component.DumpableCollection;
 import org.eclipse.jetty.util.component.Environment;
 import org.eclipse.jetty.util.component.Graceful;
 import org.eclipse.jetty.util.component.LifeCycle;
@@ -647,7 +648,7 @@ public class Server extends Handler.Wrapper implements Attributes
     @Override
     public void dump(Appendable out, String indent) throws IOException
     {
-        dumpObjects(out, indent, new ClassLoaderDump(this.getClass().getClassLoader()));
+        dumpObjects(out, indent, new ClassLoaderDump(this.getClass().getClassLoader()), new DumpableCollection("environments", Environment.getAll()));
     }
 
     public static void main(String... args)
diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/Environment.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/Environment.java
index 6591027463c..463816c279a 100644
--- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/Environment.java
+++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/Environment.java
@@ -14,6 +14,8 @@
 package org.eclipse.jetty.util.component;
 
 import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +26,11 @@ public interface Environment extends Attributes
 {
     Environment CORE = ensure("core");
 
+    static Collection<Environment> getAll()
+    {
+        return Collections.unmodifiableCollection(Named.__environments.values());
+    }
+    
     static Environment get(String name)
     {
         return Named.__environments.get(name);
diff --git a/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/annotations.mod b/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod
similarity index 68%
rename from jetty-ee10/jetty-ee10-annotations/src/main/config/modules/annotations.mod
rename to jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod
index ec6a976386d..ca8274bd10e 100644
--- a/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/annotations.mod
+++ b/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod
@@ -3,13 +3,15 @@
 [description]
 Enables Annotation scanning for deployed web applications.
 
+[environment]
+ee10
+
 [depend]
-plus
+ee10-plus
 
 [lib]
-lib/jetty-annotations-${jetty.version}.jar
-lib/annotations/*.jar
+lib/jetty-ee10-annotations-${jetty.version}.jar
+lib/ee10-annotations/*.jar
 
 [jpms]
 add-modules:org.objectweb.asm
-
diff --git a/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/apache-jsp.mod b/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod
similarity index 78%
rename from jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/apache-jsp.mod
rename to jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod
index 00e801cd81f..cc2246a3f67 100644
--- a/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/apache-jsp.mod
+++ b/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod
@@ -3,6 +3,9 @@
 [description]
 Enables use of the apache implementation of JSP.
 
-[lib]
-lib/apache-jsp/*.jar
+[environment]
+ee10
+
+[lib]
+lib/ee10-apache-jsp/*.jar
 
diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/config/etc/cdi/jetty-cdi.xml b/jetty-ee10/jetty-ee10-cdi/src/main/config/etc/cdi/jetty-ee10-cdi.xml
similarity index 100%
rename from jetty-ee10/jetty-ee10-cdi/src/main/config/etc/cdi/jetty-cdi.xml
rename to jetty-ee10/jetty-ee10-cdi/src/main/config/etc/cdi/jetty-ee10-cdi.xml
diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/cdi-decorate.mod b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod
similarity index 92%
rename from jetty-ee10/jetty-ee10-cdi/src/main/config/modules/cdi-decorate.mod
rename to jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod
index f222fa0fbaf..f59f540a473 100644
--- a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/cdi-decorate.mod
+++ b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod
@@ -4,6 +4,9 @@
 Configures Jetty to use the "CdiDecoratingListener" as the default CDI mode.
 This mode that allows a webapp to register it's own CDI decorator.
 
+[environment]
+ee10
+
 [tag]
 cdi
 
@@ -11,7 +14,7 @@ cdi
 cdi-mode
 
 [depend]
-cdi
+ee10-cdi
 
 [ini]
 jetty.cdi.mode=CdiDecoratingListener
diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/cdi-spi.mod b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod
similarity index 91%
rename from jetty-ee10/jetty-ee10-cdi/src/main/config/modules/cdi-spi.mod
rename to jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod
index c608e93e653..fab2f044126 100644
--- a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/cdi-spi.mod
+++ b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod
@@ -4,6 +4,9 @@
 Configures Jetty to use the "CdiSpiDecorator" as the default CDI mode.
 This mode uses the CDI SPI to integrate an arbitrary CDI implementation.
 
+[environment]
+ee10
+
 [tag]
 cdi
 
@@ -11,7 +14,7 @@ cdi
 cdi-mode
 
 [depend]
-cdi
+ee10-cdi
 
 [ini]
 jetty.cdi.mode=CdiSpiDecorator
diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/cdi.mod b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod
similarity index 91%
rename from jetty-ee10/jetty-ee10-cdi/src/main/config/modules/cdi.mod
rename to jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod
index 3b0aa310bc9..b661f5d2e00 100644
--- a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/cdi.mod
+++ b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod
@@ -13,6 +13,9 @@ CdiSpiDecorator     - Jetty will call the CDI SPI within the webapp to decorate
 CdiDecoratingLister - The webapp may register a decorator on the context attribute
                       "org.eclipse.jetty.ee10.cdi.decorator".
 
+[environment]
+ee10
+
 [tag]
 cdi
 
@@ -23,7 +26,7 @@ cdi
 deploy
 
 [xml]
-etc/cdi/jetty-cdi.xml
+etc/cdi/jetty-ee10-cdi.xml
 
 [lib]
-lib/jetty-cdi-${jetty.version}.jar
+lib/jetty-ee10-cdi-${jetty.version}.jar
diff --git a/jetty-ee10/jetty-ee10-demos/demo-ee10-jaas-webapp/src/main/config/modules/demo-ee10-jaas.mod b/jetty-ee10/jetty-ee10-demos/demo-ee10-jaas-webapp/src/main/config/modules/demo-ee10-jaas.mod
index 74e805bf4ba..e95e983e659 100644
--- a/jetty-ee10/jetty-ee10-demos/demo-ee10-jaas-webapp/src/main/config/modules/demo-ee10-jaas.mod
+++ b/jetty-ee10/jetty-ee10-demos/demo-ee10-jaas-webapp/src/main/config/modules/demo-ee10-jaas.mod
@@ -14,7 +14,7 @@ webapp
 ee10-deploy
 ee10-jaas
 jdbc
-jsp
+ee10-jsp
 ee10-annotations
 ext
 
diff --git a/jetty-ee10/jetty-ee10-demos/demo-ee10-jaas-webapp/src/main/config/modules/demo.d/demo-ee10-jaas.xml b/jetty-ee10/jetty-ee10-demos/demo-ee10-jaas-webapp/src/main/config/modules/demo.d/demo-ee10-jaas.xml
index 5a38dbb2c5b..ef01a304755 100644
--- a/jetty-ee10/jetty-ee10-demos/demo-ee10-jaas-webapp/src/main/config/modules/demo.d/demo-ee10-jaas.xml
+++ b/jetty-ee10/jetty-ee10-demos/demo-ee10-jaas-webapp/src/main/config/modules/demo.d/demo-ee10-jaas.xml
@@ -7,14 +7,14 @@
 <Configure id='wac' class="org.eclipse.jetty.ee10.webapp.WebAppContext">
 
   <Set name="contextPath">/test-jaas</Set>
-  <Set name="war"><Property name="jetty.webapps" default="." />/demo-jaas.war
+  <Set name="war"><Property name="jetty.webapps" default="." />/demo-ee10-jaas.war
   </Set>
   <Set name="extractWAR">true</Set>
 
   <Set name="securityHandler">
     <New class="org.eclipse.jetty.ee10.servlet.security.ConstraintSecurityHandler">
      <Set name="loginService">
-       <New class="org.eclipse.jetty.jaas.JAASLoginService">
+       <New class="org.eclipse.jetty.ee10.jaas.JAASLoginService">
          <Set name="name">Demo JAAS Realm</Set>
          <Set name="loginModuleName">xyz</Set>
        </New>
diff --git a/jetty-ee10/jetty-ee10-demos/demo-ee10-jetty-webapp/src/main/config/modules/demo-ee10-jetty.mod b/jetty-ee10/jetty-ee10-demos/demo-ee10-jetty-webapp/src/main/config/modules/demo-ee10-jetty.mod
index 6f017256eb4..30e985aa2bd 100644
--- a/jetty-ee10/jetty-ee10-demos/demo-ee10-jetty-webapp/src/main/config/modules/demo-ee10-jetty.mod
+++ b/jetty-ee10/jetty-ee10-demos/demo-ee10-jetty-webapp/src/main/config/modules/demo-ee10-jetty.mod
@@ -13,8 +13,8 @@ ee10
 [depends]
 ee10-deploy
 jdbc
-jsp
-jstl
+ee10-jsp
+ee10-jstl
 ee10-annotations
 ext
 ee10-servlets
@@ -23,7 +23,7 @@ ee10-websocket-jetty
 ee10-demo-realm
 
 [files]
-webapps/demo-ee10-jetty.d/
+webapps-ee10/demo-ee10-jetty.d/
 basehome:modules/demo.d/demo-ee10-jetty.xml|webapps-ee10/demo-ee10-jetty.xml
 basehome:modules/demo.d/demo-ee10-jetty-override-web.xml|webapps-ee10/demo-ee10-jetty.d/demo-ee10-jetty-override-web.xml
 maven://org.eclipse.jetty.ee10.demos/demo-ee10-jetty-webapp/${jetty.version}/war|webapps-ee10/demo-ee10-jetty.war
diff --git a/jetty-ee10/jetty-ee10-demos/demo-ee10-jetty-webapp/src/main/config/modules/demo.d/demo-ee10-jetty.xml b/jetty-ee10/jetty-ee10-demos/demo-ee10-jetty-webapp/src/main/config/modules/demo.d/demo-ee10-jetty.xml
index b1bc0d12410..bd37172e9c9 100644
--- a/jetty-ee10/jetty-ee10-demos/demo-ee10-jetty-webapp/src/main/config/modules/demo.d/demo-ee10-jetty.xml
+++ b/jetty-ee10/jetty-ee10-demos/demo-ee10-jetty-webapp/src/main/config/modules/demo.d/demo-ee10-jetty.xml
@@ -13,7 +13,7 @@ Configure and deploy the test web application
   <!--  + war OR resourceBase                                          -->
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
   <Set name="contextPath">/test</Set>
-  <Set name="war"><Property name="jetty.webapps" default="." />/demo-jetty.war
+  <Set name="war"><Property name="jetty.webapps" default="." />/demo-ee10-jetty.war
   </Set>
 
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -22,7 +22,7 @@ Configure and deploy the test web application
   <Set name="extractWAR">true</Set>
   <Set name="copyWebDir">false</Set>
   <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault-ee10.xml</Set>
-  <Set name="overrideDescriptor"><Property name="jetty.webapps" default="." />/demo-jetty.d/demo-jetty-override-web.xml
+  <Set name="overrideDescriptor"><Property name="jetty.webapps" default="." />/demo-jetty.d/demo-ee10-jetty-override-web.xml
   </Set>
   
   <!-- Enable WebSocket container -->
diff --git a/jetty-ee10/jetty-ee10-demos/demo-ee10-jetty-webapp/src/main/config/modules/demo.d/demo-ee10-rewrite-rules.xml b/jetty-ee10/jetty-ee10-demos/demo-ee10-jetty-webapp/src/main/config/modules/demo.d/demo-ee10-rewrite-rules.xml
index cedd98cd877..9d628233281 100644
--- a/jetty-ee10/jetty-ee10-demos/demo-ee10-jetty-webapp/src/main/config/modules/demo.d/demo-ee10-rewrite-rules.xml
+++ b/jetty-ee10/jetty-ee10-demos/demo-ee10-jetty-webapp/src/main/config/modules/demo.d/demo-ee10-rewrite-rules.xml
@@ -10,20 +10,13 @@
   <!-- Add rewrite rules                                             -->
   <!-- ============================================================= -->
   <Ref refid="Rewrite">
-      <!-- Add rule to protect against IE ssl bug -->
-      <Call name="addRule">
-        <Arg>
-          <New class="org.eclipse.jetty.rewrite.handler.MsieSslRule"/>
-        </Arg>
-      </Call>
-
       <!-- protect favicon handling -->
       <Call name="addRule">
         <Arg>
           <New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
-            <Set name="pattern">/favicon.ico</Set>
-            <Set name="name">Cache-Control</Set>
-            <Set name="value">Max-Age=3600,public</Set>
+            <Arg>/favicon.ico</Arg>
+            <Arg>Cache-Control</Arg>
+            <Arg>Max-Age=3600,public</Arg>
             <Set name="terminating">true</Set>
           </New>
         </Arg>
@@ -33,8 +26,8 @@
       <Call name="addRule">
         <Arg>
           <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
-            <Set name="pattern">/test/rewrite/</Set>
-            <Set name="replacement">/test/rewrite/info.html</Set>
+            <Arg>/test/rewrite/</Arg>
+            <Arg>/test/rewrite/info.html</Arg>
           </New>
         </Arg>
       </Call>
@@ -43,8 +36,8 @@
       <Call name="addRule">
         <Arg>
           <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
-            <Set name="pattern">/test/some/old/context</Set>
-            <Set name="replacement">/test/rewritten/newcontext</Set>
+            <Arg>/test/some/old/context</Arg>
+            <Arg>/test/rewritten/newcontext</Arg>
           </New>
         </Arg>
       </Call>
@@ -53,8 +46,8 @@
       <Call name="addRule">
         <Arg>
           <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
-            <Set name="pattern">/test/rewrite/for/*</Set>
-            <Set name="replacement">/test/rewritten/</Set>
+            <Arg>/test/rewrite/for/*</Arg>
+            <Arg>/test/rewritten/</Arg>
           </New>
         </Arg>
       </Call>
@@ -63,8 +56,8 @@
       <Call name="addRule">
         <Arg>
           <New class="org.eclipse.jetty.rewrite.handler.RewriteRegexRule">
-            <Set name="regex">(.*?)/reverse/([^/]*)/(.*)</Set>
-            <Set name="replacement">$1/reverse/$3/$2</Set>
+            <Arg>(.*?)/reverse/([^/]*)/(.*)</Arg>
+            <Arg>$1/reverse/$3/$2</Arg>
           </New>
         </Arg>
       </Call>
@@ -73,9 +66,9 @@
       <Call name="addRule">
         <Arg>
           <New class="org.eclipse.jetty.rewrite.handler.CookiePatternRule">
-            <Set name="pattern">/*</Set>
-            <Set name="name">visited</Set>
-            <Set name="value">yes</Set>
+            <Arg>/*</Arg>
+            <Arg>visited</Arg>
+            <Arg>yes</Arg>
           </New>
         </Arg>
       </Call>
@@ -84,8 +77,8 @@
       <Call name="addRule">
         <Arg>
           <New class="org.eclipse.jetty.rewrite.handler.RedirectPatternRule">
-            <Set name="pattern">/test/redirect/*</Set>
-            <Set name="location">/test/redirected</Set>
+            <Arg>/test/redirect/*</Arg>
+            <Arg>/test/redirected</Arg>
           </New>
         </Arg>
       </Call>
@@ -94,9 +87,9 @@
       <Call name="addRule">
         <Arg>
            <New class="org.eclipse.jetty.rewrite.handler.ResponsePatternRule">
-             <Set name="pattern">/400Error</Set>
-             <Set name="code">400</Set>
-             <Set name="message">ResponsePatternRule Demo</Set>
+             <Arg>/400Error</Arg>
+             <Arg type="int">400</Arg>
+             <Arg>ResponsePatternRuleDemo</Arg>
           </New>
         </Arg>
       </Call>
diff --git a/jetty-ee10/jetty-ee10-demos/demo-ee10-jndi-webapp/src/main/config/modules/demo.d/demo-ee10-jndi.xml b/jetty-ee10/jetty-ee10-demos/demo-ee10-jndi-webapp/src/main/config/modules/demo.d/demo-ee10-jndi.xml
index 4268592a1dd..3f6b9e311bb 100644
--- a/jetty-ee10/jetty-ee10-demos/demo-ee10-jndi-webapp/src/main/config/modules/demo.d/demo-ee10-jndi.xml
+++ b/jetty-ee10/jetty-ee10-demos/demo-ee10-jndi-webapp/src/main/config/modules/demo.d/demo-ee10-jndi.xml
@@ -12,7 +12,7 @@
   </New>
 
   <Set name="contextPath">/test-jndi</Set>
-  <Set name="war"><Property name="jetty.webapps" default="." />/demo-jndi.war
+  <Set name="war"><Property name="jetty.webapps" default="." />/demo-ee10-jndi.war
   </Set>
   <Set name="extractWAR">true</Set>
   <Set name="copyWebDir">false</Set>
diff --git a/jetty-ee10/jetty-ee10-demos/demo-ee10-jsp-webapp/src/main/config/modules/demo-ee10-jsp.mod b/jetty-ee10/jetty-ee10-demos/demo-ee10-jsp-webapp/src/main/config/modules/demo-ee10-jsp.mod
index 89e803bc188..dd54ac4f358 100644
--- a/jetty-ee10/jetty-ee10-demos/demo-ee10-jsp-webapp/src/main/config/modules/demo-ee10-jsp.mod
+++ b/jetty-ee10/jetty-ee10-demos/demo-ee10-jsp-webapp/src/main/config/modules/demo-ee10-jsp.mod
@@ -9,8 +9,8 @@ demo
 webapp
 
 [depends]
-jsp
-jstl
+ee10-jsp
+ee10-jstl
 ee10-deploy
 
 [files]
diff --git a/jetty-ee10/jetty-ee10-demos/demo-ee10-mock-resources/src/main/config/modules/demo-ee10-mock-resources.mod b/jetty-ee10/jetty-ee10-demos/demo-ee10-mock-resources/src/main/config/modules/demo-ee10-mock-resources.mod
index 99beada1282..a62f8625499 100644
--- a/jetty-ee10/jetty-ee10-demos/demo-ee10-mock-resources/src/main/config/modules/demo-ee10-mock-resources.mod
+++ b/jetty-ee10/jetty-ee10-demos/demo-ee10-mock-resources/src/main/config/modules/demo-ee10-mock-resources.mod
@@ -13,5 +13,8 @@ demo
 jdbc
 ee10-annotations
 
+[lib]
+lib/demo-ee10-mock-resources-${jetty.version}.jar
+
 [files]
-maven://org.eclipse.jetty.ee10.demos/demo-ee10-mock-resources/${jetty.version}/jar|lib/ext/demo-ee10-mock-resources-${jetty.version}.jar
+maven://org.eclipse.jetty.ee10.demos/demo-ee10-mock-resources/${jetty.version}/jar|lib/demo-ee10-mock-resources-${jetty.version}.jar
diff --git a/jetty-ee10/jetty-ee10-demos/demo-ee10-spec/demo-ee10-spec-webapp/src/main/config/modules/demo-ee10-spec.mod b/jetty-ee10/jetty-ee10-demos/demo-ee10-spec/demo-ee10-spec-webapp/src/main/config/modules/demo-ee10-spec.mod
index 3e74d5118a3..d354fd91d13 100644
--- a/jetty-ee10/jetty-ee10-demos/demo-ee10-spec/demo-ee10-spec-webapp/src/main/config/modules/demo-ee10-spec.mod
+++ b/jetty-ee10/jetty-ee10-demos/demo-ee10-spec/demo-ee10-spec-webapp/src/main/config/modules/demo-ee10-spec.mod
@@ -13,11 +13,11 @@ webapp
 [depends]
 deploy
 jdbc
-jsp
-annotations
+ee10-jsp
+ee10-annotations
 ext
-demo-realm
-demo-mock-resources
+ee10-demo-realm
+demo-ee10-mock-resources
 
 [files]
 basehome:modules/demo.d/demo-ee10-spec.xml|webapps-ee10/demo-ee10-spec.xml
diff --git a/jetty-ee10/jetty-ee10-demos/demo-ee10-spec/demo-ee10-spec-webapp/src/main/config/modules/demo.d/demo-ee10-spec.xml b/jetty-ee10/jetty-ee10-demos/demo-ee10-spec/demo-ee10-spec-webapp/src/main/config/modules/demo.d/demo-ee10-spec.xml
index 9854cf11e9f..1a6edc1aee0 100644
--- a/jetty-ee10/jetty-ee10-demos/demo-ee10-spec/demo-ee10-spec-webapp/src/main/config/modules/demo.d/demo-ee10-spec.xml
+++ b/jetty-ee10/jetty-ee10-demos/demo-ee10-spec/demo-ee10-spec-webapp/src/main/config/modules/demo.d/demo-ee10-spec.xml
@@ -3,7 +3,7 @@
 
 <Configure id="wac" class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Set name="contextPath">/test-spec</Set>
-  <Set name="war"><Property name="jetty.webapps" />/demo-spec.war
+  <Set name="war"><Property name="jetty.webapps" />/demo-ee10-spec.war
   </Set>
   <Set name="configurationDiscovered">true</Set>
 
diff --git a/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/glassfish-jstl.mod b/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod
similarity index 77%
rename from jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/glassfish-jstl.mod
rename to jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod
index 1b6a0b01562..55a7ab58041 100644
--- a/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/glassfish-jstl.mod
+++ b/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod
@@ -3,5 +3,8 @@
 [description]
 Enables the glassfish version of JSTL for all webapps.
 
+[environment]
+ee10
+
 [lib]
-lib/glassfish-jstl/*.jar
+lib/ee10-glassfish-jstl/*.jar
diff --git a/jetty-ee10/jetty-ee10-jaas/src/main/config/etc/jetty-jaas.xml b/jetty-ee10/jetty-ee10-jaas/src/main/config/etc/jetty-ee10-jaas.xml
similarity index 100%
rename from jetty-ee10/jetty-ee10-jaas/src/main/config/etc/jetty-jaas.xml
rename to jetty-ee10/jetty-ee10-jaas/src/main/config/etc/jetty-ee10-jaas.xml
diff --git a/jetty-ee10/jetty-ee10-jaas/src/main/config/modules/jaas.mod b/jetty-ee10/jetty-ee10-jaas/src/main/config/modules/ee10-jaas.mod
similarity index 80%
rename from jetty-ee10/jetty-ee10-jaas/src/main/config/modules/jaas.mod
rename to jetty-ee10/jetty-ee10-jaas/src/main/config/modules/ee10-jaas.mod
index 9816e7b487c..ecf068661b1 100644
--- a/jetty-ee10/jetty-ee10-jaas/src/main/config/modules/jaas.mod
+++ b/jetty-ee10/jetty-ee10-jaas/src/main/config/modules/ee10-jaas.mod
@@ -3,14 +3,17 @@
 [description]
 Enables JAAS for deployed web applications.
 
+[environment]
+ee10
+
 [depend]
 server
 
 [lib]
-lib/jetty-jaas-${jetty.version}.jar
+lib/jetty-ee10-jaas-${jetty.version}.jar
 
 [xml]
-etc/jetty-jaas.xml
+etc/jetty-ee10-jaas.xml
 
 [ini-template]
 ## The file location (relative to $jetty.base) for the
diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jaspi-authmoduleconfig.xml b/jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jetty-ee10-jaspi-authmoduleconfig.xml
similarity index 100%
rename from jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jaspi-authmoduleconfig.xml
rename to jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jetty-ee10-jaspi-authmoduleconfig.xml
diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jaspi-default.xml b/jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jetty-ee10-jaspi-default.xml
similarity index 94%
rename from jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jaspi-default.xml
rename to jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jetty-ee10-jaspi-default.xml
index 9dbdd89ad0d..caa3346cd7f 100644
--- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jaspi-default.xml
+++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jetty-ee10-jaspi-default.xml
@@ -8,7 +8,7 @@
   <!-- ===================================================================== -->
   <Call class="jakarta.security.auth.message.config.AuthConfigFactory" name="setFactory">
     <Arg>
-      <New id="jaspiAuthConfigFactory" class="org.eclipse.jetty.security.jaspi.DefaultAuthConfigFactory" />
+      <New id="jaspiAuthConfigFactory" class="org.eclipse.jetty.ee10.security.jaspi.DefaultAuthConfigFactory" />
     </Arg>
   </Call>
   <Call name="addBean">
diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jaspi-demo.xml b/jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jetty-ee10-jaspi-demo.xml
similarity index 85%
rename from jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jaspi-demo.xml
rename to jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jetty-ee10-jaspi-demo.xml
index 8c00a9cdb7d..21159b3e4f2 100644
--- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jaspi-demo.xml
+++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jetty-ee10-jaspi-demo.xml
@@ -6,7 +6,7 @@
     <Call name="registerConfigProvider">
 
       <!-- The Jetty provided implementation of AuthConfigProvider which will wrap a ServerAuthModule. -->
-      <Arg type="String">org.eclipse.jetty.security.jaspi.provider.JaspiAuthConfigProvider</Arg>
+      <Arg type="String">org.eclipse.jetty.ee10.security.jaspi.provider.JaspiAuthConfigProvider</Arg>
 
       <!-- A Map of initialization properties. -->
       <Arg>
@@ -14,11 +14,11 @@
           <Entry>
             <!-- Provide the fully qualified classname of the ServerAuthModule to be used. -->
             <Item>ServerAuthModule</Item>
-            <Item>org.eclipse.jetty.security.jaspi.modules.BasicAuthenticationAuthModule</Item>
+            <Item>org.eclipse.jetty.ee10.security.jaspi.modules.BasicAuthenticationAuthModule</Item>
           </Entry>
           <Entry>
             <!-- Realm as utilised by Jetty Security  -->
-            <Item>org.eclipse.jetty.security.jaspi.modules.RealmName</Item>
+            <Item>org.eclipse.jetty.ee10.security.jaspi.modules.RealmName</Item>
             <Item>Test Realm</Item>
           </Entry>
         </Map>
@@ -45,4 +45,4 @@
       <Arg type="String">A simple provider using HTTP BASIC authentication.</Arg>
     </Call>
   </Call>
-</Configure>
\ No newline at end of file
+</Configure>
diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/jaspi-default-auth-config-factory.mod b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod
similarity index 75%
rename from jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/jaspi-default-auth-config-factory.mod
rename to jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod
index 70913c907be..3b1e4892ccc 100644
--- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/jaspi-default-auth-config-factory.mod
+++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod
@@ -3,14 +3,17 @@
 [description]
 Provides a DefaultAuthConfigFactory for jaspi
 
+[environment]
+ee10
+
 [tags]
 security
 
 [depend]
-security
+ee10-security
 
 [provide]
 auth-config-factory
 
 [xml]
-etc/jaspi/jaspi-default.xml
+etc/jaspi/jetty-ee10-jaspi-default.xml
diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/jaspi-demo.mod b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod
similarity index 61%
rename from jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/jaspi-demo.mod
rename to jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod
index b0e7fd303e4..00289d6dcff 100644
--- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/jaspi-demo.mod
+++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod
@@ -3,6 +3,9 @@
 [description]
 Enables JASPI basic authentication the /test context path.
 
+[environment]
+ee10
+
 [tags]
 security
 
@@ -10,7 +13,7 @@ security
 jaspi
 
 [xml]
-etc/jaspi/jaspi-demo.xml
+etc/jaspi/jetty-ee10-jaspi-demo.xml
 
 [files]
-basehome:etc/jaspi/jaspi-demo.xml|etc/jaspi/jaspi-demo.xml
+basehome:etc/jaspi/jetty-ee10-jaspi-demo.xml|etc/jaspi/jetty-ee10-jaspi-demo.xml
diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod
new file mode 100644
index 00000000000..d31975f5815
--- /dev/null
+++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod
@@ -0,0 +1,25 @@
+# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[description]
+Enables JASPI authentication for deployed web applications.
+
+[environment]
+ee10
+
+[tags]
+security
+
+[depend]
+ee10-security
+auth-config-factory
+
+[lib]
+lib/jetty-ee10-jaspi-${jetty.version}.jar
+lib/ee10-jaspi/*.jar
+
+[xml]
+etc/jaspi/jetty-ee10-jaspi-authmoduleconfig.xml
+
+[files]
+basehome:etc/jaspi/jetty-ee10-jaspi-authmoduleconfig.xml|etc/jaspi/jetty-ee10-jaspi-authmoduleconfig.xml
+
diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/jaspi.mod b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/jaspi.mod
deleted file mode 100644
index 76b2e81406e..00000000000
--- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/jaspi.mod
+++ /dev/null
@@ -1,22 +0,0 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[description]
-Enables JASPI authentication for deployed web applications.
-
-[tags]
-security
-
-[depend]
-security
-auth-config-factory
-
-[lib]
-lib/jetty-jaspi-${jetty.version}.jar
-lib/jaspi/*.jar
-
-[xml]
-etc/jaspi/jaspi-authmoduleconfig.xml
-
-[files]
-basehome:etc/jaspi/jaspi-authmoduleconfig.xml|etc/jaspi/jaspi-authmoduleconfig.xml
-
diff --git a/jetty-ee10/jetty-ee10-openid/src/main/config/etc/jetty-openid.xml b/jetty-ee10/jetty-ee10-openid/src/main/config/etc/jetty-ee10-openid.xml
similarity index 100%
rename from jetty-ee10/jetty-ee10-openid/src/main/config/etc/jetty-openid.xml
rename to jetty-ee10/jetty-ee10-openid/src/main/config/etc/jetty-ee10-openid.xml
diff --git a/jetty-ee10/jetty-ee10-openid/src/main/config/modules/openid.mod b/jetty-ee10/jetty-ee10-openid/src/main/config/modules/ee10-openid.mod
similarity index 81%
rename from jetty-ee10/jetty-ee10-openid/src/main/config/modules/openid.mod
rename to jetty-ee10/jetty-ee10-openid/src/main/config/modules/ee10-openid.mod
index c1070b29910..d140d392b99 100644
--- a/jetty-ee10/jetty-ee10-openid/src/main/config/modules/openid.mod
+++ b/jetty-ee10/jetty-ee10-openid/src/main/config/modules/ee10-openid.mod
@@ -3,20 +3,23 @@
 [description]
 Adds OpenId Connect authentication to the server.
 
+[environment]
+ee10
+
 [depend]
-security
+ee10-security
 client
 
 [lib]
-lib/jetty-openid-${jetty.version}.jar
-lib/jetty-util-ajax-${jetty.version}.jar
+lib/jetty-ee10-openid-${jetty.version}.jar
+lib/jetty-ee10-util-ajax-${jetty.version}.jar
 
 [files]
-basehome:modules/openid/openid-baseloginservice.xml|etc/openid-baseloginservice.xml
+basehome:modules/openid/jetty-ee10-openid-baseloginservice.xml|etc/jetty-ee10-openid-baseloginservice.xml
 
 [xml]
-etc/openid-baseloginservice.xml
-etc/jetty-openid.xml
+etc/jetty-ee10-openid-baseloginservice.xml
+etc/jetty-ee10-openid.xml
 
 [ini-template]
 ## The OpenID Identity Provider's issuer ID (the entire URL *before* ".well-known/openid-configuration")
diff --git a/jetty-ee10/jetty-ee10-openid/src/main/config/modules/openid/openid-baseloginservice.xml b/jetty-ee10/jetty-ee10-openid/src/main/config/modules/openid/jetty-ee10-openid-baseloginservice.xml
similarity index 78%
rename from jetty-ee10/jetty-ee10-openid/src/main/config/modules/openid/openid-baseloginservice.xml
rename to jetty-ee10/jetty-ee10-openid/src/main/config/modules/openid/jetty-ee10-openid-baseloginservice.xml
index 1773ebd46db..ed6e703732f 100644
--- a/jetty-ee10/jetty-ee10-openid/src/main/config/modules/openid/openid-baseloginservice.xml
+++ b/jetty-ee10/jetty-ee10-openid/src/main/config/modules/openid/jetty-ee10-openid-baseloginservice.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 <Configure>
   <!-- Optional code to configure the base LoginService used by the OpenIdLoginService
-  <New id="BaseLoginService" class="org.eclipse.jetty.security.HashLoginService">
+  <New id="BaseLoginService" class="org.eclipse.jetty.ee10.security.HashLoginService">
     <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
     <Set name="hotReload">true</Set>
   </New>
   -->
-</Configure>
\ No newline at end of file
+</Configure>
diff --git a/jetty-ee10/jetty-ee10-plus/src/main/config/etc/jetty-plus.xml b/jetty-ee10/jetty-ee10-plus/src/main/config/etc/jetty-ee10-plus.xml
similarity index 100%
rename from jetty-ee10/jetty-ee10-plus/src/main/config/etc/jetty-plus.xml
rename to jetty-ee10/jetty-ee10-plus/src/main/config/etc/jetty-ee10-plus.xml
diff --git a/jetty-ee10/jetty-ee10-plus/src/main/config/modules/ee10-plus.mod b/jetty-ee10/jetty-ee10-plus/src/main/config/modules/ee10-plus.mod
new file mode 100644
index 00000000000..5d8edd0bfdd
--- /dev/null
+++ b/jetty-ee10/jetty-ee10-plus/src/main/config/modules/ee10-plus.mod
@@ -0,0 +1,15 @@
+[description]
+Enables Servlet 3.1 resource injection. 
+
+[environment]
+ee10
+
+[depend]
+server
+jndi
+ee10-security
+ee10-webapp
+
+[lib]
+lib/jetty-ee10-plus-${jetty.version}.jar
+lib/jakarta.transaction-api-2.0.0.jar
diff --git a/jetty-ee10/jetty-ee10-plus/src/main/config/modules/plus.mod b/jetty-ee10/jetty-ee10-plus/src/main/config/modules/plus.mod
deleted file mode 100644
index e3d01582c51..00000000000
--- a/jetty-ee10/jetty-ee10-plus/src/main/config/modules/plus.mod
+++ /dev/null
@@ -1,12 +0,0 @@
-[description]
-Enables Servlet 3.1 resource injection. 
-
-[depend]
-server
-security
-jndi
-webapp
-
-[lib]
-lib/jetty-plus-${jetty.version}.jar
-lib/jakarta.transaction-api-*.jar
diff --git a/jetty-ee10/jetty-ee10-proxy/src/main/config/etc/jetty-proxy.xml b/jetty-ee10/jetty-ee10-proxy/src/main/config/etc/jetty-ee10-proxy.xml
similarity index 100%
rename from jetty-ee10/jetty-ee10-proxy/src/main/config/etc/jetty-proxy.xml
rename to jetty-ee10/jetty-ee10-proxy/src/main/config/etc/jetty-ee10-proxy.xml
diff --git a/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/proxy.mod b/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod
similarity index 71%
rename from jetty-ee10/jetty-ee10-proxy/src/main/config/modules/proxy.mod
rename to jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod
index 0ed819cecc9..079efee0488 100644
--- a/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/proxy.mod
+++ b/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod
@@ -4,19 +4,22 @@
 Enables the Jetty Proxy service.
 Allows the server to act as a non-transparent proxy for browsers.
 
+[environment]
+ee10
+
 [depend]
-servlet
+ee10-servlet
 client
 
 [lib]
-lib/jetty-proxy-${jetty.version}.jar
+lib/jetty-ee10-proxy-${jetty.version}.jar
 
 [xml]
-etc/jetty-proxy.xml
+etc/jetty-ee10-proxy.xml
 
 [ini-template]
 ## Proxy Configuration
-# jetty.proxy.servletClass=org.eclipse.jetty.proxy.ProxyServlet
+# jetty.proxy.servletClass=org.eclipse.jetty.ee10.proxy.ProxyServlet
 # jetty.proxy.servletMapping=/*
 # jetty.proxy.maxThreads=128
 # jetty.proxy.maxConnections=256
diff --git a/jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/jetty-quickstart.xml b/jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/jetty-ee10-quickstart.xml
similarity index 93%
rename from jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/jetty-quickstart.xml
rename to jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/jetty-ee10-quickstart.xml
index d21947071f4..d83d232b569 100644
--- a/jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/jetty-quickstart.xml
+++ b/jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/jetty-ee10-quickstart.xml
@@ -22,7 +22,7 @@
       <Arg>
         <New class="org.eclipse.jetty.deploy.bindings.GlobalWebappConfigBinding">
           <Set name="jettyXml">
-            <Property name="jetty.base"/>/etc/quickstart-webapp.xml
+            <Property name="jetty.base"/>/etc/jetty-ee10-quickstart-webapp.xml
           </Set>
         </New>
       </Arg>
diff --git a/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/quickstart.mod b/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod
similarity index 65%
rename from jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/quickstart.mod
rename to jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod
index 9487d69e384..269712bbace 100644
--- a/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/quickstart.mod
+++ b/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod
@@ -3,18 +3,21 @@
 [description]
 Enables the Jetty Quickstart module for rapid deployment of preconfigured web applications.
 
+[environment]
+ee10
+
 [depend]
 server
 deploy
 
 [lib]
-lib/jetty-quickstart-${jetty.version}.jar
+lib/jetty-ee10-quickstart-${jetty.version}.jar
 
 [xml]
-etc/jetty-quickstart.xml
+etc/jetty-ee10-quickstart.xml
 
 [files]
-basehome:modules/jetty-quickstart.d/quickstart-webapp.xml|etc/quickstart-webapp.xml
+basehome:modules/jetty-quickstart.d/jetty-ee10-quickstart-webapp.xml|etc/jetty-ee10-quickstart-webapp.xml
 
 
 [ini-template]
diff --git a/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/jetty-quickstart.d/quickstart-webapp.xml b/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/jetty-quickstart.d/jetty-ee10-quickstart-webapp.xml
similarity index 100%
rename from jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/jetty-quickstart.d/quickstart-webapp.xml
rename to jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/jetty-quickstart.d/jetty-ee10-quickstart-webapp.xml
diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
index f91d184c68b..2145610bb88 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
+++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
@@ -90,6 +90,7 @@ import org.eclipse.jetty.util.annotation.ManagedAttribute;
 import org.eclipse.jetty.util.annotation.ManagedObject;
 import org.eclipse.jetty.util.component.ContainerLifeCycle;
 import org.eclipse.jetty.util.component.DumpableCollection;
+import org.eclipse.jetty.util.component.Environment;
 import org.eclipse.jetty.util.component.Graceful;
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.eclipse.jetty.util.resource.Resource;
@@ -113,7 +114,7 @@ import org.slf4j.LoggerFactory;
 public class ServletContextHandler extends ContextHandler implements Graceful
 {
     private static final Logger LOG = LoggerFactory.getLogger(ServletContextHandler.class);
-
+    protected static final Environment __environment = Environment.ensure("ee10");
     public static final Class<?>[] SERVLET_LISTENER_TYPES =
         {
             ServletContextListener.class,
diff --git a/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/servlets.mod b/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod
similarity index 82%
rename from jetty-ee10/jetty-ee10-servlets/src/main/config/modules/servlets.mod
rename to jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod
index 0c45ce9cb3f..4b7638659e6 100644
--- a/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/servlets.mod
+++ b/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod
@@ -5,9 +5,12 @@ Adds Jetty utility servlets and filters available to a webapp.
 Puts org.eclipse.jetty.servlets on the server classpath (CGI, CrossOriginFilter, DosFilter,
 MultiPartFilter, PushCacheFilter, QoSFilter, etc.) for use by all webapplications.
 
+[environment]
+ee10
+
 [depend]
-servlet
+ee10-servlet
 
 [lib]
-lib/jetty-servlets-${jetty.version}.jar
+lib/jetty-ee10-servlets-${jetty.version}.jar
 
diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/JaasConfiguration.java b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/JaasConfiguration.java
index 80ab4d89c03..bdeeb9a2da4 100644
--- a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/JaasConfiguration.java
+++ b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/JaasConfiguration.java
@@ -41,7 +41,7 @@ public class JaasConfiguration extends AbstractConfiguration
     {
         try
         {
-            return Loader.loadClass("org.eclipse.jetty.jaas.JAASLoginService") != null;
+            return Loader.loadClass("org.eclipse.jetty.ee10.jaas.JAASLoginService") != null;
         }
         catch (Throwable e)
         {
diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/JaspiConfiguration.java b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/JaspiConfiguration.java
index fb03c201dc1..655d77d9751 100644
--- a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/JaspiConfiguration.java
+++ b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/JaspiConfiguration.java
@@ -39,7 +39,7 @@ public class JaspiConfiguration extends AbstractConfiguration
     {
         try
         {
-            return Loader.loadClass("org.eclipse.jetty.security.jaspi.JaspiAuthenticator") != null;
+            return Loader.loadClass("org.eclipse.jetty.ee10.security.jaspi.JaspiAuthenticator") != null;
         }
         catch (Throwable e)
         {
diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/JspConfiguration.java b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/JspConfiguration.java
index 9d490723e25..66987c69f54 100644
--- a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/JspConfiguration.java
+++ b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/JspConfiguration.java
@@ -43,7 +43,7 @@ public class JspConfiguration extends AbstractConfiguration
     {
         try
         {
-            return Loader.loadClass("org.eclipse.jetty.jsp.JettyJspServlet") != null;
+            return Loader.loadClass("org.eclipse.jetty.ee10.jsp.JettyJspServlet") != null;
         }
         catch (Throwable e)
         {
diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/WebAppContext.java b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/WebAppContext.java
index cf471923f06..223fcc82de1 100644
--- a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/WebAppContext.java
+++ b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/WebAppContext.java
@@ -445,6 +445,8 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
     @Override
     protected void doStart() throws Exception
     {
+        ClassLoader old = Thread.currentThread().getContextClassLoader();
+        Thread.currentThread().setContextClassLoader(__environment.getClassLoader());
         try
         {
             _metadata.setAllowDuplicateFragmentNames(isAllowDuplicateFragmentNames());
@@ -467,6 +469,10 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
             if (isThrowUnavailableOnStartupException())
                 throw t;
         }
+        finally
+        {
+            Thread.currentThread().setContextClassLoader(old);
+        }
     }
 
     private void wrapConfigurations()
diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod
new file mode 100644
index 00000000000..019557ee69e
--- /dev/null
+++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod
@@ -0,0 +1,27 @@
+[description]
+Enable jakarta.websocket APIs for deployed web applications.
+
+[environment]
+ee10
+
+[tags]
+websocket
+
+[depend]
+client
+ee10-annotations
+
+[lib]
+lib/websocket/jetty-ee10-websocket-core-common-${jetty.version}.jar
+lib/websocket/jetty-ee10-websocket-core-client-${jetty.version}.jar
+lib/websocket/jetty-ee10-websocket-core-server-${jetty.version}.jar
+lib/websocket/jetty-ee10-websocket-servlet-${jetty.version}.jar
+lib/websocket/jetty-jakarta-websocket-api-2.0.0.jar
+lib/websocket/jetty-ee10-websocket-jakarta-client-${jetty.version}.jar
+lib/websocket/jetty-ee10-websocket-jakarta-common-${jetty.version}.jar
+lib/websocket/jetty-ee10-websocket-jakarta-server-${jetty.version}.jar
+
+[jpms]
+# The implementation needs to access method handles in
+# classes that are in the web application classloader.
+add-reads: org.eclipse.jetty.ee10.websocket.jakarta.common=ALL-UNNAMED
diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/websocket-jakarta.mod b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/websocket-jakarta.mod
deleted file mode 100644
index 4ab12a63f90..00000000000
--- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/websocket-jakarta.mod
+++ /dev/null
@@ -1,24 +0,0 @@
-[description]
-Enable jakarta.websocket APIs for deployed web applications.
-
-[tags]
-websocket
-
-[depend]
-client
-annotations
-
-[lib]
-lib/websocket/websocket-core-common-${jetty.version}.jar
-lib/websocket/websocket-core-client-${jetty.version}.jar
-lib/websocket/websocket-core-server-${jetty.version}.jar
-lib/websocket/websocket-servlet-${jetty.version}.jar
-lib/websocket/jetty-jakarta-websocket-api-2.0.0.jar
-lib/websocket/websocket-jakarta-client-${jetty.version}.jar
-lib/websocket/websocket-jakarta-common-${jetty.version}.jar
-lib/websocket/websocket-jakarta-server-${jetty.version}.jar
-
-[jpms]
-# The implementation needs to access method handles in
-# classes that are in the web application classloader.
-add-reads: org.eclipse.jetty.websocket.jakarta.common=ALL-UNNAMED
diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java
index 7b09d9e85a5..3d6dcda6015 100644
--- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java
+++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java
@@ -32,9 +32,9 @@ public class JakartaWebSocketConfiguration extends AbstractConfiguration
         addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class);
         addDependents("org.eclipse.jetty.ee10.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName());
 
-        protectAndExpose("org.eclipse.jetty.websocket.servlet."); // For WebSocketUpgradeFilter
-        protectAndExpose("org.eclipse.jetty.websocket.jakarta.server.config.");
-        protectAndExpose("org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainerProvider");
-        protectAndExpose("org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketShutdownContainer");
+        protectAndExpose("org.eclipse.jetty.ee10.websocket.servlet."); // For WebSocketUpgradeFilter
+        protectAndExpose("org.eclipse.jetty.ee10.websocket.jakarta.server.config.");
+        protectAndExpose("org.eclipse.jetty.ee10.websocket.jakarta.client.JakartaWebSocketClientContainerProvider");
+        protectAndExpose("org.eclipse.jetty.ee10.websocket.jakarta.client.JakartaWebSocketShutdownContainer");
     }
 }
diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/config/modules/ee10-websocket-jetty-client.mod b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/config/modules/ee10-websocket-jetty-client.mod
new file mode 100644
index 00000000000..1ac33f80f13
--- /dev/null
+++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/config/modules/ee10-websocket-jetty-client.mod
@@ -0,0 +1,26 @@
+# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[description]
+Expose the Jetty WebSocket Client classes to deployed web applications.
+
+[environment]
+ee10
+
+[tags]
+websocket
+
+[depend]
+client
+ee10-annotations
+
+[lib]
+lib/websocket/jetty-ee10-websocket-core-common-${jetty.version}.jar
+lib/websocket/jetty-ee10-websocket-core-client-${jetty.version}.jar
+lib/websocket/jetty-ee10-websocket-jetty-api-${jetty.version}.jar
+lib/websocket/jetty-ee10-websocket-jetty-common-${jetty.version}.jar
+lib/websocket/jetty-ee10-websocket-jetty-client-${jetty.version}.jar
+
+[jpms]
+# The implementation needs to access method handles in
+# classes that are in the web application classloader.
+add-reads: org.eclipse.jetty.ee10.websocket.jetty.common=ALL-UNNAMED
diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod
deleted file mode 100644
index 78420f79fb4..00000000000
--- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod
+++ /dev/null
@@ -1,23 +0,0 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[description]
-Expose the Jetty WebSocket Client classes to deployed web applications.
-
-[tags]
-websocket
-
-[depend]
-client
-annotations
-
-[lib]
-lib/websocket/websocket-core-common-${jetty.version}.jar
-lib/websocket/websocket-core-client-${jetty.version}.jar
-lib/websocket/websocket-jetty-api-${jetty.version}.jar
-lib/websocket/websocket-jetty-common-${jetty.version}.jar
-lib/websocket/websocket-jetty-client-${jetty.version}.jar
-
-[jpms]
-# The implementation needs to access method handles in
-# classes that are in the web application classloader.
-add-reads: org.eclipse.jetty.websocket.jetty.common=ALL-UNNAMED
diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/config/modules/ee10-websocket-jetty.mod b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/config/modules/ee10-websocket-jetty.mod
new file mode 100644
index 00000000000..78da708ffd8
--- /dev/null
+++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/config/modules/ee10-websocket-jetty.mod
@@ -0,0 +1,24 @@
+[description]
+Enable the Jetty WebSocket API support for deployed web applications.
+
+[tags]
+websocket
+
+[environment]
+ee10
+
+[depend]
+ee10-annotations
+
+[lib]
+lib/websocket/jetty-ee10-websocket-core-common-${jetty.version}.jar
+lib/websocket/jetty-ee10-websocket-core-server-${jetty.version}.jar
+lib/websocket/jetty-ee10-websocket-servlet-${jetty.version}.jar
+lib/websocket/jetty-ee10-websocket-jetty-api-${jetty.version}.jar
+lib/websocket/jetty-ee10-websocket-jetty-common-${jetty.version}.jar
+lib/websocket/jetty-ee10-websocket-jetty-server-${jetty.version}.jar
+
+[jpms]
+# The implementation needs to access method handles in
+# classes that are in the web application classloader.
+add-reads: org.eclipse.jetty.ee10.websocket.jetty.common=ALL-UNNAMED
diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/config/modules/websocket-jetty.mod b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/config/modules/websocket-jetty.mod
deleted file mode 100644
index 3e917534979..00000000000
--- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/config/modules/websocket-jetty.mod
+++ /dev/null
@@ -1,21 +0,0 @@
-[description]
-Enable the Jetty WebSocket API support for deployed web applications.
-
-[tags]
-websocket
-
-[depend]
-annotations
-
-[lib]
-lib/websocket/websocket-core-common-${jetty.version}.jar
-lib/websocket/websocket-core-server-${jetty.version}.jar
-lib/websocket/websocket-servlet-${jetty.version}.jar
-lib/websocket/websocket-jetty-api-${jetty.version}.jar
-lib/websocket/websocket-jetty-common-${jetty.version}.jar
-lib/websocket/websocket-jetty-server-${jetty.version}.jar
-
-[jpms]
-# The implementation needs to access method handles in
-# classes that are in the web application classloader.
-add-reads: org.eclipse.jetty.websocket.jetty.common=ALL-UNNAMED
diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index bf309452783..bced07104b4 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -367,7 +367,7 @@
             </configuration>
           </execution>
           <execution>
-            <id>copy-annotations-deps</id>
+            <id>copy-ee10-annotations-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
@@ -376,11 +376,11 @@
               <includeGroupIds>jakarta.annotation,org.eclipse.jetty.orbit,org.ow2.asm</includeGroupIds>
               <includeArtifactIds>jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
               <includeTypes>jar</includeTypes>
-              <outputDirectory>${assembly-directory}/lib/annotations</outputDirectory>
+              <outputDirectory>${assembly-directory}/lib/ee10-annotations</outputDirectory>
             </configuration>
           </execution>
           <execution>
-            <id>copy-annotations-src-deps</id>
+            <id>copy-ee10-annotations-src-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
@@ -390,44 +390,45 @@
               <includeArtifactIds>jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
-              <outputDirectory>${source-assembly-directory}/lib/annotations</outputDirectory>
+              <outputDirectory>${source-assembly-directory}/lib/ee10-annotations</outputDirectory>
             </configuration>
           </execution>
+          <!-- TODO: ee9 annotations -->
           <execution>
-            <id>copy-apache-jsp-deps</id>
+            <id>copy-ee10-apache-jsp-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
               <includeGroupIds>
-                org.eclipse.jetty,org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jdt
+                org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jdt
               </includeGroupIds>
               <includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <prependGroupId>true</prependGroupId>
-              <outputDirectory>${assembly-directory}/lib/apache-jsp</outputDirectory>
+              <outputDirectory>${assembly-directory}/lib/ee10-apache-jsp</outputDirectory>
             </configuration>
           </execution>
           <execution>
-            <id>copy-apache-jsp-src-deps</id>
+            <id>copy-ee10-apache-jsp-src-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
               <includeGroupIds>
-                org.eclipse.jetty,org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jdt
+                org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jdt
               </includeGroupIds>
               <includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
               <prependGroupId>true</prependGroupId>
-              <outputDirectory>${source-assembly-directory}/lib/apache-jsp</outputDirectory>
+              <outputDirectory>${source-assembly-directory}/lib/ee10-apache-jsp</outputDirectory>
             </configuration>
           </execution>
           <execution>
-            <id>copy-glassfish-jstl-deps</id>
+            <id>copy-ee10-glassfish-jstl-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
@@ -436,11 +437,11 @@
               <includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>
               <prependGroupId>true</prependGroupId>
               <includeTypes>jar</includeTypes>
-              <outputDirectory>${assembly-directory}/lib/glassfish-jstl</outputDirectory>
+              <outputDirectory>${assembly-directory}/lib/ee10-glassfish-jstl</outputDirectory>
             </configuration>
           </execution>
           <execution>
-            <id>copy-glassfish-jstl-src-deps</id>
+            <id>copy-ee10-glassfish-jstl-src-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
@@ -450,11 +451,12 @@
               <prependGroupId>true</prependGroupId>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
-              <outputDirectory>${source-assembly-directory}/lib/glassfish-jstl</outputDirectory>
+              <outputDirectory>${source-assembly-directory}/lib/ee10-glassfish-jstl</outputDirectory>
             </configuration>
           </execution>
+          <!-- TODO: add copy deps for ee9 apache-jsp and jstl -->
           <execution>
-            <id>copy-jaspi-deps</id>
+            <id>copy-ee10-jaspi-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
@@ -463,11 +465,11 @@
               <includeGroupIds>jakarta.authentication</includeGroupIds>
               <includeArtifactIds>jakarta.authentication-api</includeArtifactIds>
               <includeTypes>jar</includeTypes>
-              <outputDirectory>${assembly-directory}/lib/jaspi</outputDirectory>
+              <outputDirectory>${assembly-directory}/lib/ee10-jaspi</outputDirectory>
             </configuration>
           </execution>
           <execution>
-            <id>copy-jaspi-src-deps</id>
+            <id>copy-ee10-jaspi-src-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
@@ -477,9 +479,10 @@
               <includeArtifactIds>jakarta.authentication-api</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
-              <outputDirectory>${source-assembly-directory}/lib/jaspi</outputDirectory>
+              <outputDirectory>${source-assembly-directory}/lib/ee10-jaspi</outputDirectory>
             </configuration>
           </execution>
+          <!-- TODO: ee9 jaspi -->
 
           <execution>
             <id>copy-ee9-deps</id>
@@ -489,6 +492,7 @@
             </goals>
             <configuration>
               <includeGroupIds>org.eclipse.jetty.ee9</includeGroupIds>
+              <excludeGroupIds>org.eclipse.jetty.ee9.demos</excludeGroupIds>
 <!--              <includeArtifactIds></includeArtifactIds>-->
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib</outputDirectory>
@@ -503,6 +507,7 @@
             <configuration>
               <includeGroupIds>org.eclipse.jetty.ee9</includeGroupIds>
 <!--              <includeArtifactIds></includeArtifactIds>-->
+              <excludeGroupIds>org.eclipse.jetty.ee9.demos</excludeGroupIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
               <outputDirectory>${source-assembly-directory}/lib</outputDirectory>
@@ -518,6 +523,7 @@
             <configuration>
               <includeGroupIds>org.eclipse.jetty.ee10</includeGroupIds>
               <!--              <includeArtifactIds></includeArtifactIds>-->
+              <excludeGroupIds>org.eclipse.jetty.ee10.demos</excludeGroupIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib</outputDirectory>
             </configuration>
@@ -532,6 +538,7 @@
               <includeGroupIds>org.eclipse.jetty.ee10</includeGroupIds>
               <!--              <includeArtifactIds></includeArtifactIds>-->
               <includeTypes>jar</includeTypes>
+              <excludeGroupIds>org.eclipse.jetty.ee10.demos</excludeGroupIds>
               <classifier>sources</classifier>
               <outputDirectory>${source-assembly-directory}/lib</outputDirectory>
             </configuration>
@@ -824,6 +831,10 @@
       <groupId>org.eclipse.jetty.ee10</groupId>
       <artifactId>jetty-ee10-servlet</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee10</groupId>
+      <artifactId>jetty-ee10-servlets</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee10.websocket</groupId>
       <artifactId>jetty-ee10-websocket-servlet</artifactId>
diff --git a/jetty-home/src/main/resources/modules/demo-realm.mod b/jetty-home/src/main/resources/modules/demo-realm.mod
deleted file mode 100644
index 7751bf5206e..00000000000
--- a/jetty-home/src/main/resources/modules/demo-realm.mod
+++ /dev/null
@@ -1,21 +0,0 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[description]
-Configure a demo authentication realm.
-
-[tags]
-demo
-
-[depends]
-security
-
-[xml]
-etc/demo-realm.xml
-
-[files]
-basehome:modules/demo.d/demo-realm.xml|etc/demo-realm.xml
-basehome:modules/demo.d/demo-realm.properties|etc/demo-realm.properties
-
-[ini-template]
-# Create and configure the test realm
-jetty.demo.realm=etc/realm.properties
diff --git a/jetty-home/src/main/resources/modules/demo-root.mod b/jetty-home/src/main/resources/modules/demo-root.mod
deleted file mode 100644
index c1a10cbede1..00000000000
--- a/jetty-home/src/main/resources/modules/demo-root.mod
+++ /dev/null
@@ -1,19 +0,0 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[description]
-Demo root webapp.
-
-[tags]
-demo
-webapp
-
-[depends]
-deploy
-
-[files]
-webapps/root/
-webapps/root/images/
-basehome:modules/demo.d/root/index.html|webapps/root/index.html
-basehome:modules/demo.d/root/jetty.css|webapps/root/jetty.css
-basehome:modules/demo.d/root/images/jetty-pic.png|webapps/root/images/jetty-pic.png
-basehome:modules/demo.d/root/images/webtide_logo.jpg|webapps/root/images/webtide_logo.jpg
diff --git a/jetty-home/src/main/resources/modules/demo.d/demo-realm.properties b/jetty-home/src/main/resources/modules/demo.d/jetty-ee10-demo-realm.properties
similarity index 100%
rename from jetty-home/src/main/resources/modules/demo.d/demo-realm.properties
rename to jetty-home/src/main/resources/modules/demo.d/jetty-ee10-demo-realm.properties
diff --git a/jetty-home/src/main/resources/modules/demo.d/demo-realm.xml b/jetty-home/src/main/resources/modules/demo.d/jetty-ee10-demo-realm.xml
similarity index 87%
rename from jetty-home/src/main/resources/modules/demo.d/demo-realm.xml
rename to jetty-home/src/main/resources/modules/demo.d/jetty-ee10-demo-realm.xml
index 176ab918d23..06b556f453e 100644
--- a/jetty-home/src/main/resources/modules/demo.d/demo-realm.xml
+++ b/jetty-home/src/main/resources/modules/demo.d/jetty-ee10-demo-realm.xml
@@ -10,9 +10,9 @@
   <!-- =========================================================== -->
   <Call name="addBean">
     <Arg>
-      <New class="org.eclipse.jetty.security.HashLoginService">
+      <New class="org.eclipse.jetty.ee10.servlet.security.HashLoginService">
         <Set name="name">Test Realm</Set>
-        <Set name="config">etc/demo-realm.properties</Set>
+        <Set name="config">etc/jetty-ee10-demo-realm.properties</Set>
         <Set name="hotReload">false</Set>
       </New>
     </Arg>
diff --git a/jetty-home/src/main/resources/modules/demo.d/root/images/jetty-pic.png b/jetty-home/src/main/resources/modules/demo.d/root-ee10/images/jetty-pic.png
similarity index 100%
rename from jetty-home/src/main/resources/modules/demo.d/root/images/jetty-pic.png
rename to jetty-home/src/main/resources/modules/demo.d/root-ee10/images/jetty-pic.png
diff --git a/jetty-home/src/main/resources/modules/demo.d/root/images/webtide_logo.jpg b/jetty-home/src/main/resources/modules/demo.d/root-ee10/images/webtide_logo.jpg
similarity index 100%
rename from jetty-home/src/main/resources/modules/demo.d/root/images/webtide_logo.jpg
rename to jetty-home/src/main/resources/modules/demo.d/root-ee10/images/webtide_logo.jpg
diff --git a/jetty-home/src/main/resources/modules/demo.d/root/index.html b/jetty-home/src/main/resources/modules/demo.d/root-ee10/index.html
similarity index 100%
rename from jetty-home/src/main/resources/modules/demo.d/root/index.html
rename to jetty-home/src/main/resources/modules/demo.d/root-ee10/index.html
diff --git a/jetty-home/src/main/resources/modules/demo.d/root/jetty.css b/jetty-home/src/main/resources/modules/demo.d/root-ee10/jetty.css
similarity index 100%
rename from jetty-home/src/main/resources/modules/demo.d/root/jetty.css
rename to jetty-home/src/main/resources/modules/demo.d/root-ee10/jetty.css
diff --git a/jetty-home/src/main/resources/modules/ee10-demo-realm.mod b/jetty-home/src/main/resources/modules/ee10-demo-realm.mod
new file mode 100644
index 00000000000..e846c6f620a
--- /dev/null
+++ b/jetty-home/src/main/resources/modules/ee10-demo-realm.mod
@@ -0,0 +1,24 @@
+# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[description]
+Configure a demo authentication realm.
+
+[environment]
+ee10
+
+[tags]
+demo
+
+[depends]
+ee10-security
+
+[xml]
+etc/jetty-ee10-demo-realm.xml
+
+[files]
+basehome:modules/demo.d/jetty-ee10-demo-realm.xml|etc/jetty-ee10-demo-realm.xml
+basehome:modules/demo.d/jetty-ee10-demo-realm.properties|etc/jetty-ee10-demo-realm.properties
+
+[ini-template]
+# Create and configure the test realm
+jetty.demo.realm=etc/jetty-ee10-realm.properties
diff --git a/jetty-home/src/main/resources/modules/ee10-demo-root.mod b/jetty-home/src/main/resources/modules/ee10-demo-root.mod
new file mode 100644
index 00000000000..6d99e8670a6
--- /dev/null
+++ b/jetty-home/src/main/resources/modules/ee10-demo-root.mod
@@ -0,0 +1,22 @@
+# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[description]
+Demo root webapp.
+
+[environment]
+ee10
+
+[tags]
+demo
+webapp
+
+[depends]
+deploy
+
+[files]
+webapps-ee10/root-ee10/
+webapps-ee10/root-ee10/images/
+basehome:modules/demo.d/root-ee10/index.html|webapps-ee10/root-ee10/index.html
+basehome:modules/demo.d/root-ee10/jetty.css|webapps-ee10/root-ee10/jetty.css
+basehome:modules/demo.d/root-ee10/images/jetty-pic.png|webapps-ee10/root-ee10/images/jetty-pic.png
+basehome:modules/demo.d/root-ee10/images/webtide_logo.jpg|webapps-ee10/root-ee10/images/webtide_logo.jpg
diff --git a/jetty-home/src/main/resources/modules/demo.mod b/jetty-home/src/main/resources/modules/ee10-demo.mod
similarity index 66%
rename from jetty-home/src/main/resources/modules/demo.mod
rename to jetty-home/src/main/resources/modules/ee10-demo.mod
index 5d422f5438d..52ed88b57bd 100644
--- a/jetty-home/src/main/resources/modules/demo.mod
+++ b/jetty-home/src/main/resources/modules/ee10-demo.mod
@@ -3,6 +3,9 @@
 [description]
 A meta module to enable all demo modules.
 
+[environment]
+ee10
+
 [tags]
 demo
 
@@ -12,16 +15,16 @@ https
 http2
 test-keystore
 work
-demo-async-rest
-demo-jaas
-demo-jetty
-demo-moved-context
-demo-proxy
-demo-rewrite
-demo-root
-demo-jndi
-demo-spec
-demo-jsp
+demo-ee10-async-rest
+demo-ee10-jaas
+demo-ee10-jetty
+demo-ee10-moved-context
+demo-ee10-proxy
+demo-ee10-rewrite
+demo-ee10-jndi
+demo-ee10-spec
+demo-ee10-jsp
+ee10-demo-root
 
 [ini-template]
 # Websocket chat examples needs websocket enabled
diff --git a/jetty-home/src/main/resources/modules/jsp.mod b/jetty-home/src/main/resources/modules/ee10-jsp.mod
similarity index 73%
rename from jetty-home/src/main/resources/modules/jsp.mod
rename to jetty-home/src/main/resources/modules/ee10-jsp.mod
index 938697731d4..2b1aab64fe3 100644
--- a/jetty-home/src/main/resources/modules/jsp.mod
+++ b/jetty-home/src/main/resources/modules/ee10-jsp.mod
@@ -3,8 +3,10 @@
 [description]
 Enables JSP for all web applications deployed on the server.
 
-[depend]
-servlet
-annotations
-apache-jsp
+[environment]
+ee10
 
+[depend]
+ee10-servlet
+ee10-annotations
+ee10-apache-jsp
diff --git a/jetty-home/src/main/resources/modules/jstl.mod b/jetty-home/src/main/resources/modules/ee10-jstl.mod
similarity index 79%
rename from jetty-home/src/main/resources/modules/jstl.mod
rename to jetty-home/src/main/resources/modules/ee10-jstl.mod
index 2b5c2fa7669..ffefed1fd46 100644
--- a/jetty-home/src/main/resources/modules/jstl.mod
+++ b/jetty-home/src/main/resources/modules/ee10-jstl.mod
@@ -3,7 +3,9 @@
 [description]
 Enables JSTL for all web applications deployed on the server.
 
-[depend]
-jsp
-glassfish-jstl
+[environment]
+ee10
 
+[depend]
+ee10-jsp
+ee10-glassfish-jstl