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

Merge pull request #5599 from eclipse/jetty-9.4.x-XML-Review 

Fixes to XML formatting and comments.
This commit is contained in:
Lachlan 2020-11-11 13:55:26 +11:00 committed by GitHub
parent 8b3de3beb3 e937b34a82
commit 23f75a395b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
56 changed files with 326 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-deploy/src/main/config/etc/jetty-decorate.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Mixin the Weld / CDI classes to the class loader --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Mixin the Weld / CDI classes to the class loader -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- Bind the jetty-web-decorate.xml to every deployed webapp --> <!-- Bind the jetty-web-decorate.xml to every deployed webapp -->

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

@ -1,6 +1,12 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Create the deployment manager --><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --><!-- The deplyment manager handles the lifecycle of deploying web --><!-- applications. Apps are provided by instances of the --><!-- AppProvider interface. --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Create the deployment manager -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- The deplyment manager handles the lifecycle of deploying web -->
<!-- applications. Apps are provided by instances of the -->
<!-- AppProvider interface. -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="addBean"> <Call name="addBean">

6
jetty-deploy/src/test/resources/jetty-http.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server" --><!-- by adding an HTTP connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" -->
<!-- by adding an HTTP connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

23
jetty-deploy/src/test/resources/jetty.xml
View File

@ -1,8 +1,27 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Documentation of this file format can be found at: --><!-- https://www.eclipse.org/jetty/documentation/current/ --><!-- --><!-- Additional configuration files are available in $JETTY_HOME/etc --><!-- and can be mixed in. See start.ini file for the default --><!-- configuration files. --><!-- --><!-- For a description of the configuration mechanism, see the --><!-- output of: --><!-- java -jar start.jar -? --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Documentation of this file format can be found at: -->
<!-- https://www.eclipse.org/jetty/documentation/current/ -->
<!-- -->
<!-- Additional configuration files are available in $JETTY_HOME/etc -->
<!-- and can be mixed in. See start.ini file for the default -->
<!-- configuration files. -->
<!-- -->
<!-- For a description of the configuration mechanism, see the -->
<!-- output of: -->
<!-- java -jar start.jar -? -->
<!-- =============================================================== -->
<!-- =============================================================== --><!-- Configure a Jetty Server instance with an ID "Server" --><!-- Other configuration files may also configure the "Server" --><!-- ID, in which case they are adding configuration to the same --><!-- instance. If other configuration have a different ID, they --><!-- will create and configure another instance of Jetty. --><!-- Consult the javadoc of o.e.j.server.Server for all --><!-- configuration that may be set here. --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure a Jetty Server instance with an ID "Server" -->
<!-- Other configuration files may also configure the "Server" -->
<!-- ID, in which case they are adding configuration to the same -->
<!-- instance. If other configuration have a different ID, they -->
<!-- will create and configure another instance of Jetty. -->
<!-- Consult the javadoc of o.e.j.server.Server for all -->
<!-- configuration that may be set here. -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

4
jetty-home/src/main/resources/etc/jetty-setuid.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ================================================================ --><!-- Configure the Jetty SetUIDListener --><!-- ================================================================ --> <!-- ================================================================ -->
<!-- Configure the Jetty SetUIDListener -->
<!-- ================================================================ -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="addLifeCycleListener"> <Call name="addLifeCycleListener">

4
jetty-home/src/main/resources/etc/jetty-started.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Mixin the Start FileNoticeLifeCycleListener --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Mixin the Start FileNoticeLifeCycleListener -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="addLifeCycleListener"> <Call name="addLifeCycleListener">
<Arg> <Arg>

4
jetty-home/src/main/resources/modules/jamon/jamon.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Mixin the Jamon Handler --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Mixin the Jamon Handler -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">

2
jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Ref id="httpConnector"> <Ref refid="httpConnector">
<Call name="addLifeCycleListener"> <Call name="addLifeCycleListener">
<Arg> <Arg>
<New class="org.eclipse.jetty.maven.plugin.ServerConnectorListener"> <New class="org.eclipse.jetty.maven.plugin.ServerConnectorListener">

6
jetty-maven-plugin/src/main/resources/maven.xml
View File

