From 2caf9c11c09d5a6825dcc7ab85f0475843310543 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 26 Jun 2024 09:25:57 -0500
Subject: [PATCH] Cleanup XML environment specific deployment AppProviders

---
 VERSION.txt                                              | 2 ++
 .../src/main/config/etc/jetty-core-deploy.xml            | 8 ++------
 .../src/main/config/etc/jetty-ee10-quickstart.xml        | 2 +-
 .../src/main/config/etc/jetty-ee10-deploy.xml            | 9 +++------
 .../src/main/config/etc/jetty-ee8-quickstart.xml         | 2 +-
 .../src/main/config/etc/jetty-ee8-deploy.xml             | 8 ++------
 .../src/main/config/etc/jetty-ee9-quickstart.xml         | 2 +-
 .../src/main/config/etc/jetty-ee9-deploy.xml             | 9 +++------
 8 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 0c63546b804..259865a698a 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -414,6 +414,8 @@ jetty-10.0.18 - 26 October 2023
  + 10537 HTTP/3: Incomplete Data Transfer When Used with Spring Boot WebFlux
  + 10696 jetty.sh doesn't work with JETTY_USER in Jetty 10.0.17 thru Jetty
    12.0.2
+ + 10669 Provide ability to defer initial deployment of webapps until after
+   Server has started
  + 10705 Creating a `HTTP3ServerConnector` with a `SslContextFactory` that has
    a non-null `SSLContext` makes the server fail to start with an unclear error
    message
diff --git a/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml b/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml
index bb55b9aa561..551fcc99b9a 100644
--- a/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml
+++ b/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/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.                                          -->
+<!-- Attach the "core" environment app deployment provider           -->
 <!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call id="DeploymentManager" name="getBean">
@@ -20,7 +16,7 @@
   <Ref refid="DeploymentManager">
     <Call name="addAppProvider">
       <Arg>
-        <New id="WebAppProvider" class="org.eclipse.jetty.deploy.providers.ContextProvider">
+        <New id="WebAppProvider-core" class="org.eclipse.jetty.deploy.providers.ContextProvider">
           <Set name="EnvironmentName">core</Set>
           <Set name="monitoredDirName">
             <Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration">
diff --git a/jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/jetty-ee10-quickstart.xml b/jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/jetty-ee10-quickstart.xml
index 14788ab785c..a08f0c808c3 100644
--- a/jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/jetty-ee10-quickstart.xml
+++ b/jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/jetty-ee10-quickstart.xml
@@ -7,7 +7,7 @@
     <Arg><Property name="jetty.quickstart.mode"/></Arg>
   </Call>
 
-  <Ref refid="WebAppProvider">
+  <Ref refid="WebAppProvider-ee10">
       <Get name="properties">
         <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode"><Property name="jetty.quickstart.mode"/></Put>
         <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>
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
index 53872c8445b..868a0e51462 100644
--- 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
@@ -1,11 +1,7 @@
 <?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.                                          -->
+<!-- Attach the "ee10" environment app deployment provider           -->
 <!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call id="DeploymentManager" name="getBean">
@@ -20,7 +16,7 @@
   <Ref refid="DeploymentManager">
     <Call name="addAppProvider">
       <Arg>
-        <New id="WebAppProvider" class="org.eclipse.jetty.deploy.providers.ContextProvider">
+        <New id="WebAppProvider-ee10" class="org.eclipse.jetty.deploy.providers.ContextProvider">
           <Set name="environmentName">ee10</Set>
           <Set name="monitoredDirName">
             <Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration">
@@ -41,6 +37,7 @@
               </Default>
             </Property>
           </Set>
+          <Set name="deferInitialScan" property="jetty.deploy.deferInitialScan"/>
           <Set name="scanInterval" property="jetty.deploy.scanInterval"/>
           <Set name="extractWars" property="jetty.deploy.extractWars" />
           <Set name="parentLoaderPriority" property="jetty.deploy.parentLoaderPriority" />
