Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml2
-rw-r--r--examples/embedded/src/main/resources/exampleserver.xml8
-rw-r--r--examples/embedded/src/main/resources/fileserver.xml10
-rw-r--r--jetty-annotations/src/main/config/etc/jetty-annotations.xml2
-rw-r--r--jetty-deploy/src/main/config/etc/jetty-deploy.xml8
-rw-r--r--jetty-deploy/src/test/resources/binding-test-contexts-1.xml6
-rw-r--r--jetty-deploy/src/test/resources/context-binding-test-1.xml4
-rw-r--r--jetty-deploy/src/test/resources/jetty-deploy-wars.xml6
-rw-r--r--jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml8
-rw-r--r--jetty-deploy/src/test/resources/jetty.xml4
-rw-r--r--jetty-deploy/src/test/resources/webapps/foo.xml2
-rw-r--r--jetty-distribution/src/main/resources/webapps/example-moved.xml2
-rw-r--r--jetty-jaas/src/main/config/etc/jetty-jaas.xml4
-rw-r--r--jetty-jmx/src/main/config/etc/jetty-jmx.xml18
-rw-r--r--jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-deployer.xml4
-rw-r--r--jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-nested.xml4
-rw-r--r--jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-selector.xml4
-rw-r--r--jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml2
-rw-r--r--jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml6
-rw-r--r--jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deployer.xml4
-rw-r--r--jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-selector.xml4
-rw-r--r--jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml14
-rw-r--r--jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml4
-rw-r--r--jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml2
-rw-r--r--jetty-plus/src/main/config/etc/jetty-plus.xml4
-rw-r--r--jetty-proxy/src/main/config/etc/jetty-proxy.xml10
-rw-r--r--jetty-rewrite/src/main/config/etc/jetty-rewrite.xml12
-rw-r--r--jetty-rewrite/src/test/resources/org.mortbay.jetty.rewrite.handler/jetty-rewrite.xml8
-rw-r--r--jetty-rhttp/jetty-rhttp-connector/src/main/config/etc/jetty-rhttp.xml2
-rw-r--r--jetty-server/src/main/config/etc/jetty-debug.xml4
-rw-r--r--jetty-server/src/main/config/etc/jetty-http.xml4
-rw-r--r--jetty-server/src/main/config/etc/jetty-https.xml10
-rw-r--r--jetty-server/src/main/config/etc/jetty-ipaccess.xml6
-rw-r--r--jetty-server/src/main/config/etc/jetty-requestlog.xml4
-rw-r--r--jetty-server/src/main/config/etc/jetty-stats.xml4
-rw-r--r--jetty-server/src/main/config/etc/jetty-xinetd.xml2
-rw-r--r--jetty-spdy/spdy-example-webapp/src/main/config/example-jetty-spdy-proxy.xml16
-rw-r--r--jetty-spdy/spdy-example-webapp/src/main/config/example-jetty-spdy.xml12
-rw-r--r--jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy-proxy.xml18
-rw-r--r--jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy.xml14
-rw-r--r--jetty-util/src/main/config/etc/jetty-logging.xml8
-rw-r--r--tests/test-integration/src/test/resources/BIOHttp.xml2
-rw-r--r--tests/test-integration/src/test/resources/BIOHttps.xml2
-rw-r--r--tests/test-integration/src/test/resources/DefaultHandler.xml2
-rw-r--r--tests/test-integration/src/test/resources/NIOHttp.xml2
-rw-r--r--tests/test-integration/src/test/resources/NIOHttps.xml2
-rw-r--r--tests/test-integration/src/test/resources/RFC2616Base.xml6
-rw-r--r--tests/test-integration/src/test/resources/RFC2616_Filters.xml4
-rw-r--r--tests/test-integration/src/test/resources/RFC2616_Redirects.xml16
-rw-r--r--tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml2
-rw-r--r--tests/test-webapps/test-jaas-webapp/src/main/config/webapps/test-jaas.xml2
-rw-r--r--tests/test-webapps/test-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml2
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml10
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/config/etc/test-realm.xml6
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/config/webapps/test.xml12
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml2
-rw-r--r--tests/test-webapps/test-jndi-webapp/src/main/templates/env-definitions.xml10
-rw-r--r--tests/test-webapps/test-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml2
-rw-r--r--tests/test-webapps/test-jndi-webapp/src/main/templates/plugin-context-header.xml4
-rw-r--r--tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml8
-rw-r--r--tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml2
-rw-r--r--tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml2
-rw-r--r--tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/env-definitions.xml4
-rw-r--r--tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/plugin-context-header.xml2
-rw-r--r--tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml4
-rw-r--r--tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml2
-rw-r--r--tests/test-webapps/test-servlet-spec/test-spec-webapp/src/test/jetty-plugin-env.xml6
67 files changed, 194 insertions, 194 deletions
diff --git a/examples/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/examples/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index 572942fd5c..3fc6a3b02e 100644
--- a/examples/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/examples/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!--
This is the jetty specific web application configuration file. When starting
diff --git a/examples/embedded/src/main/resources/exampleserver.xml b/examples/embedded/src/main/resources/exampleserver.xml
index 896612e638..a0fc811ab1 100644
--- a/examples/embedded/src/main/resources/exampleserver.xml
+++ b/examples/embedded/src/main/resources/exampleserver.xml
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+
<Configure id="ExampleServer" class="org.eclipse.jetty.server.Server">
<Set name="connectors">
<Array type="org.eclipse.jetty.server.Connector">
<Item>
<New class="org.eclipse.jetty.server.ServerConnector">
- <Arg><Ref id="ExampleServer"/></Arg>
+ <Arg><Ref refid="ExampleServer"/></Arg>
<Set name="port">8080</Set>
</New>
</Item>
@@ -27,7 +27,7 @@
<Set name="handlers">
<Array type="org.eclipse.jetty.server.Handler">
<Item>
- <Ref id="context" />
+ <Ref refid="context" />
</Item>
<Item>
<New class="org.eclipse.jetty.server.handler.DefaultHandler" />
diff --git a/examples/embedded/src/main/resources/fileserver.xml b/examples/embedded/src/main/resources/fileserver.xml
index c12e29171e..0b4daa31f9 100644
--- a/examples/embedded/src/main/resources/fileserver.xml
+++ b/examples/embedded/src/main/resources/fileserver.xml
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+
<Configure id="FileServer" class="org.eclipse.jetty.server.Server">
-
+
<Call name="addConnector">
<Arg>
<New class="org.eclipse.jetty.server.ServerConnector">
- <Arg><Ref id="ExampleServer"/></Arg>
+ <Arg><Ref refid="FileServer"/></Arg>
<Set name="port">8080</Set>
</New>
</Arg>
</Call>
-
+
<Set name="handler">
<New class="org.eclipse.jetty.server.handler.HandlerList">
<Set name="handlers">
diff --git a/jetty-annotations/src/main/config/etc/jetty-annotations.xml b/jetty-annotations/src/main/config/etc/jetty-annotations.xml
index 6598ea53c5..637b511ea1 100644
--- a/jetty-annotations/src/main/config/etc/jetty-annotations.xml
+++ b/jetty-annotations/src/main/config/etc/jetty-annotations.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
diff --git a/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-deploy/src/main/config/etc/jetty-deploy.xml
index 9b42604d6d..9826b5fcda 100644
--- a/jetty-deploy/src/main/config/etc/jetty-deploy.xml
+++ b/jetty-deploy/src/main/config/etc/jetty-deploy.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Create the deployment manager -->
@@ -14,15 +14,15 @@
<Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts">
- <Ref id="Contexts" />
+ <Ref refid="Contexts" />
</Set>
<Call name="setContextAttribute">
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
<Arg>.*/servlet-api-[^/]*\.jar$</Arg>
</Call>
-
+
<!-- Add a customize step to the deployment lifecycle -->
- <!-- uncomment and replace DebugBinding with your extended AppLifeCycle.Binding class
+ <!-- uncomment and replace DebugBinding with your extended AppLifeCycle.Binding class
<Call name="insertLifeCycleNode">
<Arg>deployed</Arg>
<Arg>starting</Arg>
diff --git a/jetty-deploy/src/test/resources/binding-test-contexts-1.xml b/jetty-deploy/src/test/resources/binding-test-contexts-1.xml
index 37f5292ff2..3c6a950c00 100644
--- a/jetty-deploy/src/test/resources/binding-test-contexts-1.xml
+++ b/jetty-deploy/src/test/resources/binding-test-contexts-1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
@@ -29,10 +29,10 @@
<Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts">
- <Ref id="Contexts" />
+ <Ref refid="Contexts" />
</Set>
- <Ref id="DeploymentManager">
+ <Ref refid="DeploymentManager">
<Call name="addLifeCycleBinding">
<Arg>
<New class="org.eclipse.jetty.deploy.bindings.GlobalWebappConfigBinding">
diff --git a/jetty-deploy/src/test/resources/context-binding-test-1.xml b/jetty-deploy/src/test/resources/context-binding-test-1.xml
index 925f2578d6..ae997ac5b7 100644
--- a/jetty-deploy/src/test/resources/context-binding-test-1.xml
+++ b/jetty-deploy/src/test/resources/context-binding-test-1.xml
@@ -26,6 +26,6 @@
<Item>org.eclipse.jetty.servlet.DefaultServlet</Item>
</Array>
- <Set name="serverClasses"><Ref id="serverClasses"/></Set>
- <Set name="systemClasses"><Ref id="systemClasses"/></Set-->
+ <Set name="serverClasses"><Ref refid="serverClasses"/></Set>
+ <Set name="systemClasses"><Ref refid="systemClasses"/></Set-->
</Configure>
diff --git a/jetty-deploy/src/test/resources/jetty-deploy-wars.xml b/jetty-deploy/src/test/resources/jetty-deploy-wars.xml
index 8ef3a1792f..9933cb6ed9 100644
--- a/jetty-deploy/src/test/resources/jetty-deploy-wars.xml
+++ b/jetty-deploy/src/test/resources/jetty-deploy-wars.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
@@ -7,7 +7,7 @@
<Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts">
- <Ref id="Contexts" />
+ <Ref refid="Contexts" />
</Set>
<!-- Providers of Apps -->
@@ -17,7 +17,7 @@
<New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
<Set name="monitoredDirName"><SystemProperty name="jetty.home" />/webapps</Set>
<Set name="scanInterval">1</Set>
- <Set name="tempDir"><Property name="jetty.home" default="target" />/workish</Set>
+ <Set name="tempDir"><Property name="jetty.home" default="target" />/workish</Set>
</New>
</Item>
</Array>
diff --git a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
index ba38daef80..04cfa34ac6 100644
--- a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
+++ b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
@@ -1,21 +1,21 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="addBean">
<Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts">
- <Ref id="Contexts" />
+ <Ref refid="Contexts" />
</Set>
-
+
<!-- Providers of Apps -->
<Set name="appProviders">
<Array type="org.eclipse.jetty.deploy.AppProvider">
<Item>
<New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
<Set name="monitoredDirName"><SystemProperty name="jetty.home" />/webapps</Set>
- <Set name="scanInterval">1</Set>
+ <Set name="scanInterval">1</Set>
<Set name="configurationManager">
<New class="org.eclipse.jetty.deploy.PropertiesConfigurationManager">
<Set name="file">
diff --git a/jetty-deploy/src/test/resources/jetty.xml b/jetty-deploy/src/test/resources/jetty.xml
index c3083f633c..fa285624ea 100644
--- a/jetty-deploy/src/test/resources/jetty.xml
+++ b/jetty-deploy/src/test/resources/jetty.xml
@@ -28,7 +28,7 @@
<Call name="addConnector">
<Arg>
<New class="org.eclipse.jetty.server.ServerConnector">
- <Arg><Ref id="Server" /></Arg>
+ <Arg><Ref refid="Server" /></Arg>
<Set name="host"></Set>
<Set name="port">0</Set>
<Set name="idleTimeout">300000</Set>
@@ -95,7 +95,7 @@
<!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
<!-- for an example). -->
<!-- =========================================================== -->
- <Ref id="RequestLog">
+ <Ref refid="RequestLog">
<Set name="requestLog">
<New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
<Set name="filename"><SystemProperty name="jetty.home" default="."/>/logs/yyyy_mm_dd.request.log</Set>
diff --git a/jetty-deploy/src/test/resources/webapps/foo.xml b/jetty-deploy/src/test/resources/webapps/foo.xml
index 4c730f0b49..adf1ac2648 100644
--- a/jetty-deploy/src/test/resources/webapps/foo.xml
+++ b/jetty-deploy/src/test/resources/webapps/foo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/foo</Set>
<Set name="war">
diff --git a/jetty-distribution/src/main/resources/webapps/example-moved.xml b/jetty-distribution/src/main/resources/webapps/example-moved.xml
index 6e72d39d53..4b176a4467 100644
--- a/jetty-distribution/src/main/resources/webapps/example-moved.xml
+++ b/jetty-distribution/src/main/resources/webapps/example-moved.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- Simple handler to redirect from old path to new -->
<Configure class="org.eclipse.jetty.server.handler.MovedContextHandler">
diff --git a/jetty-jaas/src/main/config/etc/jetty-jaas.xml b/jetty-jaas/src/main/config/etc/jetty-jaas.xml
index 0d9613dfbe..e3994785dc 100644
--- a/jetty-jaas/src/main/config/etc/jetty-jaas.xml
+++ b/jetty-jaas/src/main/config/etc/jetty-jaas.xml
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
+
<!-- ======================================================== -->
<!-- java.security.auth.login.config System property -->
<!-- This is usually a runtime parameter to the jvm, but -->
diff --git a/jetty-jmx/src/main/config/etc/jetty-jmx.xml b/jetty-jmx/src/main/config/etc/jetty-jmx.xml
index 8bf523c11b..2732c4069e 100644
--- a/jetty-jmx/src/main/config/etc/jetty-jmx.xml
+++ b/jetty-jmx/src/main/config/etc/jetty-jmx.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
@@ -7,13 +7,13 @@
<!-- Set the java.rmi.server.hostname property in case you've -->
<!-- got a misconfigured /etc/hosts entry or the like. -->
<!-- =========================================================== -->
- <!--
+ <!--
<Call class="java.lang.System" name="setProperty">
<Arg>java.rmi.server.hostname</Arg>
<Arg>127.0.0.1</Arg>
</Call>
-->
-
+
<!-- =========================================================== -->
<!-- Get the platform mbean server -->
<!-- =========================================================== -->
@@ -27,7 +27,7 @@
<Arg>
<New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer">
<Arg>
- <Ref id="MBeanServer" />
+ <Ref refid="MBeanServer" />
</Arg>
</New>
</Arg>
@@ -39,12 +39,12 @@
<New class="org.eclipse.jetty.util.log.Log" />
</Arg>
</Call>
-
+
<!-- In order to connect to the JMX server remotely from a different
process, possibly running on a different host, Jetty JMX module
can create a remote JMX connector. It requires RMI registry to
be started prior to creating the connector server because the
- JMX specification uses RMI to facilitate connections.
+ JMX specification uses RMI to facilitate connections.
-->
<!-- Optionally start the RMI registry. Normally RMI registry runs on
@@ -59,15 +59,15 @@
</Call>
</Call>
-->
-
+
<!-- Optionally add a remote JMX connector. The parameters of the constructor
below specify the JMX service URL, and the object name string for the
- connector server bean. The parameters of the JMXServiceURL constructor
+ connector server bean. The parameters of the JMXServiceURL constructor
specify the protocol that clients will use to connect to the remote JMX
connector (RMI), the hostname of the server (local hostname), port number
(automatically assigned), and the URL path. Note that URL path contains
the RMI registry hostname and port number, that may need to be modified
- in order to comply with the firewall requirements.
+ in order to comply with the firewall requirements.
-->
<!--
<New id="ConnectorServer" class="org.eclipse.jetty.jmx.ConnectorServer">
diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-deployer.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-deployer.xml
index 99c4d74a10..f3faa68b83 100644
--- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-deployer.xml
+++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-deployer.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
@@ -10,7 +10,7 @@
<Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts">
- <Ref id="Contexts" />
+ <Ref refid="Contexts" />
</Set>
<Call name="setContextAttribute">
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-nested.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-nested.xml
index c11cec1192..48a0f1d495 100644
--- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-nested.xml
+++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-nested.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Configure the Jetty Server Nested inside another -->
@@ -23,7 +23,7 @@
<Call name="addLifeCycleListener">
<Arg>
<New class="org.eclipse.jetty.osgi.nested.NestedConnectorListener" id="NestedConnectorListener">
- <Set name="nestedConnector"><Ref id="NestedConnector"/></Set>
+ <Set name="nestedConnector"><Ref refid="NestedConnector"/></Set>
</New>
</Arg>
</Call>
diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-selector.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-selector.xml
index 4fd87d38b1..badf00e976 100644
--- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-selector.xml
+++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-selector.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
@@ -11,7 +11,7 @@
<Call name="addConnector">
<Arg>
<New class="org.eclipse.jetty.server.ServerConnector">
- <Arg><Ref id="Server" /></Arg>
+ <Arg><Ref refid="Server" /></Arg>
<Set name="host"><Property name="jetty.host" /></Set>
<Set name="port"><Property name="jetty.port" default="8080"/></Set>
<Set name="idleTimeout">300000</Set>
diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml
index 57928f1c0f..7df9ee2d00 100644
--- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml
+++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
diff --git a/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml b/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml
index e39508c26a..8839eaa543 100644
--- a/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml
+++ b/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!--
Copyright (c) 2009-2011 Intalio, Inc.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
and Apache License v2.0 which accompanies this distribution.
- The Eclipse Public License is available at
+ The Eclipse Public License is available at
http://www.eclipse.org/legal/epl-v10.html
The Apache License v2.0 is available at
http://www.opensource.org/licenses/apache2.0.php
- You may elect to redistribute this code under either of these licenses.
+ You may elect to redistribute this code under either of these licenses.
Contributors:
Hugues Malphettes - initial API and implementation
-->
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deployer.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deployer.xml
index 99c4d74a10..f3faa68b83 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deployer.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deployer.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
@@ -10,7 +10,7 @@
<Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts">
- <Ref id="Contexts" />
+ <Ref refid="Contexts" />
</Set>
<Call name="setContextAttribute">
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-selector.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-selector.xml
index 4fd87d38b1..badf00e976 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-selector.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-selector.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
@@ -11,7 +11,7 @@
<Call name="addConnector">
<Arg>
<New class="org.eclipse.jetty.server.ServerConnector">
- <Arg><Ref id="Server" /></Arg>
+ <Arg><Ref refid="Server" /></Arg>
<Set name="host"><Property name="jetty.host" /></Set>
<Set name="port"><Property name="jetty.port" default="8080"/></Set>
<Set name="idleTimeout">300000</Set>
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml
index be4958b051..d3244b67c0 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml
@@ -38,7 +38,7 @@
<!-- =========================================================== -->
<!-- Add HTTP Customizer for Secure request -->
<!-- =========================================================== -->
- <Ref id="httpConfig">
+ <Ref refid="httpConfig">
<Call name="addCustomizer">
<Arg>
<New class="org.eclipse.jetty.server.SecureRequestCustomizer"/>
@@ -89,7 +89,7 @@
<Arg>
<New class="org.eclipse.jetty.server.ServerConnector">
<Arg name="server">
- <Ref id="Server"/>
+ <Ref refid="Server"/>
</Arg>
<Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory">
@@ -97,7 +97,7 @@
<New class="org.eclipse.jetty.server.SslConnectionFactory">
<Arg name="next">npn</Arg>
<Arg name="sslContextFactory">
- <Ref id="sslContextFactory"/>
+ <Ref refid="sslContextFactory"/>
</Arg>
</New>
</Item>
@@ -119,9 +119,9 @@
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">3</Arg>
<Arg name="config">
- <Ref id="httpConfig"/>
+ <Ref refid="httpConfig"/>
</Arg>
- <!-- <Arg name="pushStrategy"><Ref id="pushStrategy"/></Arg> -->
+ <!-- <Arg name="pushStrategy"><Ref refid="pushStrategy"/></Arg> -->
</New>
</Item>
@@ -129,7 +129,7 @@
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">2</Arg>
<Arg name="config">
- <Ref id="httpConfig"/>
+ <Ref refid="httpConfig"/>
</Arg>
</New>
</Item>
@@ -137,7 +137,7 @@
<Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
<Arg name="config">
- <Ref id="httpConfig"/>
+ <Ref refid="httpConfig"/>
</Arg>
</New>
</Item>
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml
index c3f06c559a..d26b427b5c 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
<!-- Configure Authentication Login Service -->
@@ -17,4 +17,4 @@
</New>
</Arg>
</Call>
-</Configure> \ No newline at end of file
+</Configure>
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
index 57928f1c0f..7df9ee2d00 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
diff --git a/jetty-plus/src/main/config/etc/jetty-plus.xml b/jetty-plus/src/main/config/etc/jetty-plus.xml
index 25f977be3f..4a5c3b4145 100644
--- a/jetty-plus/src/main/config/etc/jetty-plus.xml
+++ b/jetty-plus/src/main/config/etc/jetty-plus.xml
@@ -25,7 +25,7 @@
<!-- login.conf file, and the realm Name must be the same as in -->
<!-- the web.xml file. -->
<!-- =========================================================== -->
- <!--
+ <!--
<Call name="addBean">
<Arg>
<New class="org.eclipse.jetty.plus.jaas.JAASLoginService">
@@ -63,7 +63,7 @@
<!-- deploy webapps from a directory called webapps-plus. Note -->
<!-- that you will need to create this directory first! -->
<!--
- <Ref id="DeploymentManager">
+ <Ref refid="DeploymentManager">
<Call name="addAppProvider">
<Arg>
<New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
diff --git a/jetty-proxy/src/main/config/etc/jetty-proxy.xml b/jetty-proxy/src/main/config/etc/jetty-proxy.xml
index 2ba165473d..8a09bba66e 100644
--- a/jetty-proxy/src/main/config/etc/jetty-proxy.xml
+++ b/jetty-proxy/src/main/config/etc/jetty-proxy.xml
@@ -17,7 +17,7 @@
<Call name="addConnector">
<Arg>
<New class="org.eclipse.jetty.server.ServerConnector">
- <Arg name="server"><Ref id="Proxy" /></Arg>
+ <Arg name="server"><Ref refid="Proxy" /></Arg>
<Set name="host"><Property name="jetty.host" /></Set>
<Set name="port"><Property name="jetty.port" default="8888"/></Set>
<Set name="idleTimeout">300000</Set>
@@ -32,10 +32,10 @@
<Call id="proxyHolder" name="addServletWithMapping">
<Arg>org.eclipse.jetty.proxy.ProxyServlet</Arg>
<Arg>/</Arg>
- <Call name="setInitParameter">
- <Arg>maxThreads</Arg>
- <Arg>128</Arg>
- </Call>
+ <Call name="setInitParameter">
+ <Arg>maxThreads</Arg>
+ <Arg>128</Arg>
+ </Call>
</Call>
</New>
</Set>
diff --git a/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml b/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml
index 5a66808ed3..fd0a891da8 100644
--- a/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml
+++ b/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Mixin the RewriteHandler -->
@@ -9,13 +9,13 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
- <!-- configure rewrite handler -->
+ <!-- configure rewrite handler -->
<!-- =========================================================== -->
<Get id="oldhandler" name="handler"/>
<Set name="handler">
<New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
- <Set name="handler"><Ref id="oldhandler"/></Set>
+ <Set name="handler"><Ref refid="oldhandler"/></Set>
<Set name="rewriteRequestURI">true</Set>
<Set name="rewritePathInfo">false</Set>
<Set name="originalPathAttribute">requestedPath</Set>
@@ -68,7 +68,7 @@
</New>
</Arg>
</Call>
-
+
<!-- reverse the order of the path sections -->
<Call name="addRule">
<Arg>
@@ -89,7 +89,7 @@
</New>
</Arg>
</Call>
-
+
<!-- actual redirect, instead of internal rewrite -->
<Call name="addRule">
<Arg>
@@ -113,5 +113,5 @@
</New>
</Set>
-
+
</Configure>
diff --git a/jetty-rewrite/src/test/resources/org.mortbay.jetty.rewrite.handler/jetty-rewrite.xml b/jetty-rewrite/src/test/resources/org.mortbay.jetty.rewrite.handler/jetty-rewrite.xml
index a59094ec7f..b54d24fb08 100644
--- a/jetty-rewrite/src/test/resources/org.mortbay.jetty.rewrite.handler/jetty-rewrite.xml
+++ b/jetty-rewrite/src/test/resources/org.mortbay.jetty.rewrite.handler/jetty-rewrite.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Configure the Jetty Server -->
@@ -197,7 +197,7 @@
<Call name="addBean">
<Arg>
<New class="org.eclipse.jetty.server.deployer.ContextDeployer">
- <Set name="contexts"><Ref id="Contexts"/></Set>
+ <Set name="contexts"><Ref refid="Contexts"/></Set>
<Set name="configurationDir"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
<Set name="scanInterval">1</Set>
</New>
@@ -220,7 +220,7 @@
<Call name="addBean">
<Arg>
<New class="org.eclipse.jetty.server.deployer.WebAppDeployer">
- <Set name="contexts"><Ref id="Contexts"/></Set>
+ <Set name="contexts"><Ref refid="Contexts"/></Set>
<Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/webapps</Set>
<Set name="parentLoaderPriority">false</Set>
<Set name="extract">true</Set>
@@ -256,7 +256,7 @@
<!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
<!-- for an example). -->
<!-- =========================================================== -->
- <Ref id="RequestLog">
+ <Ref refid="RequestLog">
<Set name="requestLog">
<New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
<Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Set>
diff --git a/jetty-rhttp/jetty-rhttp-connector/src/main/config/etc/jetty-rhttp.xml b/jetty-rhttp/jetty-rhttp-connector/src/main/config/etc/jetty-rhttp.xml
index ba7055f552..21417947ab 100644
--- a/jetty-rhttp/jetty-rhttp-connector/src/main/config/etc/jetty-rhttp.xml
+++ b/jetty-rhttp/jetty-rhttp-connector/src/main/config/etc/jetty-rhttp.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Configure the Jetty Reverse HTTP Connector -->
diff --git a/jetty-server/src/main/config/etc/jetty-debug.xml b/jetty-server/src/main/config/etc/jetty-debug.xml
index 6d66953fe5..52b4bdb38e 100644
--- a/jetty-server/src/main/config/etc/jetty-debug.xml
+++ b/jetty-server/src/main/config/etc/jetty-debug.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Mixin the DebugHandler -->
@@ -10,7 +10,7 @@
<Get id="oldhandler" name="handler"/>
<Set name="handler">
<New id="DebugHandler" class="org.eclipse.jetty.server.handler.DebugHandler">
- <Set name="handler"><Ref id="oldhandler"/></Set>
+ <Set name="handler"><Ref refid="oldhandler"/></Set>
<Set name="outputStream">
<New class="org.eclipse.jetty.util.RolloverFileOutputStream">
<Arg type="String"><Property name="jetty.logs" default="./logs"/>/yyyy_mm_dd.debug.log</Arg>
diff --git a/jetty-server/src/main/config/etc/jetty-http.xml b/jetty-server/src/main/config/etc/jetty-http.xml
index e0600afc22..731304e7a2 100644
--- a/jetty-server/src/main/config/etc/jetty-http.xml
+++ b/jetty-server/src/main/config/etc/jetty-http.xml
@@ -21,12 +21,12 @@
<Call name="addConnector">
<Arg>
<New class="org.eclipse.jetty.server.ServerConnector">
- <Arg name="server"><Ref id="Server" /></Arg>
+ <Arg name="server"><Ref refid="Server" /></Arg>
<Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory">
<Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Arg name="config"><Ref id="httpConfig" /></Arg>
+ <Arg name="config"><Ref refid="httpConfig" /></Arg>
</New>
</Item>
</Array>
diff --git a/jetty-server/src/main/config/etc/jetty-https.xml b/jetty-server/src/main/config/etc/jetty-https.xml
index 6bcfd048d5..82a57d608d 100644
--- a/jetty-server/src/main/config/etc/jetty-https.xml
+++ b/jetty-server/src/main/config/etc/jetty-https.xml
@@ -25,7 +25,7 @@
<Set name="TrustStorePath"><Property name="jetty.home" default="." />/etc/keystore</Set>
<Set name="TrustStorePassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
</New>
-
+
<!-- =========================================================== -->
<!-- Create a TLS specific HttpConfiguration based on the -->
<!-- common HttpConfiguration defined in jetty.xml -->
@@ -33,7 +33,7 @@
<!-- session information -->
<!-- =========================================================== -->
<New id="tlsHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
- <Arg><Ref id="httpConfig"/></Arg>
+ <Arg><Ref refid="httpConfig"/></Arg>
<Call name="addCustomizer">
<Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg>
</Call>
@@ -54,18 +54,18 @@
<Call id="sslConnector" name="addConnector">
<Arg>
<New class="org.eclipse.jetty.server.ServerConnector">
- <Arg name="server"><Ref id="Server" /></Arg>
+ <Arg name="server"><Ref refid="Server" /></Arg>
<Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory">
<Item>
<New class="org.eclipse.jetty.server.SslConnectionFactory">
<Arg name="next">http/1.1</Arg>
- <Arg name="sslContextFactory"><Ref id="sslContextFactory"/></Arg>
+ <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg>
</New>
</Item>
<Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Arg name="config"><Ref id="tlsHttpConfig"/></Arg>
+ <Arg name="config"><Ref refid="tlsHttpConfig"/></Arg>
</New>
</Item>
</Array>
diff --git a/jetty-server/src/main/config/etc/jetty-ipaccess.xml b/jetty-server/src/main/config/etc/jetty-ipaccess.xml
index d5fb5f83bd..deef173687 100644
--- a/jetty-server/src/main/config/etc/jetty-ipaccess.xml
+++ b/jetty-server/src/main/config/etc/jetty-ipaccess.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Mixin the Statistics Handler -->
@@ -12,7 +12,7 @@
<Set name="handler">
<New id="IPAccessHandler" class="org.eclipse.jetty.server.handler.IPAccessHandler">
- <Set name="handler"><Ref id="oldhandler"/></Set>
+ <Set name="handler"><Ref refid="oldhandler"/></Set>
<Set name="white">
<Array type="String">
<Item>127.0.0.1</Item>
@@ -27,5 +27,5 @@
</Set>
</New>
</Set>
-
+
</Configure>
diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml
index 27cd15031e..984eb6a887 100644
--- a/jetty-server/src/main/config/etc/jetty-requestlog.xml
+++ b/jetty-server/src/main/config/etc/jetty-requestlog.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Configure the Jetty Request Log -->
@@ -9,7 +9,7 @@
<!-- =========================================================== -->
<!-- Configure Request Log -->
<!-- =========================================================== -->
- <Ref id="Handlers">
+ <Ref refid="Handlers">
<Call name="addHandler">
<Arg>
<New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler">
diff --git a/jetty-server/src/main/config/etc/jetty-stats.xml b/jetty-server/src/main/config/etc/jetty-stats.xml
index 03b3d1f0ce..dbef0e2c56 100644
--- a/jetty-server/src/main/config/etc/jetty-stats.xml
+++ b/jetty-server/src/main/config/etc/jetty-stats.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Mixin the Statistics Handler -->
@@ -9,7 +9,7 @@
<Get id="oldhandler" name="handler" />
<Set name="handler">
<New id="StatsHandler" class="org.eclipse.jetty.server.handler.StatisticsHandler">
- <Set name="handler"><Ref id="oldhandler" /></Set>
+ <Set name="handler"><Ref refid="oldhandler" /></Set>
</New>
</Set>
</Configure>
diff --git a/jetty-server/src/main/config/etc/jetty-xinetd.xml b/jetty-server/src/main/config/etc/jetty-xinetd.xml
index e2985d0109..c59913b2d7 100644
--- a/jetty-server/src/main/config/etc/jetty-xinetd.xml
+++ b/jetty-server/src/main/config/etc/jetty-xinetd.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Configuration for starting up Jetty using inetd/xinetd -->
diff --git a/jetty-spdy/spdy-example-webapp/src/main/config/example-jetty-spdy-proxy.xml b/jetty-spdy/spdy-example-webapp/src/main/config/example-jetty-spdy-proxy.xml
index 31a85228a5..7d3d360ac8 100644
--- a/jetty-spdy/spdy-example-webapp/src/main/config/example-jetty-spdy-proxy.xml
+++ b/jetty-spdy/spdy-example-webapp/src/main/config/example-jetty-spdy-proxy.xml
@@ -47,7 +47,7 @@
<Arg>
<New class="org.eclipse.jetty.server.ServerConnector">
<Arg name="server">
- <Ref id="Server"/>
+ <Ref refid="Server"/>
</Arg>
<Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory">
@@ -56,7 +56,7 @@
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">3</Arg>
<Arg name="config">
- <Ref id="tlsHttpConfig"/>
+ <Ref refid="tlsHttpConfig"/>
</Arg>
</New>
</Item>
@@ -88,7 +88,7 @@
<Call name="putProxyEngine">
<Arg>spdy/3</Arg>
<Arg>
- <Ref id="spdyProxyEngine"/>
+ <Ref refid="spdyProxyEngine"/>
</Arg>
</Call>
<Set name="proxyServerInfos">
@@ -118,10 +118,10 @@
<Arg>
<New class="org.eclipse.jetty.spdy.server.proxy.HTTPSPDYProxyServerConnector">
<Arg>
- <Ref id="Server"/>
+ <Ref refid="Server"/>
</Arg>
<Arg>
- <Ref id="proxyEngineSelector"/>
+ <Ref refid="proxyEngineSelector"/>
</Arg>
<Set name="Port">8080</Set>
</New>
@@ -131,13 +131,13 @@
<Arg>
<New class="org.eclipse.jetty.spdy.server.proxy.HTTPSPDYProxyServerConnector">
<Arg>
- <Ref id="Server"/>
+ <Ref refid="Server"/>
</Arg>
<Arg>
- <Ref id="sslContextFactory"/>
+ <Ref refid="sslContextFactory"/>
</Arg>
<Arg>
- <Ref id="proxyEngineSelector"/>
+ <Ref refid="proxyEngineSelector"/>
</Arg>
<Set name="Port">8443</Set>
</New>
diff --git a/jetty-spdy/spdy-example-webapp/src/main/config/example-jetty-spdy.xml b/jetty-spdy/spdy-example-webapp/src/main/config/example-jetty-spdy.xml
index d8988bbe9d..47f83be825 100644
--- a/jetty-spdy/spdy-example-webapp/src/main/config/example-jetty-spdy.xml
+++ b/jetty-spdy/spdy-example-webapp/src/main/config/example-jetty-spdy.xml
@@ -68,7 +68,7 @@
<Call id="sslConnector" name="addConnector">
<Arg>
<New class="org.eclipse.jetty.server.ServerConnector">
- <Arg name="server"><Ref id="Server"/></Arg>
+ <Arg name="server"><Ref refid="Server"/></Arg>
<Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory">
@@ -77,7 +77,7 @@
<New class="org.eclipse.jetty.server.SslConnectionFactory">
<Arg name="next">npn</Arg>
<Arg name="sslContextFactory">
- <Ref id="sslContextFactory"/>
+ <Ref refid="sslContextFactory"/>
</Arg>
</New>
</Item>
@@ -101,10 +101,10 @@
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">3</Arg>
<Arg name="config">
- <Ref id="tlsHttpConfig"/>
+ <Ref refid="tlsHttpConfig"/>
</Arg>
<Arg name="pushStrategy">
- <Ref id="pushStrategy"/>
+ <Ref refid="pushStrategy"/>
</Arg>
</New>
</Item>
@@ -114,7 +114,7 @@
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">2</Arg>
<Arg name="config">
- <Ref id="tlsHttpConfig"/>
+ <Ref refid="tlsHttpConfig"/>
</Arg>
</New>
</Item>
@@ -123,7 +123,7 @@
<Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
<Arg name="config">
- <Ref id="tlsHttpConfig"/>
+ <Ref refid="tlsHttpConfig"/>
</Arg>
</New>
</Item>
diff --git a/jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy-proxy.xml b/jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy-proxy.xml
index 3b374d7915..c525bd1797 100644
--- a/jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy-proxy.xml
+++ b/jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy-proxy.xml
@@ -39,7 +39,7 @@
<!-- session information -->
<!-- =========================================================== -->
<New id="tlsHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
- <Arg><Ref id="httpConfig"/></Arg>
+ <Arg><Ref refid="httpConfig"/></Arg>
<Call name="addCustomizer">
<Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg>
</Call>
@@ -53,7 +53,7 @@
<Arg>
<New class="org.eclipse.jetty.server.ServerConnector">
<Arg name="server">
- <Ref id="Server"/>
+ <Ref refid="Server"/>
</Arg>
<Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory">
@@ -62,7 +62,7 @@
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">3</Arg>
<Arg name="config">
- <Ref id="tlsHttpConfig"/>
+ <Ref refid="tlsHttpConfig"/>
</Arg>
</New>
</Item>
@@ -98,7 +98,7 @@
<Call name="putProxyEngine">
<Arg>spdy/3</Arg>
<Arg>
- <Ref id="spdyProxyEngine"/>
+ <Ref refid="spdyProxyEngine"/>
</Arg>
</Call>
<Set name="proxyServerInfos">
@@ -129,10 +129,10 @@
<Arg>
<New class="org.eclipse.jetty.spdy.server.proxy.HTTPSPDYProxyServerConnector">
<Arg>
- <Ref id="Server"/>
+ <Ref refid="Server"/>
</Arg>
<Arg>
- <Ref id="proxyEngineSelector"/>
+ <Ref refid="proxyEngineSelector"/>
</Arg>
<Set name="Port">8080</Set>
</New>
@@ -142,13 +142,13 @@
<Arg>
<New class="org.eclipse.jetty.spdy.server.proxy.HTTPSPDYProxyServerConnector">
<Arg>
- <Ref id="Server"/>
+ <Ref refid="Server"/>
</Arg>
<Arg>
- <Ref id="sslContextFactory"/>
+ <Ref refid="sslContextFactory"/>
</Arg>
<Arg>
- <Ref id="proxyEngineSelector"/>
+ <Ref refid="proxyEngineSelector"/>
</Arg>
<Set name="Port">8443</Set>
</New>
diff --git a/jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy.xml b/jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy.xml
index 57f232d973..e6361a873a 100644
--- a/jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy.xml
+++ b/jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy.xml
@@ -39,7 +39,7 @@
<!-- session information -->
<!-- =========================================================== -->
<New id="tlsHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
- <Arg><Ref id="httpConfig"/></Arg>
+ <Arg><Ref refid="httpConfig"/></Arg>
<Call name="addCustomizer">
<Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg>
</Call>
@@ -105,7 +105,7 @@
<Call id="sslConnector" name="addConnector">
<Arg>
<New class="org.eclipse.jetty.server.ServerConnector">
- <Arg name="server"><Ref id="Server" /></Arg>
+ <Arg name="server"><Ref refid="Server" /></Arg>
<Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory">
@@ -113,7 +113,7 @@
<Item>
<New class="org.eclipse.jetty.server.SslConnectionFactory">
<Arg name="next">npn</Arg>
- <Arg name="sslContextFactory"><Ref id="sslContextFactory" /></Arg>
+ <Arg name="sslContextFactory"><Ref refid="sslContextFactory" /></Arg>
</New>
</Item>
@@ -133,8 +133,8 @@
<Item>
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">3</Arg>
- <Arg name="config"><Ref id="tlsHttpConfig" /></Arg>
- <Arg name="pushStrategy"><Ref id="pushStrategy"/></Arg>
+ <Arg name="config"><Ref refid="tlsHttpConfig" /></Arg>
+ <Arg name="pushStrategy"><Ref refid="pushStrategy"/></Arg>
</New>
</Item>
@@ -142,14 +142,14 @@
<Item>
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">2</Arg>
- <Arg name="config"><Ref id="tlsHttpConfig" /></Arg>
+ <Arg name="config"><Ref refid="tlsHttpConfig" /></Arg>
</New>
</Item>
<!-- HTTP Connection factory -->
<Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Arg name="config"><Ref id="tlsHttpConfig" /></Arg>
+ <Arg name="config"><Ref refid="tlsHttpConfig" /></Arg>
</New>
</Item>
</Array>
diff --git a/jetty-util/src/main/config/etc/jetty-logging.xml b/jetty-util/src/main/config/etc/jetty-logging.xml
index a432994572..fa232ef829 100644
--- a/jetty-util/src/main/config/etc/jetty-logging.xml
+++ b/jetty-util/src/main/config/etc/jetty-logging.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
@@ -23,10 +23,10 @@
</New>
<Get class="org.eclipse.jetty.util.log.Log" name="rootLogger">
- <Call name="info"><Arg>Redirecting stderr/stdout to <Ref id="ServerLogName"/></Arg></Call>
+ <Call name="info"><Arg>Redirecting stderr/stdout to <Ref refid="ServerLogName"/></Arg></Call>
</Get>
- <Call class="java.lang.System" name="setErr"><Arg><Ref id="ServerLog"/></Arg></Call>
- <Call class="java.lang.System" name="setOut"><Arg><Ref id="ServerLog"/></Arg></Call>
+ <Call class="java.lang.System" name="setErr"><Arg><Ref refid="ServerLog"/></Arg></Call>
+ <Call class="java.lang.System" name="setOut"><Arg><Ref refid="ServerLog"/></Arg></Call>
</Configure>
diff --git a/tests/test-integration/src/test/resources/BIOHttp.xml b/tests/test-integration/src/test/resources/BIOHttp.xml
index e40cad0cdd..751a3c2cd0 100644
--- a/tests/test-integration/src/test/resources/BIOHttp.xml
+++ b/tests/test-integration/src/test/resources/BIOHttp.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/tests/test-integration/src/test/resources/BIOHttps.xml b/tests/test-integration/src/test/resources/BIOHttps.xml
index d3372b0981..d845957d14 100644
--- a/tests/test-integration/src/test/resources/BIOHttps.xml
+++ b/tests/test-integration/src/test/resources/BIOHttps.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/tests/test-integration/src/test/resources/DefaultHandler.xml b/tests/test-integration/src/test/resources/DefaultHandler.xml
index a71200f526..dd6805d5fa 100644
--- a/tests/test-integration/src/test/resources/DefaultHandler.xml
+++ b/tests/test-integration/src/test/resources/DefaultHandler.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Configure the Jetty Server -->
diff --git a/tests/test-integration/src/test/resources/NIOHttp.xml b/tests/test-integration/src/test/resources/NIOHttp.xml
index 42de804e8a..4372a16ba6 100644
--- a/tests/test-integration/src/test/resources/NIOHttp.xml
+++ b/tests/test-integration/src/test/resources/NIOHttp.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/tests/test-integration/src/test/resources/NIOHttps.xml b/tests/test-integration/src/test/resources/NIOHttps.xml
index 0197c41b17..d99d67e322 100644
--- a/tests/test-integration/src/test/resources/NIOHttps.xml
+++ b/tests/test-integration/src/test/resources/NIOHttps.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/tests/test-integration/src/test/resources/RFC2616Base.xml b/tests/test-integration/src/test/resources/RFC2616Base.xml
index 8ede492f29..b110e94061 100644
--- a/tests/test-integration/src/test/resources/RFC2616Base.xml
+++ b/tests/test-integration/src/test/resources/RFC2616Base.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Configure the Jetty Server -->
@@ -91,7 +91,7 @@
<Call name="addBean">
<Arg>
<New class="org.eclipse.jetty.deploy.ContextDeployer">
- <Set name="contexts"><Ref id="WebappContexts"/></Set>
+ <Set name="contexts"><Ref refid="WebappContexts"/></Set>
<Set name="configurationDir"><Property name="test.resourcesdir" default="src/test/resources"/>/webapp-contexts/RFC2616</Set>
<Set name="scanInterval">0</Set>
<Set name="configurationManager">
@@ -120,7 +120,7 @@
<Call name="addBean">
<Arg>
<New class="org.eclipse.jetty.deploy.WebAppDeployer">
- <Set name="contexts"><Ref id="WebappContexts"/></Set>
+ <Set name="contexts"><Ref refid="WebappContexts"/></Set>
<Set name="webAppDir"><Property name="test.targetdir" default="target"/>/webapps</Set>
<Set name="parentLoaderPriority">false</Set>
<Set name="extract">true</Set>
diff --git a/tests/test-integration/src/test/resources/RFC2616_Filters.xml b/tests/test-integration/src/test/resources/RFC2616_Filters.xml
index fed2cc8d79..a798bfd986 100644
--- a/tests/test-integration/src/test/resources/RFC2616_Filters.xml
+++ b/tests/test-integration/src/test/resources/RFC2616_Filters.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
-</Configure> \ No newline at end of file
+</Configure>
diff --git a/tests/test-integration/src/test/resources/RFC2616_Redirects.xml b/tests/test-integration/src/test/resources/RFC2616_Redirects.xml
index 1d35a53d33..a3cc7a3711 100644
--- a/tests/test-integration/src/test/resources/RFC2616_Redirects.xml
+++ b/tests/test-integration/src/test/resources/RFC2616_Redirects.xml
@@ -1,16 +1,16 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
- <!-- Configure Rewrite Handler -->
+ <!-- Configure Rewrite Handler -->
<!-- =========================================================== -->
<Get id="oldhandler" name="handler"/>
<Set name="handler">
<New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
-
- <Set name="handler"><Ref id="oldhandler"/></Set>
+
+ <Set name="handler"><Ref refid="oldhandler"/></Set>
<Set name="rewriteRequestURI">true</Set>
<Set name="rewritePathInfo">false</Set>
<Set name="originalPathAttribute">requestedPath</Set>
@@ -19,7 +19,7 @@
<Array type="org.eclipse.jetty.rewrite.handler.Rule">
<!-- add a response rule -->
- <!--
+ <!--
<Item>
<New id="response" class="org.eclipse.jetty.rewrite.handler.ResponsePatternRule">
<Set name="pattern">/rewrite/session/</Set>
@@ -30,7 +30,7 @@
-->
<!-- add a simple redirect -->
- <!--
+ <!--
<Item>
<New id="redirect" class="org.eclipse.jetty.rewrite.handler.RedirectPatternRule">
<Set name="pattern">/redirect/*</Set>
@@ -50,5 +50,5 @@
</Set>
</New>
</Set>
-
-</Configure> \ No newline at end of file
+
+</Configure>
diff --git a/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml b/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml
index 9ed47d422b..c87489fd75 100644
--- a/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml
+++ b/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/rfc2616-webapp</Set>
<Set name="war">
diff --git a/tests/test-webapps/test-jaas-webapp/src/main/config/webapps/test-jaas.xml b/tests/test-webapps/test-jaas-webapp/src/main/config/webapps/test-jaas.xml
index 8a94b92924..1720ba911b 100644
--- a/tests/test-webapps/test-jaas-webapp/src/main/config/webapps/test-jaas.xml
+++ b/tests/test-webapps/test-jaas-webapp/src/main/config/webapps/test-jaas.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Configure the test-jndi webapp -->
diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/tests/test-webapps/test-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index c469f74237..c8ce7b4d8b 100644
--- a/tests/test-webapps/test-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/tests/test-webapps/test-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Get class="org.eclipse.jetty.util.log.Log" name="rootLogger">
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml b/tests/test-webapps/test-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
index c181c35eac..4ed6fbc885 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
+++ b/tests/test-webapps/test-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- ==================================================================
Configure and deploy the test web application in $(jetty.home)/webapps/test
@@ -7,7 +7,7 @@ Configure and deploy the test web application in $(jetty.home)/webapps/test
Note. If this file did not exist or used a context path other that /test
then the default configuration of jetty.xml would discover the test
webapplication with a WebAppDeployer. By specifying a context in this
-directory, additional configuration may be specified and hot deployments
+directory, additional configuration may be specified and hot deployments
detected.
===================================================================== -->
@@ -40,7 +40,7 @@ detected.
</Set>
-->
- <!-- disable cookies
+ <!-- disable cookies
<Get name="sessionHandler">
<Get name="sessionManager">
<Set name="usingCookies" type="boolean">false</Set>
@@ -55,7 +55,7 @@ detected.
<Set name="config"><Property name="this.web-inf.url"/>realm.properties</Set>
<!-- To enable reload of realm when properties change, uncomment the following lines -->
<!-- changing refreshInterval (in seconds) as desired -->
- <!--
+ <!--
<Set name="refreshInterval">5</Set>
<Call name="start"></Call>
-->
@@ -63,7 +63,7 @@ detected.
</Set>
<Set name="checkWelcomeFiles">true</Set>
</Get>
-
+
<!-- Non standard error page mapping -->
<!--
<Get name="errorHandler">
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/etc/test-realm.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/etc/test-realm.xml
index 806f43e345..5459dd51c7 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/config/etc/test-realm.xml
+++ b/tests/test-webapps/test-jetty-webapp/src/main/config/etc/test-realm.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
<!-- Configure Authentication Login Service -->
@@ -17,8 +17,8 @@
</New>
</Arg>
</Call>
-
+
<Get class="org.eclipse.jetty.util.log.Log" name="rootLogger">
<Call name="warn"><Arg>test-realm is deployed. DO NOT USE IN PRODUCTION!</Arg></Call>
</Get>
-</Configure> \ No newline at end of file
+</Configure>
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/webapps/test.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/webapps/test.xml
index eaed185fe4..1bef8abc9d 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/config/webapps/test.xml
+++ b/tests/test-webapps/test-jetty-webapp/src/main/config/webapps/test.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- ==================================================================
Configure and deploy the test web application in $(jetty.home)/webapps/test
@@ -7,7 +7,7 @@ Configure and deploy the test web application in $(jetty.home)/webapps/test
Note. If this file did not exist or used a context path other that /test
then the default configuration of jetty.xml would discover the test
webapplication with a WebAppDeployer. By specifying a context in this
-directory, additional configuration may be specified and hot deployments
+directory, additional configuration may be specified and hot deployments
detected.
===================================================================== -->
@@ -41,7 +41,7 @@ detected.
<New class="org.eclipse.jetty.server.handler.ContextHandler$ApproveSameSuffixAliases"/>
</Arg>
</Call>
-
+
<!-- virtual hosts
<Set name="virtualHosts">
<Array type="String">
@@ -52,7 +52,7 @@ detected.
</Set>
-->
- <!-- disable cookies
+ <!-- disable cookies
<Get name="sessionHandler">
<Get name="sessionManager">
<Set name="usingCookies" type="boolean">false</Set>
@@ -67,7 +67,7 @@ detected.
<Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
<!-- To enable reload of realm when properties change, uncomment the following lines -->
<!-- changing refreshInterval (in seconds) as desired -->
- <!--
+ <!--
<Set name="refreshInterval">5</Set>
<Call name="start"></Call>
-->
@@ -80,7 +80,7 @@ detected.
</Set>
<Set name="checkWelcomeFiles">true</Set>
</Get>
-
+
<!-- Non standard error page mapping -->
<!--
<Get name="errorHandler">
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index ca48bb7ac9..c4a00e9fb5 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!--
This is the jetty specific web application configuration file. When starting
diff --git a/tests/test-webapps/test-jndi-webapp/src/main/templates/env-definitions.xml b/tests/test-webapps/test-jndi-webapp/src/main/templates/env-definitions.xml
index b1b8f0e322..e1e357ef6c 100644
--- a/tests/test-webapps/test-jndi-webapp/src/main/templates/env-definitions.xml
+++ b/tests/test-webapps/test-jndi-webapp/src/main/templates/env-definitions.xml
@@ -1,15 +1,15 @@
<!-- Define an env entry with Server scope for java:comp/env -->
- <New id="woggle" class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <New id="woggle" class="org.eclipse.jetty.plus.jndi.EnvEntry">
<Arg><Property name='server'/></Arg>
<Arg>woggle</Arg>
- <Arg type="java.lang.Integer">4000</Arg>
+ <Arg type="java.lang.Integer">4000</Arg>
<Arg type="boolean">false</Arg>
</New>
<!-- Define an env entry with webapp scope for java:comp/env -->
<New id="wiggle" class="org.eclipse.jetty.plus.jndi.EnvEntry">
- <Arg><Ref id='wac'/></Arg>
+ <Arg><Ref refid='wac'/></Arg>
<Arg>wiggle</Arg>
<Arg type="java.lang.Double">100</Arg>
<Arg type="boolean">true</Arg>
@@ -17,7 +17,7 @@
<!-- Mail Session setup -->
<New id="xxxmail" class="org.eclipse.jetty.plus.jndi.Resource">
- <Arg><Ref id='wac'/></Arg>
+ <Arg><Ref refid='wac'/></Arg>
<Arg>mail/Session</Arg>
<Arg>
<New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
@@ -37,7 +37,7 @@
<!-- A mock DataSource -->
<New id="mydatasource" class="org.eclipse.jetty.plus.jndi.Resource">
- <Arg><Ref id='wac'/></Arg>
+ <Arg><Ref refid='wac'/></Arg>
<Arg>jdbc/mydatasource</Arg>
<Arg>
<New class="com.acme.MockDataSource"/>
diff --git a/tests/test-webapps/test-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml b/tests/test-webapps/test-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml
index 7c7849cdec..0faae621b0 100644
--- a/tests/test-webapps/test-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml
+++ b/tests/test-webapps/test-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Configure the test-jndi webapp -->
diff --git a/tests/test-webapps/test-jndi-webapp/src/main/templates/plugin-context-header.xml b/tests/test-webapps/test-jndi-webapp/src/main/templates/plugin-context-header.xml
index 252251b16e..1fe76797c8 100644
--- a/tests/test-webapps/test-jndi-webapp/src/main/templates/plugin-context-header.xml
+++ b/tests/test-webapps/test-jndi-webapp/src/main/templates/plugin-context-header.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Configure the test-jndi webapp -->
@@ -12,7 +12,7 @@
</Arg>
</New>
-
+
<!-- only necessary for mvn jetty:run -->
diff --git a/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
index 8adbfae71c..b7fa49f07b 100644
--- a/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
<!-- Add an EnvEntry only valid for this webapp -->
<New id="gargle" class="org.eclipse.jetty.plus.jndi.EnvEntry">
- <Arg><Ref id='wac'/></Arg>
+ <Arg><Ref refid='wac'/></Arg>
<Arg>gargle</Arg>
<Arg type="java.lang.Double">100</Arg>
<Arg type="boolean">true</Arg>
@@ -13,7 +13,7 @@
<!-- Add an override for a global EnvEntry -->
<New id="wiggle" class="org.eclipse.jetty.plus.jndi.EnvEntry">
- <Arg><Ref id='wac'/></Arg>
+ <Arg><Ref refid='wac'/></Arg>
<Arg>wiggle</Arg>
<Arg type="java.lang.Double">55.0</Arg>
<Arg type="boolean">true</Arg>
@@ -21,7 +21,7 @@
<!-- Add a mapping from name in web.xml to the environment -->
<New id="map1" class="org.eclipse.jetty.plus.jndi.Link">
- <Arg><Ref id='wac'/></Arg>
+ <Arg><Ref refid='wac'/></Arg>
<Arg>jdbc/mydatasource1</Arg> <!-- name in web.xml -->
<Arg>jdbc/mydatasource</Arg> <!-- name in environment -->
</New>
diff --git a/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index f7207c25b0..f4d04d868c 100644
--- a/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Get class="org.eclipse.jetty.util.log.Log" name="rootLogger">
diff --git a/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index 25e2720f23..e43b1c0dc5 100644
--- a/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/proxy</Set>
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/env-definitions.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/env-definitions.xml
index b08559b9e7..fcedef4052 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/env-definitions.xml
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/env-definitions.xml
@@ -1,6 +1,6 @@
<New id="maxAmount" class="org.eclipse.jetty.plus.jndi.EnvEntry">
- <Arg><Ref id='wac'/></Arg>
+ <Arg><Ref refid='wac'/></Arg>
<Arg>maxAmount</Arg>
<Arg type="java.lang.Double">100</Arg>
<Arg type="boolean">true</Arg>
@@ -8,7 +8,7 @@
<New id="mydatasource" class="org.eclipse.jetty.plus.jndi.Resource">
- <Arg><Ref id='wac'/></Arg>
+ <Arg><Ref refid='wac'/></Arg>
<Arg>jdbc/mydatasource</Arg>
<Arg>
<New class="com.acme.MockDataSource">
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/plugin-context-header.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/plugin-context-header.xml
index a757cba4c1..88202d3421 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/plugin-context-header.xml
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/plugin-context-header.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml
index 01d28cd860..c15926b1a6 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
<!-- Add an override for a global EnvEntry -->
<New id="maxAmount" class="org.eclipse.jetty.plus.jndi.EnvEntry">
- <Arg><Ref id='wac'/></Arg>
+ <Arg><Ref refid='wac'/></Arg>
<Arg>maxAmount</Arg>
<Arg type="java.lang.Double">55.0</Arg>
<Arg type="boolean">true</Arg>
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index 1b2a0df056..8ce2f62a73 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Get class="org.eclipse.jetty.util.log.Log" name="rootLogger">
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/test/jetty-plugin-env.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/test/jetty-plugin-env.xml
index 8eacd85083..774184305d 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/test/jetty-plugin-env.xml
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/test/jetty-plugin-env.xml
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
<!-- Add an override for a global EnvEntry -->
<New id="maxAmount" class="org.eclipse.jetty.plus.jndi.EnvEntry">
- <Arg><Ref id='wac'/></Arg>
+ <Arg><Ref refid='wac'/></Arg>
<Arg>maxAmount</Arg>
<Arg type="java.lang.Double">55.0</Arg>
<Arg type="boolean">true</Arg>
@@ -31,7 +31,7 @@
<New id="mydatasource" class="org.eclipse.jetty.plus.jndi.Resource">
- <Arg><Ref id='wac'/></Arg>
+ <Arg><Ref refid='wac'/></Arg>
<Arg>jdbc/mydatasource</Arg>
<Arg>
<New class="com.acme.MockDataSource"/>

Back to the top