@ -3,7 +3,7 @@
<Configure id="wac" class="org.eclipse.jetty.maven.plugin.JettyWebAppContext"> <Configure id="wac" class="org.eclipse.jetty.maven.plugin.JettyWebAppContext">
<Call class="org.eclipse.jetty.webapp.Configuration$ClassList" name="setServerDefault"> <Call class="org.eclipse.jetty.webapp.Configuration$ClassList" name="setServerDefault">
<Arg><Ref id="Server" /></Arg> <Arg><Ref refid="Server" /></Arg>
<Call name="replace"> <Call name="replace">
<Arg>org.eclipse.jetty.webapp.WebInfConfiguration</Arg> <Arg>org.eclipse.jetty.webapp.WebInfConfiguration</Arg>
<Arg>org.eclipse.jetty.maven.plugin.MavenWebInfConfiguration</Arg> <Arg>org.eclipse.jetty.maven.plugin.MavenWebInfConfiguration</Arg>
@ -11,9 +11,9 @@
</Call> </Call>
<Call class="org.eclipse.jetty.maven.plugin.WebAppPropertyConverter" name="fromProperties"> <Call class="org.eclipse.jetty.maven.plugin.WebAppPropertyConverter" name="fromProperties">
<Arg><Ref id="wac"/></Arg> <Arg><Ref refid="wac"/></Arg>
<Arg><Property name="jetty.base" default="."/>/etc/maven.props</Arg> <Arg><Property name="jetty.base" default="."/>/etc/maven.props</Arg>
<Arg><Ref id="Server"/></Arg> <Arg><Ref refid="Server"/></Arg>
<Arg></Arg> <Arg></Arg>
</Call> </Call>

6
jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-http.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server" --><!-- by adding an HTTP connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" -->
<!-- by adding an HTTP connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

6
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server" --><!-- by adding an HTTP connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" -->
<!-- by adding an HTTP connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

6
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server" --><!-- by adding an HTTP connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" -->
<!-- by adding an HTTP connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

6
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server" --><!-- by adding an HTTP connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" -->
<!-- by adding an HTTP connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

6
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server" --><!-- by adding an HTTP connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" -->
<!-- by adding an HTTP connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

6
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server" --><!-- by adding an HTTP connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" -->
<!-- by adding an HTTP connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

6
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server" --><!-- by adding an HTTP connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" -->
<!-- by adding an HTTP connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

6
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server" --><!-- by adding an HTTP connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" -->
<!-- by adding an HTTP connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

6
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server" --><!-- by adding an HTTP connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" -->
<!-- by adding an HTTP connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

4
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2-jdk9.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure an HTTP2 on the ssl connector. --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure an HTTP2 on the ssl connector. -->
<!-- ============================================================= -->
<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector"> <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
<Call name="addConnectionFactory"> <Call name="addConnectionFactory">
<Arg> <Arg>

4
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure an HTTP2 on the ssl connector. --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure an HTTP2 on the ssl connector. -->
<!-- ============================================================= -->
<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector"> <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
<Call name="addConnectionFactory"> <Call name="addConnectionFactory">
<Arg> <Arg>

6
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure an HTTPS connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- and jetty-ssl.xml. --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure an HTTPS connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- and jetty-ssl.xml. -->
<!-- ============================================================= -->
<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector"> <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
<Call name="addIfAbsentConnectionFactory"> <Call name="addIfAbsentConnectionFactory">

4
jetty-plus/src/main/plus-config/etc/jetty-plus.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Configure extended support for webapps --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure extended support for webapps -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

8
jetty-rewrite/src/test/resources/org.mortbay.jetty.rewrite.handler/jetty-rewrite.xml
View File

@ -1,6 +1,12 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Configure the Jetty Server --><!-- --><!-- Documentation of this file format can be found at: --><!-- http://docs.codehaus.org/display/JETTY/jetty.xml --><!-- --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the Jetty Server -->
<!-- -->
<!-- Documentation of this file format can be found at: -->
<!-- http://docs.codehaus.org/display/JETTY/jetty.xml -->
<!-- -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">