diff --git a/jetty-ee8/jetty-ee8-quickstart/src/main/config/etc/jetty-ee8-quickstart.xml b/jetty-ee8/jetty-ee8-quickstart/src/main/config/etc/jetty-ee8-quickstart.xml
index 1dd6e943f55..4a36d28e556 100644
--- a/jetty-ee8/jetty-ee8-quickstart/src/main/config/etc/jetty-ee8-quickstart.xml
+++ b/jetty-ee8/jetty-ee8-quickstart/src/main/config/etc/jetty-ee8-quickstart.xml
@@ -7,7 +7,7 @@
     <Arg><Property name="jetty.quickstart.mode"/></Arg>
   </Call>
 
-  <Ref refid="WebAppProvider">
+  <Ref refid="WebAppProvider-ee8">
       <Get name="properties">
         <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode"><Property name="jetty.quickstart.mode"/></Put>
         <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>
diff --git a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml
index 101c003028d..52fb1adae48 100644
--- a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml
+++ b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/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.                                          -->
+<!-- Attach the "ee8" environment app deployment provider            -->
 <!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call id="DeploymentManager" name="getBean">
@@ -20,7 +16,7 @@
   <Ref refid="DeploymentManager">
     <Call name="addAppProvider">
       <Arg>
-        <New id="WebAppProvider" class="org.eclipse.jetty.deploy.providers.ContextProvider">
+        <New id="WebAppProvider-ee8" class="org.eclipse.jetty.deploy.providers.ContextProvider">
           <Set name="EnvironmentName">ee8</Set>
           <Set name="monitoredDirName">
             <Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration">
diff --git a/jetty-ee9/jetty-ee9-quickstart/src/main/config/etc/jetty-ee9-quickstart.xml b/jetty-ee9/jetty-ee9-quickstart/src/main/config/etc/jetty-ee9-quickstart.xml
index 91606ec0ea5..e47a22440b1 100644
--- a/jetty-ee9/jetty-ee9-quickstart/src/main/config/etc/jetty-ee9-quickstart.xml
+++ b/jetty-ee9/jetty-ee9-quickstart/src/main/config/etc/jetty-ee9-quickstart.xml
@@ -7,7 +7,7 @@
     <Arg><Property name="jetty.quickstart.mode"/></Arg>
   </Call>
 
-  <Ref refid="WebAppProvider">
+  <Ref refid="WebAppProvider-ee9">
       <Get name="properties">
         <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode"><Property name="jetty.quickstart.mode"/></Put>
         <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>
diff --git a/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/jetty-ee9-deploy.xml b/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/jetty-ee9-deploy.xml
index a0be5ab89f4..d4f60b484b1 100644
--- a/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/jetty-ee9-deploy.xml
+++ b/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/jetty-ee9-deploy.xml
@@ -1,11 +1,7 @@
 <?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.                                          -->
+<!-- Attach the "ee9" environment app deployment provider            -->
 <!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call id="DeploymentManager" name="getBean">
@@ -20,7 +16,7 @@
   <Ref refid="DeploymentManager">
     <Call name="addAppProvider">
       <Arg>
-        <New id="WebAppProvider" class="org.eclipse.jetty.deploy.providers.ContextProvider">
+        <New id="WebAppProvider-ee9" class="org.eclipse.jetty.deploy.providers.ContextProvider">
           <Set name="EnvironmentName">ee9</Set>
           <Set name="monitoredDirName">
             <Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration">
@@ -41,6 +37,7 @@
               </Default>
             </Property>
           </Set>
+          <Set name="deferInitialScan" property="jetty.deploy.deferInitialScan"/>
           <Set name="scanInterval" property="jetty.deploy.scanInterval"/>
           <Set name="extractWars" property="jetty.deploy.extractWars" />
           <Set name="parentLoaderPriority" property="jetty.deploy.parentLoaderPriority" />