Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup XML environment specific deployment AppProviders

This commit is contained in:
Joakim Erdfelt 2024-06-26 09:25:57 -05:00
parent b2c4acdde4
commit 2caf9c11c0
8 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -414,6 +414,8 @@ jetty-10.0.18 - 26 October 2023
+ 10537 HTTP/3: Incomplete Data Transfer When Used with Spring Boot WebFlux + 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 + 10696 jetty.sh doesn't work with JETTY_USER in Jetty 10.0.17 thru Jetty
12.0.2 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 + 10705 Creating a `HTTP3ServerConnector` with a `SslContextFactory` that has
a non-null `SSLContext` makes the server fail to start with an unclear error a non-null `SSLContext` makes the server fail to start with an unclear error
message message

8
jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml
View File

@ -1,11 +1,7 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Create the deployment manager --> <!-- Attach the "core" environment app deployment provider -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- 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"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call id="DeploymentManager" name="getBean"> <Call id="DeploymentManager" name="getBean">
@ -20,7 +16,7 @@
<Ref refid="DeploymentManager"> <Ref refid="DeploymentManager">
<Call name="addAppProvider"> <Call name="addAppProvider">
<Arg> <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="EnvironmentName">core</Set>
<Set name="monitoredDirName"> <Set name="monitoredDirName">
<Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration"> <Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration">

2
jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/jetty-ee10-quickstart.xml
View File

@ -7,7 +7,7 @@
<Arg><Property name="jetty.quickstart.mode"/></Arg> <Arg><Property name="jetty.quickstart.mode"/></Arg>
</Call> </Call>
<Ref refid="WebAppProvider"> <Ref refid="WebAppProvider-ee10">
<Get name="properties"> <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.mode"><Property name="jetty.quickstart.mode"/></Put>
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put> <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>

9
jetty-ee10/jetty-ee10-webapp/src/main/config/etc/jetty-ee10-deploy.xml
View File

@ -1,11 +1,7 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Create the deployment manager --> <!-- Attach the "ee10" environment app deployment provider -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- 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"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call id="DeploymentManager" name="getBean"> <Call id="DeploymentManager" name="getBean">
@ -20,7 +16,7 @@
<Ref refid="DeploymentManager"> <Ref refid="DeploymentManager">
<Call name="addAppProvider"> <Call name="addAppProvider">
<Arg> <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="environmentName">ee10</Set>
<Set name="monitoredDirName"> <Set name="monitoredDirName">
<Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration"> <Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration">
@ -41,6 +37,7 @@
</Default> </Default>
</Property> </Property>
</Set> </Set>
<Set name="deferInitialScan" property="jetty.deploy.deferInitialScan"/>
<Set name="scanInterval" property="jetty.deploy.scanInterval"/> <Set name="scanInterval" property="jetty.deploy.scanInterval"/>
<Set name="extractWars" property="jetty.deploy.extractWars" /> <Set name="extractWars" property="jetty.deploy.extractWars" />
<Set name="parentLoaderPriority" property="jetty.deploy.parentLoaderPriority" /> <Set name="parentLoaderPriority" property="jetty.deploy.parentLoaderPriority" />

2
jetty-ee8/jetty-ee8-quickstart/src/main/config/etc/jetty-ee8-quickstart.xml
View File

@ -7,7 +7,7 @@
<Arg><Property name="jetty.quickstart.mode"/></Arg> <Arg><Property name="jetty.quickstart.mode"/></Arg>
</Call> </Call>
<Ref refid="WebAppProvider"> <Ref refid="WebAppProvider-ee8">
<Get name="properties"> <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.mode"><Property name="jetty.quickstart.mode"/></Put>
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put> <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>

8
jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml
View File

@ -1,11 +1,7 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Create the deployment manager --> <!-- Attach the "ee8" environment app deployment provider -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- 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"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call id="DeploymentManager" name="getBean"> <Call id="DeploymentManager" name="getBean">
@ -20,7 +16,7 @@
<Ref refid="DeploymentManager"> <Ref refid="DeploymentManager">
<Call name="addAppProvider"> <Call name="addAppProvider">
<Arg> <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="EnvironmentName">ee8</Set>
<Set name="monitoredDirName"> <Set name="monitoredDirName">
<Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration"> <Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration">

2
jetty-ee9/jetty-ee9-quickstart/src/main/config/etc/jetty-ee9-quickstart.xml
View File

@ -7,7 +7,7 @@
<Arg><Property name="jetty.quickstart.mode"/></Arg> <Arg><Property name="jetty.quickstart.mode"/></Arg>
</Call> </Call>
<Ref refid="WebAppProvider"> <Ref refid="WebAppProvider-ee9">
<Get name="properties"> <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.mode"><Property name="jetty.quickstart.mode"/></Put>
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put> <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>

9
jetty-ee9/jetty-ee9-webapp/src/main/config/etc/jetty-ee9-deploy.xml
View File

@ -1,11 +1,7 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Create the deployment manager --> <!-- Attach the "ee9" environment app deployment provider -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- 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"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call id="DeploymentManager" name="getBean"> <Call id="DeploymentManager" name="getBean">
@ -20,7 +16,7 @@
<Ref refid="DeploymentManager"> <Ref refid="DeploymentManager">
<Call name="addAppProvider"> <Call name="addAppProvider">
<Arg> <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="EnvironmentName">ee9</Set>
<Set name="monitoredDirName"> <Set name="monitoredDirName">
<Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration"> <Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration">
@ -41,6 +37,7 @@
</Default> </Default>
</Property> </Property>
</Set> </Set>
<Set name="deferInitialScan" property="jetty.deploy.deferInitialScan"/>
<Set name="scanInterval" property="jetty.deploy.scanInterval"/> <Set name="scanInterval" property="jetty.deploy.scanInterval"/>
<Set name="extractWars" property="jetty.deploy.extractWars" /> <Set name="extractWars" property="jetty.deploy.extractWars" />
<Set name="parentLoaderPriority" property="jetty.deploy.parentLoaderPriority" /> <Set name="parentLoaderPriority" property="jetty.deploy.parentLoaderPriority" />