6
jetty-server/src/main/config/etc/home-base-warning.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Display a Warning Message if {jetty.home} == {jetty.base} --><!-- ============================================================= --> <!-- ============================================================= -->
<Configure id="homeBaseWarning" class="org.eclipse.jetty.server.HomeBaseWarning"></Configure> <!-- Display a Warning Message if {jetty.home} == {jetty.base} -->
<!-- ============================================================= -->
<Configure id="homeBaseWarning" class="org.eclipse.jetty.server.HomeBaseWarning" />

4
jetty-server/src/main/config/etc/jetty-customrequestlog.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Configure the Jetty Request Log --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the Jetty Request Log -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

4
jetty-server/src/main/config/etc/jetty-debug.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- The DebugListener --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- The DebugListener -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<New id="DebugListener" class="org.eclipse.jetty.server.DebugListener"> <New id="DebugListener" class="org.eclipse.jetty.server.DebugListener">

4
jetty-server/src/main/config/etc/jetty-debuglog.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- The DebugHandler --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- The DebugHandler -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="insertHandler"> <Call name="insertHandler">

7
jetty-server/src/main/config/etc/jetty-gzip.xml
View File

@ -1,6 +1,11 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Mixin the GZIP Handler --><!-- This applies the GZIP Handler to the entire server --><!-- If a GZIP handler is required for an individual context, then --><!-- use a context XML (see test.xml example in distribution) --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Mixin the GZIP Handler -->
<!-- This applies the GZIP Handler to the entire server -->
<!-- If a GZIP handler is required for an individual context, then -->
<!-- use a context XML (see test.xml example in distribution) -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="insertHandler"> <Call name="insertHandler">

6
jetty-server/src/main/config/etc/jetty-http.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server" --><!-- by adding an HTTP connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" -->
<!-- by adding an HTTP connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

6
jetty-server/src/main/config/etc/jetty-https.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure an HTTPS connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- and jetty-ssl.xml. --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure an HTTPS connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- and jetty-ssl.xml. -->
<!-- ============================================================= -->
<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector"> <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
<Call name="addIfAbsentConnectionFactory"> <Call name="addIfAbsentConnectionFactory">

4
jetty-server/src/main/config/etc/jetty-ipaccess.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- The IP Access Handler --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- The IP Access Handler -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="insertHandler"> <Call name="insertHandler">

4
jetty-server/src/main/config/etc/jetty-lowresources.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Mixin the Low Resources Monitor --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Mixin the Low Resources Monitor -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="addBean"> <Call name="addBean">

4
jetty-server/src/main/config/etc/jetty-requestlog.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Configure the Jetty Request Log --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the Jetty Request Log -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

4
jetty-server/src/main/config/etc/jetty-ssl-context.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- SSL ContextFactory configuration --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- SSL ContextFactory configuration -->
<!-- ============================================================= -->
<!-- <!--
To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at

6
jetty-server/src/main/config/etc/jetty-ssl.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Base SSL configuration --><!-- This configuration needs to be used together with 1 or more --><!-- of jetty-https.xml or jetty-http2.xml --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Base SSL configuration -->
<!-- This configuration needs to be used together with 1 or more -->
<!-- of jetty-https.xml or jetty-http2.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

4
jetty-server/src/main/config/etc/jetty-stats.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Mixin the Statistics Handler --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Mixin the Statistics Handler -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="insertHandler"> <Call name="insertHandler">

4
jetty-server/src/main/config/etc/jetty-threadlimit.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Mixin the Thread Limit Handler to the entire server --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Mixin the Thread Limit Handler to the entire server -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="insertHandler"> <Call name="insertHandler">

1
jetty-server/src/main/config/etc/sessions/file/session-store.xml
View File

@ -2,7 +2,6 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- ===================================================================== --> <!-- ===================================================================== -->
<!-- Configure a factory for FileSessionStores --> <!-- Configure a factory for FileSessionStores -->
<!-- ===================================================================== --> <!-- ===================================================================== -->

3
jetty-server/src/main/config/etc/sessions/id-manager.xml
View File

@ -2,7 +2,6 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- ===================================================================== --> <!-- ===================================================================== -->
<!-- Configure a SessionIdManager --> <!-- Configure a SessionIdManager -->
<!-- ===================================================================== --> <!-- ===================================================================== -->
@ -27,7 +26,7 @@
<!-- ===================================================================== --> <!-- ===================================================================== -->
<!-- Configure a session housekeeper to help with scavenging --> <!-- Configure a session housekeeper to help with scavenging -->
<!-- ===================================================================== --> <!-- ===================================================================== -->
<Set name="sessionHouseKeeper"> <Set name="sessionHouseKeeper">
<New class="org.eclipse.jetty.server.session.HouseKeeper"> <New class="org.eclipse.jetty.server.session.HouseKeeper">
<Set name="intervalSec"><Property name="jetty.sessionScavengeInterval.seconds" default="600"/></Set> <Set name="intervalSec"><Property name="jetty.sessionScavengeInterval.seconds" default="600"/></Set>
</New> </New>

13
jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml
View File

@ -2,12 +2,11 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor">
<New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor"> <Set name="DatasourceName"><Property name="jetty.session.jdbc.datasourceName" default="/jdbc/sessions" /></Set>
<Set name="DatasourceName"><Property name="jetty.session.jdbc.datasourceName" default="/jdbc/sessions" /></Set> <Set name="blobType"><Property name="jetty.session.jdbc.blobType"/></Set>
<Set name="blobType"><Property name="jetty.session.jdbc.blobType"/></Set> <Set name="longType"><Property name="jetty.session.jdbc.longType"/></Set>
<Set name="longType"><Property name="jetty.session.jdbc.longType"/></Set> <Set name="stringType"><Property name="jetty.session.jdbc.stringType"/></Set>
<Set name="stringType"><Property name="jetty.session.jdbc.stringType"/></Set> </New>
</New>
</Configure> </Configure>

18
jetty-server/src/main/config/etc/sessions/jdbc/driver.xml
View File

@ -2,14 +2,14 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor"> <New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor">
<Call name="setDriverInfo"> <Call name="setDriverInfo">
<Arg><Property name="jetty.session.jdbc.driverClass"/></Arg> <Arg><Property name="jetty.session.jdbc.driverClass"/></Arg>
<Arg><Property name="jetty.session.jdbc.driverUrl"/></Arg> <Arg><Property name="jetty.session.jdbc.driverUrl"/></Arg>
</Call> </Call>
<Set name="blobType"><Property name="jetty.session.jdbc.blobType"/></Set> <Set name="blobType"><Property name="jetty.session.jdbc.blobType"/></Set>
<Set name="longType"><Property name="jetty.session.jdbc.longType"/></Set> <Set name="longType"><Property name="jetty.session.jdbc.longType"/></Set>
<Set name="stringType"><Property name="jetty.session.jdbc.stringType"/></Set> <Set name="stringType"><Property name="jetty.session.jdbc.stringType"/></Set>
</New> </New>
</Configure> </Configure>

103
jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml
View File

@ -3,7 +3,6 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- ===================================================================== --> <!-- ===================================================================== -->
<!-- Configure a factory for JDBCSessionStores --> <!-- Configure a factory for JDBCSessionStores -->
<!-- ===================================================================== --> <!-- ===================================================================== -->
@ -13,58 +12,58 @@
<Set name="gracePeriodSec"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set> <Set name="gracePeriodSec"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
<Set name="savePeriodSec"><Property name="jetty.session.savePeriod.seconds" default="0" /></Set> <Set name="savePeriodSec"><Property name="jetty.session.savePeriod.seconds" default="0" /></Set>
<Set name="databaseAdaptor"> <Set name="databaseAdaptor">
<Ref id="databaseAdaptor"/> <Ref refid="databaseAdaptor"/>
</Set> </Set>
<Set name="sessionTableSchema"> <Set name="sessionTableSchema">
<New <New
class="org.eclipse.jetty.server.session.JDBCSessionDataStore$SessionTableSchema"> class="org.eclipse.jetty.server.session.JDBCSessionDataStore$SessionTableSchema">
<Set name="accessTimeColumn"> <Set name="accessTimeColumn">
<Property name="jetty.session.jdbc.schema.accessTimeColumn" default="accessTime" /> <Property name="jetty.session.jdbc.schema.accessTimeColumn" default="accessTime" />
</Set> </Set>
<Set name="contextPathColumn"> <Set name="contextPathColumn">
<Property name="jetty.session.jdbc.schema.contextPathColumn" default="contextPath" /> <Property name="jetty.session.jdbc.schema.contextPathColumn" default="contextPath" />
</Set> </Set>
<Set name="cookieTimeColumn"> <Set name="cookieTimeColumn">
<Property name="jetty.session.jdbc.schema.cookieTimeColumn" default="cookieTime" /> <Property name="jetty.session.jdbc.schema.cookieTimeColumn" default="cookieTime" />
</Set> </Set>
<Set name="createTimeColumn"> <Set name="createTimeColumn">
<Property name="jetty.session.jdbc.schema.createTimeColumn" default="createTime" /> <Property name="jetty.session.jdbc.schema.createTimeColumn" default="createTime" />
</Set> </Set>
<Set name="expiryTimeColumn"> <Set name="expiryTimeColumn">
<Property name="jetty.session.jdbc.schema.expiryTimeColumn" default="expiryTime" /> <Property name="jetty.session.jdbc.schema.expiryTimeColumn" default="expiryTime" />
</Set> </Set>
<Set name="lastAccessTimeColumn"> <Set name="lastAccessTimeColumn">
<Property name="jetty.session.jdbc.schema.lastAccessTimeColumn" default="lastAccessTime" /> <Property name="jetty.session.jdbc.schema.lastAccessTimeColumn" default="lastAccessTime" />
</Set> </Set>
<Set name="lastSavedTimeColumn"> <Set name="lastSavedTimeColumn">
<Property name="jetty.session.jdbc.schema.lastSavedTimeColumn" default="lastSavedTime" /> <Property name="jetty.session.jdbc.schema.lastSavedTimeColumn" default="lastSavedTime" />
</Set> </Set>
<Set name="idColumn"> <Set name="idColumn">
<Property name="jetty.session.jdbc.schema.idColumn" default="sessionId" /> <Property name="jetty.session.jdbc.schema.idColumn" default="sessionId" />
</Set> </Set>
<Set name="lastNodeColumn"> <Set name="lastNodeColumn">
<Property name="jetty.session.jdbc.schema.lastNodeColumn" default="lastNode" /> <Property name="jetty.session.jdbc.schema.lastNodeColumn" default="lastNode" />
</Set> </Set>
<Set name="virtualHostColumn"> <Set name="virtualHostColumn">
<Property name="jetty.session.jdbc.schema.virtualHostColumn" default="virtualHost" /> <Property name="jetty.session.jdbc.schema.virtualHostColumn" default="virtualHost" />
</Set> </Set>
<Set name="maxIntervalColumn"> <Set name="maxIntervalColumn">
<Property name="jetty.session.jdbc.schema.maxIntervalColumn" default="maxInterval" /> <Property name="jetty.session.jdbc.schema.maxIntervalColumn" default="maxInterval" />
</Set> </Set>
<Set name="mapColumn"> <Set name="mapColumn">
<Property name="jetty.session.jdbc.schema.mapColumn" default="map" /> <Property name="jetty.session.jdbc.schema.mapColumn" default="map" />
</Set> </Set>
<Set name="schemaName"> <Set name="schemaName">
<Property name="jetty.session.jdbc.schema.schemaName" /> <Property name="jetty.session.jdbc.schema.schemaName" />
</Set> </Set>
<Set name="catalogName"> <Set name="catalogName">
<Property name="jetty.session.jdbc.schema.catalogName" /> <Property name="jetty.session.jdbc.schema.catalogName" />
</Set> </Set>
<Set name="tableName"> <Set name="tableName">
<Property name="jetty.session.jdbc.schema.table" default="JettySessions" /> <Property name="jetty.session.jdbc.schema.table" default="JettySessions" />
</Set> </Set>
</New> </New>
</Set> </Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>

21
jetty-server/src/main/config/etc/sessions/session-cache-hash.xml
View File

@ -2,21 +2,20 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- ===================================================================== --> <!-- ===================================================================== -->
<!-- Configure a factory for DefaultSessionCache --> <!-- Configure a factory for DefaultSessionCache -->
<!-- ===================================================================== --> <!-- ===================================================================== -->
<Call name="addBean"> <Call name="addBean">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.session.DefaultSessionCacheFactory"> <New class="org.eclipse.jetty.server.session.DefaultSessionCacheFactory">
<Set name="evictionPolicy"><Property name="jetty.session.evictionPolicy" default="-1" /></Set> <Set name="evictionPolicy"><Property name="jetty.session.evictionPolicy" default="-1" /></Set>
<Set name="saveOnInactiveEvict"><Property name="jetty.session.saveOnInactiveEvict" default="false" /></Set> <Set name="saveOnInactiveEvict"><Property name="jetty.session.saveOnInactiveEvict" default="false" /></Set>
<Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set> <Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
<Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false"/></Set> <Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false"/></Set>
<Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false"/></Set> <Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false"/></Set>
<Set name="invalidateOnShutdown"><Property name="jetty.session.invalidateOnShutdown" default="false"/></Set> <Set name="invalidateOnShutdown"><Property name="jetty.session.invalidateOnShutdown" default="false"/></Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>
</Configure> </Configure>

15
jetty-server/src/main/config/etc/sessions/session-cache-null.xml
View File

@ -2,18 +2,17 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- ===================================================================== --> <!-- ===================================================================== -->
<!-- Configure a factory for NullSessionCache --> <!-- Configure a factory for NullSessionCache -->
<!-- ===================================================================== --> <!-- ===================================================================== -->
<Call name="addBean"> <Call name="addBean">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.session.NullSessionCacheFactory"> <New class="org.eclipse.jetty.server.session.NullSessionCacheFactory">
<Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set> <Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
<Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false"/></Set> <Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false" /></Set>
<Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false"/></Set> <Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false" /></Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>
</Configure> </Configure>

8
jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml
View File

@ -8,17 +8,15 @@
<Call name="removeBean"> <Call name="removeBean">
<Arg> <Arg>
<Ref id="sessionDataStoreFactory"/> <Ref refid="sessionDataStoreFactory"/>
</Arg> </Arg>
</Call> </Call>
<Call name="addBean"> <Call name="addBean">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.session.CachingSessionDataStoreFactory"> <New class="org.eclipse.jetty.server.session.CachingSessionDataStoreFactory">
<Set name="sessionStoreFactory"><Ref id="sessionDataStoreFactory"/></Set> <Set name="sessionStoreFactory"><Ref refid="sessionDataStoreFactory"/></Set>
<Set name="sessionDataMapFactory"><Ref id="sessionDataMapFactory"/></Set> <Set name="sessionDataMapFactory"><Ref refid="sessionDataMapFactory"/></Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>

68
jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml
View File

@ -1,38 +1,38 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="insertHandler"> <Call name="insertHandler">
<Arg> <Arg>
<New id="InetAccessHandler" class="org.eclipse.jetty.server.handler.InetAccessHandler"> <New id="InetAccessHandler" class="org.eclipse.jetty.server.handler.InetAccessHandler">
<Call name="include"> <Call name="include">
<Arg> <Arg>
<Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit"> <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
<Arg><Property name="jetty.inetaccess.include" default=""/></Arg> <Arg><Property name="jetty.inetaccess.include" default="" /></Arg>
</Call> </Call>
</Arg> </Arg>
</Call> </Call>
<Call name="exclude"> <Call name="exclude">
<Arg> <Arg>
<Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit"> <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
<Arg><Property name="jetty.inetaccess.exclude" default=""/></Arg> <Arg><Property name="jetty.inetaccess.exclude" default="" /></Arg>
</Call> </Call>
</Arg> </Arg>
</Call> </Call>
<Call name="includeConnectors"> <Call name="includeConnectors">
<Arg> <Arg>
<Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit"> <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
<Arg><Property name="jetty.inetaccess.includeConnectors" default=""/></Arg> <Arg><Property name="jetty.inetaccess.includeConnectors" default="" /></Arg>
</Call> </Call>
</Arg> </Arg>
</Call> </Call>
<Call name="excludeConnectors"> <Call name="excludeConnectors">
<Arg> <Arg>
<Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit"> <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
<Arg><Property name="jetty.inetaccess.excludeConnectors" default=""/></Arg> <Arg><Property name="jetty.inetaccess.excludeConnectors" default="" /></Arg>
</Call> </Call>
</Arg> </Arg>
</Call> </Call>
</New> </New>
</Arg> </Arg>
</Call> </Call>
</Configure> </Configure>

4
jetty-server/src/main/config/modules/logback-access/jetty-logback-access.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Configure the Logback Request Log --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the Logback Request Log -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Set name="RequestLog"> <Set name="RequestLog">
<New id="RequestLog" class="ch.qos.logback.access.jetty.RequestLogImpl"> <New id="RequestLog" class="ch.qos.logback.access.jetty.RequestLogImpl">

6
jetty-spring/src/main/config/etc/jetty-spring.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!-- =============================================================== --><!-- Configure the Jetty Server with Spring --><!-- This file is the similar to jetty.xml, but written in spring --><!-- XmlBeanFactory format. --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the Jetty Server with Spring -->
<!-- This file is the similar to jetty.xml, but written in spring -->
<!-- XmlBeanFactory format. -->
<!-- =============================================================== -->
<beans> <beans>

8
tests/test-integration/src/test/resources/DefaultHandler.xml
View File

@ -1,6 +1,12 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Configure the Jetty Server --><!-- --><!-- Documentation of this file format can be found at: --><!-- http://docs.codehaus.org/display/JETTY/jetty.xml --><!-- --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the Jetty Server -->
<!-- -->
<!-- Documentation of this file format can be found at: -->
<!-- http://docs.codehaus.org/display/JETTY/jetty.xml -->
<!-- -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">

8
tests/test-integration/src/test/resources/RFC2616Base.xml
View File

@ -1,6 +1,12 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Configure the Jetty Server --><!-- --><!-- Documentation of this file format can be found at: --><!-- http://docs.codehaus.org/display/JETTY/jetty.xml --><!-- --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the Jetty Server -->
<!-- -->
<!-- Documentation of this file format can be found at: -->
<!-- http://docs.codehaus.org/display/JETTY/jetty.xml -->
<!-- -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">

4
tests/test-quickstart/src/test/resources/test-jndi.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Configure the test-jndi webapp --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the test-jndi webapp -->
<!-- =============================================================== -->
<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
<New id="tx" class="org.eclipse.jetty.plus.jndi.Transaction"> <New id="tx" class="org.eclipse.jetty.plus.jndi.Transaction">

4
tests/test-webapps/test-jaas-webapp/src/main/config/demo-base/webapps/test-jaas.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Configure the test-jaas webapp --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the test-jaas webapp -->
<!-- =============================================================== -->
<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/test-jaas</Set> <Set name="contextPath">/test-jaas</Set>

4
tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/demo-rewrite-rules.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Configure the demos --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the demos -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- ============================================================= --> <!-- ============================================================= -->

4
tests/test-webapps/test-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Configure the test-jndi webapp --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the test-jndi webapp -->
<!-- =============================================================== -->
<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
<New id="tx" class="org.eclipse.jetty.plus.jndi.Transaction"> <New id="tx" class="org.eclipse.jetty.plus.jndi.Transaction">

4
tests/test-webapps/test-jndi-webapp/src/main/templates/plugin-context-header.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== --><!-- Configure the test-jndi webapp --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Configure the test-jndi webapp -->
<!-- =============================================================== -->
<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
<New id="tx" class="org.eclipse.jetty.plus.jndi.Transaction"> <New id="tx" class="org.eclipse.jetty.plus.jndi.Transaction">

2
tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
View File

@ -30,7 +30,7 @@
<Arg><Ref refid='wac'/></Arg> <Arg><Ref refid='wac'/></Arg>
<Arg>svr</Arg> <Arg>svr</Arg>
<Arg type="java.lang.String"> <Arg type="java.lang.String">
<Ref id="Server"> <Ref refid="Server">
<Get name="class"> <Get name="class">
<Get name="name"/> <Get name="name"/>
</Get> </Get>