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

399721 - Change <Ref id= ...> to <Ref refid= ...>

This commit is contained in:
Simone Bordet 2013-02-01 13:03:11 +01:00
parent 626f10678c
commit 209d5bc12f
67 changed files with 194 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?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 This is the jetty specific web application configuration file. When starting

8
examples/embedded/src/main/resources/exampleserver.xml
View File

@ -1,13 +1,13 @@
<?xml version="1.0"?> <?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"> <Configure id="ExampleServer" class="org.eclipse.jetty.server.Server">
<Set name="connectors"> <Set name="connectors">
<Array type="org.eclipse.jetty.server.Connector"> <Array type="org.eclipse.jetty.server.Connector">
<Item> <Item>
<New class="org.eclipse.jetty.server.ServerConnector"> <New class="org.eclipse.jetty.server.ServerConnector">
<Arg><Ref id="ExampleServer"/></Arg> <Arg><Ref refid="ExampleServer"/></Arg>
<Set name="port">8080</Set> <Set name="port">8080</Set>
</New> </New>
</Item> </Item>
@ -27,7 +27,7 @@
<Set name="handlers"> <Set name="handlers">
<Array type="org.eclipse.jetty.server.Handler"> <Array type="org.eclipse.jetty.server.Handler">
<Item> <Item>
<Ref id="context" /> <Ref refid="context" />
</Item> </Item>
<Item> <Item>
<New class="org.eclipse.jetty.server.handler.DefaultHandler" /> <New class="org.eclipse.jetty.server.handler.DefaultHandler" />

10
examples/embedded/src/main/resources/fileserver.xml
View File

@ -1,17 +1,17 @@
<?xml version="1.0"?> <?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"> <Configure id="FileServer" class="org.eclipse.jetty.server.Server">
<Call name="addConnector"> <Call name="addConnector">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.ServerConnector"> <New class="org.eclipse.jetty.server.ServerConnector">
<Arg><Ref id="ExampleServer"/></Arg> <Arg><Ref refid="FileServer"/></Arg>
<Set name="port">8080</Set> <Set name="port">8080</Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>
<Set name="handler"> <Set name="handler">
<New class="org.eclipse.jetty.server.handler.HandlerList"> <New class="org.eclipse.jetty.server.handler.HandlerList">
<Set name="handlers"> <Set name="handlers">

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Create the deployment manager -->
@ -14,15 +14,15 @@
<Arg> <Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager"> <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts"> <Set name="contexts">
<Ref id="Contexts" /> <Ref refid="Contexts" />
</Set> </Set>
<Call name="setContextAttribute"> <Call name="setContextAttribute">
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg> <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
<Arg>.*/servlet-api-[^/]*\.jar$</Arg> <Arg>.*/servlet-api-[^/]*\.jar$</Arg>
</Call> </Call>
<!-- Add a customize step to the deployment lifecycle --> <!-- 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"> <Call name="insertLifeCycleNode">
<Arg>deployed</Arg> <Arg>deployed</Arg>
<Arg>starting</Arg> <Arg>starting</Arg>

6
jetty-deploy/src/test/resources/binding-test-contexts-1.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">
@ -29,10 +29,10 @@
<Arg> <Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager"> <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts"> <Set name="contexts">
<Ref id="Contexts" /> <Ref refid="Contexts" />
</Set> </Set>
<Ref id="DeploymentManager"> <Ref refid="DeploymentManager">
<Call name="addLifeCycleBinding"> <Call name="addLifeCycleBinding">
<Arg> <Arg>
<New class="org.eclipse.jetty.deploy.bindings.GlobalWebappConfigBinding"> <New class="org.eclipse.jetty.deploy.bindings.GlobalWebappConfigBinding">

4
jetty-deploy/src/test/resources/context-binding-test-1.xml
View File

@ -26,6 +26,6 @@
<Item>org.eclipse.jetty.servlet.DefaultServlet</Item> <Item>org.eclipse.jetty.servlet.DefaultServlet</Item>
</Array> </Array>
<Set name="serverClasses"><Ref id="serverClasses"/></Set> <Set name="serverClasses"><Ref refid="serverClasses"/></Set>
<Set name="systemClasses"><Ref id="systemClasses"/></Set--> <Set name="systemClasses"><Ref refid="systemClasses"/></Set-->
</Configure> </Configure>

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">
@ -7,7 +7,7 @@
<Arg> <Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager"> <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts"> <Set name="contexts">
<Ref id="Contexts" /> <Ref refid="Contexts" />
</Set> </Set>
<!-- Providers of Apps --> <!-- Providers of Apps -->
@ -17,7 +17,7 @@
<New class="org.eclipse.jetty.deploy.providers.WebAppProvider"> <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
<Set name="monitoredDirName"><SystemProperty name="jetty.home" />/webapps</Set> <Set name="monitoredDirName"><SystemProperty name="jetty.home" />/webapps</Set>
<Set name="scanInterval">1</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> </New>
</Item> </Item>
</Array> </Array>

8
jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
View File

@ -1,21 +1,21 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">
<Call name="addBean"> <Call name="addBean">
<Arg> <Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager"> <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts"> <Set name="contexts">
<Ref id="Contexts" /> <Ref refid="Contexts" />
</Set> </Set>
<!-- Providers of Apps --> <!-- Providers of Apps -->
<Set name="appProviders"> <Set name="appProviders">
<Array type="org.eclipse.jetty.deploy.AppProvider"> <Array type="org.eclipse.jetty.deploy.AppProvider">
<Item> <Item>
<New class="org.eclipse.jetty.deploy.providers.WebAppProvider"> <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
<Set name="monitoredDirName"><SystemProperty name="jetty.home" />/webapps</Set> <Set name="monitoredDirName"><SystemProperty name="jetty.home" />/webapps</Set>
<Set name="scanInterval">1</Set> <Set name="scanInterval">1</Set>
<Set name="configurationManager"> <Set name="configurationManager">
<New class="org.eclipse.jetty.deploy.PropertiesConfigurationManager"> <New class="org.eclipse.jetty.deploy.PropertiesConfigurationManager">
<Set name="file"> <Set name="file">

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

@ -28,7 +28,7 @@
<Call name="addConnector"> <Call name="addConnector">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.ServerConnector"> <New class="org.eclipse.jetty.server.ServerConnector">
<Arg><Ref id="Server" /></Arg> <Arg><Ref refid="Server" /></Arg>
<Set name="host"></Set> <Set name="host"></Set>
<Set name="port">0</Set> <Set name="port">0</Set>
<Set name="idleTimeout">300000</Set> <Set name="idleTimeout">300000</Set>
@ -95,7 +95,7 @@
<!-- contexts configuration (see $(jetty.home)/contexts/test.xml --> <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
<!-- for an example). --> <!-- for an example). -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Ref id="RequestLog"> <Ref refid="RequestLog">
<Set name="requestLog"> <Set name="requestLog">
<New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog"> <New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
<Set name="filename"><SystemProperty name="jetty.home" default="."/>/logs/yyyy_mm_dd.request.log</Set> <Set name="filename"><SystemProperty name="jetty.home" default="."/>/logs/yyyy_mm_dd.request.log</Set>

2
jetty-deploy/src/test/resources/webapps/foo.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?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"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/foo</Set> <Set name="contextPath">/foo</Set>
<Set name="war"> <Set name="war">

2
jetty-distribution/src/main/resources/webapps/example-moved.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?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 --> <!-- Simple handler to redirect from old path to new -->
<Configure class="org.eclipse.jetty.server.handler.MovedContextHandler"> <Configure class="org.eclipse.jetty.server.handler.MovedContextHandler">

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

@ -1,9 +1,9 @@
<?xml version="1.0"?> <?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"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- ======================================================== --> <!-- ======================================================== -->
<!-- java.security.auth.login.config System property --> <!-- java.security.auth.login.config System property -->
<!-- This is usually a runtime parameter to the jvm, but --> <!-- This is usually a runtime parameter to the jvm, but -->

18
jetty-jmx/src/main/config/etc/jetty-jmx.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">
@ -7,13 +7,13 @@
<!-- Set the java.rmi.server.hostname property in case you've --> <!-- Set the java.rmi.server.hostname property in case you've -->
<!-- got a misconfigured /etc/hosts entry or the like. --> <!-- got a misconfigured /etc/hosts entry or the like. -->
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- <!--
<Call class="java.lang.System" name="setProperty"> <Call class="java.lang.System" name="setProperty">
<Arg>java.rmi.server.hostname</Arg> <Arg>java.rmi.server.hostname</Arg>
<Arg>127.0.0.1</Arg> <Arg>127.0.0.1</Arg>
</Call> </Call>
--> -->
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Get the platform mbean server --> <!-- Get the platform mbean server -->
<!-- =========================================================== --> <!-- =========================================================== -->
@ -27,7 +27,7 @@
<Arg> <Arg>
<New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer"> <New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer">
<Arg> <Arg>
<Ref id="MBeanServer" /> <Ref refid="MBeanServer" />
</Arg> </Arg>
</New> </New>
</Arg> </Arg>
@ -39,12 +39,12 @@
<New class="org.eclipse.jetty.util.log.Log" /> <New class="org.eclipse.jetty.util.log.Log" />
</Arg> </Arg>
</Call> </Call>
<!-- In order to connect to the JMX server remotely from a different <!-- In order to connect to the JMX server remotely from a different
process, possibly running on a different host, Jetty JMX module process, possibly running on a different host, Jetty JMX module
can create a remote JMX connector. It requires RMI registry to can create a remote JMX connector. It requires RMI registry to
be started prior to creating the connector server because the 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 <!-- Optionally start the RMI registry. Normally RMI registry runs on
@ -59,15 +59,15 @@
</Call> </Call>
</Call> </Call>
--> -->
<!-- Optionally add a remote JMX connector. The parameters of the constructor <!-- Optionally add a remote JMX connector. The parameters of the constructor
below specify the JMX service URL, and the object name string for the 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 specify the protocol that clients will use to connect to the remote JMX
connector (RMI), the hostname of the server (local hostname), port number connector (RMI), the hostname of the server (local hostname), port number
(automatically assigned), and the URL path. Note that URL path contains (automatically assigned), and the URL path. Note that URL path contains
the RMI registry hostname and port number, that may need to be modified 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"> <New id="ConnectorServer" class="org.eclipse.jetty.jmx.ConnectorServer">

4
jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-deployer.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">
@ -10,7 +10,7 @@
<Arg> <Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager"> <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts"> <Set name="contexts">
<Ref id="Contexts" /> <Ref refid="Contexts" />
</Set> </Set>
<Call name="setContextAttribute"> <Call name="setContextAttribute">
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg> <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>

4
jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-nested.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Configure the Jetty Server Nested inside another -->
@ -23,7 +23,7 @@
<Call name="addLifeCycleListener"> <Call name="addLifeCycleListener">
<Arg> <Arg>
<New class="org.eclipse.jetty.osgi.nested.NestedConnectorListener" id="NestedConnectorListener"> <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> </New>
</Arg> </Arg>
</Call> </Call>

4
jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-selector.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">
@ -11,7 +11,7 @@
<Call name="addConnector"> <Call name="addConnector">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.ServerConnector"> <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="host"><Property name="jetty.host" /></Set>
<Set name="port"><Property name="jetty.port" default="8080"/></Set> <Set name="port"><Property name="jetty.port" default="8080"/></Set>
<Set name="idleTimeout">300000</Set> <Set name="idleTimeout">300000</Set>

2
jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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">
<!-- =============================================================== --> <!-- =============================================================== -->

6
jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml
View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?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. Copyright (c) 2009-2011 Intalio, Inc.
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0 are made available under the terms of the Eclipse Public License v1.0
and Apache License v2.0 which accompanies this distribution. 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 http://www.eclipse.org/legal/epl-v10.html
The Apache License v2.0 is available at The Apache License v2.0 is available at
http://www.opensource.org/licenses/apache2.0.php 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: Contributors:
Hugues Malphettes - initial API and implementation Hugues Malphettes - initial API and implementation
--> -->

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">
@ -10,7 +10,7 @@
<Arg> <Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager"> <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts"> <Set name="contexts">
<Ref id="Contexts" /> <Ref refid="Contexts" />
</Set> </Set>
<Call name="setContextAttribute"> <Call name="setContextAttribute">
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg> <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">
@ -11,7 +11,7 @@
<Call name="addConnector"> <Call name="addConnector">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.ServerConnector"> <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="host"><Property name="jetty.host" /></Set>
<Set name="port"><Property name="jetty.port" default="8080"/></Set> <Set name="port"><Property name="jetty.port" default="8080"/></Set>
<Set name="idleTimeout">300000</Set> <Set name="idleTimeout">300000</Set>

14
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml
View File

@ -38,7 +38,7 @@
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Add HTTP Customizer for Secure request --> <!-- Add HTTP Customizer for Secure request -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Ref id="httpConfig"> <Ref refid="httpConfig">
<Call name="addCustomizer"> <Call name="addCustomizer">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.SecureRequestCustomizer"/> <New class="org.eclipse.jetty.server.SecureRequestCustomizer"/>
@ -89,7 +89,7 @@
<Arg> <Arg>
<New class="org.eclipse.jetty.server.ServerConnector"> <New class="org.eclipse.jetty.server.ServerConnector">
<Arg name="server"> <Arg name="server">
<Ref id="Server"/> <Ref refid="Server"/>
</Arg> </Arg>
<Arg name="factories"> <Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory"> <Array type="org.eclipse.jetty.server.ConnectionFactory">
@ -97,7 +97,7 @@
<New class="org.eclipse.jetty.server.SslConnectionFactory"> <New class="org.eclipse.jetty.server.SslConnectionFactory">
<Arg name="next">npn</Arg> <Arg name="next">npn</Arg>
<Arg name="sslContextFactory"> <Arg name="sslContextFactory">
<Ref id="sslContextFactory"/> <Ref refid="sslContextFactory"/>
</Arg> </Arg>
</New> </New>
</Item> </Item>
@ -119,9 +119,9 @@
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory"> <New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">3</Arg> <Arg name="version" type="int">3</Arg>
<Arg name="config"> <Arg name="config">
<Ref id="httpConfig"/> <Ref refid="httpConfig"/>
</Arg> </Arg>
<!-- <Arg name="pushStrategy"><Ref id="pushStrategy"/></Arg> --> <!-- <Arg name="pushStrategy"><Ref refid="pushStrategy"/></Arg> -->
</New> </New>
</Item> </Item>
@ -129,7 +129,7 @@
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory"> <New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">2</Arg> <Arg name="version" type="int">2</Arg>
<Arg name="config"> <Arg name="config">
<Ref id="httpConfig"/> <Ref refid="httpConfig"/>
</Arg> </Arg>
</New> </New>
</Item> </Item>
@ -137,7 +137,7 @@
<Item> <Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory"> <New class="org.eclipse.jetty.server.HttpConnectionFactory">
<Arg name="config"> <Arg name="config">
<Ref id="httpConfig"/> <Ref refid="httpConfig"/>
</Arg> </Arg>
</New> </New>
</Item> </Item>

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Configure Authentication Login Service --> <!-- Configure Authentication Login Service -->
@ -17,4 +17,4 @@
</New> </New>
</Arg> </Arg>
</Call> </Call>
</Configure> </Configure>

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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">
<!-- =============================================================== --> <!-- =============================================================== -->

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

@ -25,7 +25,7 @@
<!-- login.conf file, and the realm Name must be the same as in --> <!-- login.conf file, and the realm Name must be the same as in -->
<!-- the web.xml file. --> <!-- the web.xml file. -->
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- <!--
<Call name="addBean"> <Call name="addBean">
<Arg> <Arg>
<New class="org.eclipse.jetty.plus.jaas.JAASLoginService"> <New class="org.eclipse.jetty.plus.jaas.JAASLoginService">
@ -63,7 +63,7 @@
<!-- deploy webapps from a directory called webapps-plus. Note --> <!-- deploy webapps from a directory called webapps-plus. Note -->
<!-- that you will need to create this directory first! --> <!-- that you will need to create this directory first! -->
<!-- <!--
<Ref id="DeploymentManager"> <Ref refid="DeploymentManager">
<Call name="addAppProvider"> <Call name="addAppProvider">
<Arg> <Arg>
<New class="org.eclipse.jetty.deploy.providers.WebAppProvider"> <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">

10
jetty-proxy/src/main/config/etc/jetty-proxy.xml
View File

@ -17,7 +17,7 @@
<Call name="addConnector"> <Call name="addConnector">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.ServerConnector"> <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="host"><Property name="jetty.host" /></Set>
<Set name="port"><Property name="jetty.port" default="8888"/></Set> <Set name="port"><Property name="jetty.port" default="8888"/></Set>
<Set name="idleTimeout">300000</Set> <Set name="idleTimeout">300000</Set>
@ -32,10 +32,10 @@
<Call id="proxyHolder" name="addServletWithMapping"> <Call id="proxyHolder" name="addServletWithMapping">
<Arg>org.eclipse.jetty.proxy.ProxyServlet</Arg> <Arg>org.eclipse.jetty.proxy.ProxyServlet</Arg>
<Arg>/</Arg> <Arg>/</Arg>
<Call name="setInitParameter"> <Call name="setInitParameter">
<Arg>maxThreads</Arg> <Arg>maxThreads</Arg>
<Arg>128</Arg> <Arg>128</Arg>
</Call> </Call>
</Call> </Call>
</New> </New>
</Set> </Set>

12
jetty-rewrite/src/main/config/etc/jetty-rewrite.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Mixin the RewriteHandler -->
@ -9,13 +9,13 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- configure rewrite handler --> <!-- configure rewrite handler -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Get id="oldhandler" name="handler"/> <Get id="oldhandler" name="handler"/>
<Set name="handler"> <Set name="handler">
<New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler"> <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="rewriteRequestURI">true</Set>
<Set name="rewritePathInfo">false</Set> <Set name="rewritePathInfo">false</Set>
<Set name="originalPathAttribute">requestedPath</Set> <Set name="originalPathAttribute">requestedPath</Set>
@ -68,7 +68,7 @@
</New> </New>
</Arg> </Arg>
</Call> </Call>
<!-- reverse the order of the path sections --> <!-- reverse the order of the path sections -->
<Call name="addRule"> <Call name="addRule">
<Arg> <Arg>
@ -89,7 +89,7 @@
</New> </New>
</Arg> </Arg>
</Call> </Call>
<!-- actual redirect, instead of internal rewrite --> <!-- actual redirect, instead of internal rewrite -->
<Call name="addRule"> <Call name="addRule">
<Arg> <Arg>
@ -113,5 +113,5 @@
</New> </New>
</Set> </Set>
</Configure> </Configure>

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Configure the Jetty Server -->
@ -197,7 +197,7 @@
<Call name="addBean"> <Call name="addBean">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.deployer.ContextDeployer"> <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="configurationDir"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
<Set name="scanInterval">1</Set> <Set name="scanInterval">1</Set>
</New> </New>
@ -220,7 +220,7 @@
<Call name="addBean"> <Call name="addBean">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.deployer.WebAppDeployer"> <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="webAppDir"><SystemProperty name="jetty.home" default="."/>/webapps</Set>
<Set name="parentLoaderPriority">false</Set> <Set name="parentLoaderPriority">false</Set>
<Set name="extract">true</Set> <Set name="extract">true</Set>
@ -256,7 +256,7 @@
<!-- contexts configuration (see $(jetty.home)/contexts/test.xml --> <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
<!-- for an example). --> <!-- for an example). -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Ref id="RequestLog"> <Ref refid="RequestLog">
<Set name="requestLog"> <Set name="requestLog">
<New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog"> <New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
<Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Set> <Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Set>

2
jetty-rhttp/jetty-rhttp-connector/src/main/config/etc/jetty-rhttp.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Configure the Jetty Reverse HTTP Connector -->

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Mixin the DebugHandler -->
@ -10,7 +10,7 @@
<Get id="oldhandler" name="handler"/> <Get id="oldhandler" name="handler"/>
<Set name="handler"> <Set name="handler">
<New id="DebugHandler" class="org.eclipse.jetty.server.handler.DebugHandler"> <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"> <Set name="outputStream">
<New class="org.eclipse.jetty.util.RolloverFileOutputStream"> <New class="org.eclipse.jetty.util.RolloverFileOutputStream">
<Arg type="String"><Property name="jetty.logs" default="./logs"/>/yyyy_mm_dd.debug.log</Arg> <Arg type="String"><Property name="jetty.logs" default="./logs"/>/yyyy_mm_dd.debug.log</Arg>

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

@ -21,12 +21,12 @@
<Call name="addConnector"> <Call name="addConnector">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.ServerConnector"> <New class="org.eclipse.jetty.server.ServerConnector">
<Arg name="server"><Ref id="Server" /></Arg> <Arg name="server"><Ref refid="Server" /></Arg>
<Arg name="factories"> <Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory"> <Array type="org.eclipse.jetty.server.ConnectionFactory">
<Item> <Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory"> <New class="org.eclipse.jetty.server.HttpConnectionFactory">
<Arg name="config"><Ref id="httpConfig" /></Arg> <Arg name="config"><Ref refid="httpConfig" /></Arg>
</New> </New>
</Item> </Item>
</Array> </Array>

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

@ -25,7 +25,7 @@
<Set name="TrustStorePath"><Property name="jetty.home" default="." />/etc/keystore</Set> <Set name="TrustStorePath"><Property name="jetty.home" default="." />/etc/keystore</Set>
<Set name="TrustStorePassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set> <Set name="TrustStorePassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
</New> </New>
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Create a TLS specific HttpConfiguration based on the --> <!-- Create a TLS specific HttpConfiguration based on the -->
<!-- common HttpConfiguration defined in jetty.xml --> <!-- common HttpConfiguration defined in jetty.xml -->
@ -33,7 +33,7 @@
<!-- session information --> <!-- session information -->
<!-- =========================================================== --> <!-- =========================================================== -->
<New id="tlsHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration"> <New id="tlsHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
<Arg><Ref id="httpConfig"/></Arg> <Arg><Ref refid="httpConfig"/></Arg>
<Call name="addCustomizer"> <Call name="addCustomizer">
<Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg> <Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg>
</Call> </Call>
@ -54,18 +54,18 @@
<Call id="sslConnector" name="addConnector"> <Call id="sslConnector" name="addConnector">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.ServerConnector"> <New class="org.eclipse.jetty.server.ServerConnector">
<Arg name="server"><Ref id="Server" /></Arg> <Arg name="server"><Ref refid="Server" /></Arg>
<Arg name="factories"> <Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory"> <Array type="org.eclipse.jetty.server.ConnectionFactory">
<Item> <Item>
<New class="org.eclipse.jetty.server.SslConnectionFactory"> <New class="org.eclipse.jetty.server.SslConnectionFactory">
<Arg name="next">http/1.1</Arg> <Arg name="next">http/1.1</Arg>
<Arg name="sslContextFactory"><Ref id="sslContextFactory"/></Arg> <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg>
</New> </New>
</Item> </Item>
<Item> <Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory"> <New class="org.eclipse.jetty.server.HttpConnectionFactory">
<Arg name="config"><Ref id="tlsHttpConfig"/></Arg> <Arg name="config"><Ref refid="tlsHttpConfig"/></Arg>
</New> </New>
</Item> </Item>
</Array> </Array>

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Mixin the Statistics Handler -->
@ -12,7 +12,7 @@
<Set name="handler"> <Set name="handler">
<New id="IPAccessHandler" class="org.eclipse.jetty.server.handler.IPAccessHandler"> <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"> <Set name="white">
<Array type="String"> <Array type="String">
<Item>127.0.0.1</Item> <Item>127.0.0.1</Item>
@ -27,5 +27,5 @@
</Set> </Set>
</New> </New>
</Set> </Set>
</Configure> </Configure>

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Configure the Jetty Request Log -->
@ -9,7 +9,7 @@
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Configure Request Log --> <!-- Configure Request Log -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Ref id="Handlers"> <Ref refid="Handlers">
<Call name="addHandler"> <Call name="addHandler">
<Arg> <Arg>
<New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler"> <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler">

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Mixin the Statistics Handler -->
@ -9,7 +9,7 @@
<Get id="oldhandler" name="handler" /> <Get id="oldhandler" name="handler" />
<Set name="handler"> <Set name="handler">
<New id="StatsHandler" class="org.eclipse.jetty.server.handler.StatisticsHandler"> <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> </New>
</Set> </Set>
</Configure> </Configure>

2
jetty-server/src/main/config/etc/jetty-xinetd.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Configuration for starting up Jetty using inetd/xinetd -->

16
jetty-spdy/spdy-example-webapp/src/main/config/example-jetty-spdy-proxy.xml
View File

@ -47,7 +47,7 @@
<Arg> <Arg>
<New class="org.eclipse.jetty.server.ServerConnector"> <New class="org.eclipse.jetty.server.ServerConnector">
<Arg name="server"> <Arg name="server">
<Ref id="Server"/> <Ref refid="Server"/>
</Arg> </Arg>
<Arg name="factories"> <Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory"> <Array type="org.eclipse.jetty.server.ConnectionFactory">
@ -56,7 +56,7 @@
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory"> <New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">3</Arg> <Arg name="version" type="int">3</Arg>
<Arg name="config"> <Arg name="config">
<Ref id="tlsHttpConfig"/> <Ref refid="tlsHttpConfig"/>
</Arg> </Arg>
</New> </New>
</Item> </Item>
@ -88,7 +88,7 @@
<Call name="putProxyEngine"> <Call name="putProxyEngine">
<Arg>spdy/3</Arg> <Arg>spdy/3</Arg>
<Arg> <Arg>
<Ref id="spdyProxyEngine"/> <Ref refid="spdyProxyEngine"/>
</Arg> </Arg>
</Call> </Call>
<Set name="proxyServerInfos"> <Set name="proxyServerInfos">
@ -118,10 +118,10 @@
<Arg> <Arg>
<New class="org.eclipse.jetty.spdy.server.proxy.HTTPSPDYProxyServerConnector"> <New class="org.eclipse.jetty.spdy.server.proxy.HTTPSPDYProxyServerConnector">
<Arg> <Arg>
<Ref id="Server"/> <Ref refid="Server"/>
</Arg> </Arg>
<Arg> <Arg>
<Ref id="proxyEngineSelector"/> <Ref refid="proxyEngineSelector"/>
</Arg> </Arg>
<Set name="Port">8080</Set> <Set name="Port">8080</Set>
</New> </New>
@ -131,13 +131,13 @@
<Arg> <Arg>
<New class="org.eclipse.jetty.spdy.server.proxy.HTTPSPDYProxyServerConnector"> <New class="org.eclipse.jetty.spdy.server.proxy.HTTPSPDYProxyServerConnector">
<Arg> <Arg>
<Ref id="Server"/> <Ref refid="Server"/>
</Arg> </Arg>
<Arg> <Arg>
<Ref id="sslContextFactory"/> <Ref refid="sslContextFactory"/>
</Arg> </Arg>
<Arg> <Arg>
<Ref id="proxyEngineSelector"/> <Ref refid="proxyEngineSelector"/>
</Arg> </Arg>
<Set name="Port">8443</Set> <Set name="Port">8443</Set>
</New> </New>

12
jetty-spdy/spdy-example-webapp/src/main/config/example-jetty-spdy.xml
View File

@ -68,7 +68,7 @@
<Call id="sslConnector" name="addConnector"> <Call id="sslConnector" name="addConnector">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.ServerConnector"> <New class="org.eclipse.jetty.server.ServerConnector">
<Arg name="server"><Ref id="Server"/></Arg> <Arg name="server"><Ref refid="Server"/></Arg>
<Arg name="factories"> <Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory"> <Array type="org.eclipse.jetty.server.ConnectionFactory">
@ -77,7 +77,7 @@
<New class="org.eclipse.jetty.server.SslConnectionFactory"> <New class="org.eclipse.jetty.server.SslConnectionFactory">
<Arg name="next">npn</Arg> <Arg name="next">npn</Arg>
<Arg name="sslContextFactory"> <Arg name="sslContextFactory">
<Ref id="sslContextFactory"/> <Ref refid="sslContextFactory"/>
</Arg> </Arg>
</New> </New>
</Item> </Item>
@ -101,10 +101,10 @@
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory"> <New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">3</Arg> <Arg name="version" type="int">3</Arg>
<Arg name="config"> <Arg name="config">
<Ref id="tlsHttpConfig"/> <Ref refid="tlsHttpConfig"/>
</Arg> </Arg>
<Arg name="pushStrategy"> <Arg name="pushStrategy">
<Ref id="pushStrategy"/> <Ref refid="pushStrategy"/>
</Arg> </Arg>
</New> </New>
</Item> </Item>
@ -114,7 +114,7 @@
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory"> <New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">2</Arg> <Arg name="version" type="int">2</Arg>
<Arg name="config"> <Arg name="config">
<Ref id="tlsHttpConfig"/> <Ref refid="tlsHttpConfig"/>
</Arg> </Arg>
</New> </New>
</Item> </Item>
@ -123,7 +123,7 @@
<Item> <Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory"> <New class="org.eclipse.jetty.server.HttpConnectionFactory">
<Arg name="config"> <Arg name="config">
<Ref id="tlsHttpConfig"/> <Ref refid="tlsHttpConfig"/>
</Arg> </Arg>
</New> </New>
</Item> </Item>

18
jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy-proxy.xml
View File

@ -39,7 +39,7 @@
<!-- session information --> <!-- session information -->
<!-- =========================================================== --> <!-- =========================================================== -->
<New id="tlsHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration"> <New id="tlsHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
<Arg><Ref id="httpConfig"/></Arg> <Arg><Ref refid="httpConfig"/></Arg>
<Call name="addCustomizer"> <Call name="addCustomizer">
<Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg> <Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg>
</Call> </Call>
@ -53,7 +53,7 @@
<Arg> <Arg>
<New class="org.eclipse.jetty.server.ServerConnector"> <New class="org.eclipse.jetty.server.ServerConnector">
<Arg name="server"> <Arg name="server">
<Ref id="Server"/> <Ref refid="Server"/>
</Arg> </Arg>
<Arg name="factories"> <Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory"> <Array type="org.eclipse.jetty.server.ConnectionFactory">
@ -62,7 +62,7 @@
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory"> <New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">3</Arg> <Arg name="version" type="int">3</Arg>
<Arg name="config"> <Arg name="config">
<Ref id="tlsHttpConfig"/> <Ref refid="tlsHttpConfig"/>
</Arg> </Arg>
</New> </New>
</Item> </Item>
@ -98,7 +98,7 @@
<Call name="putProxyEngine"> <Call name="putProxyEngine">
<Arg>spdy/3</Arg> <Arg>spdy/3</Arg>
<Arg> <Arg>
<Ref id="spdyProxyEngine"/> <Ref refid="spdyProxyEngine"/>
</Arg> </Arg>
</Call> </Call>
<Set name="proxyServerInfos"> <Set name="proxyServerInfos">
@ -129,10 +129,10 @@
<Arg> <Arg>
<New class="org.eclipse.jetty.spdy.server.proxy.HTTPSPDYProxyServerConnector"> <New class="org.eclipse.jetty.spdy.server.proxy.HTTPSPDYProxyServerConnector">
<Arg> <Arg>
<Ref id="Server"/> <Ref refid="Server"/>
</Arg> </Arg>
<Arg> <Arg>
<Ref id="proxyEngineSelector"/> <Ref refid="proxyEngineSelector"/>
</Arg> </Arg>
<Set name="Port">8080</Set> <Set name="Port">8080</Set>
</New> </New>
@ -142,13 +142,13 @@
<Arg> <Arg>
<New class="org.eclipse.jetty.spdy.server.proxy.HTTPSPDYProxyServerConnector"> <New class="org.eclipse.jetty.spdy.server.proxy.HTTPSPDYProxyServerConnector">
<Arg> <Arg>
<Ref id="Server"/> <Ref refid="Server"/>
</Arg> </Arg>
<Arg> <Arg>
<Ref id="sslContextFactory"/> <Ref refid="sslContextFactory"/>
</Arg> </Arg>
<Arg> <Arg>
<Ref id="proxyEngineSelector"/> <Ref refid="proxyEngineSelector"/>
</Arg> </Arg>
<Set name="Port">8443</Set> <Set name="Port">8443</Set>
</New> </New>

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

@ -39,7 +39,7 @@
<!-- session information --> <!-- session information -->
<!-- =========================================================== --> <!-- =========================================================== -->
<New id="tlsHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration"> <New id="tlsHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
<Arg><Ref id="httpConfig"/></Arg> <Arg><Ref refid="httpConfig"/></Arg>
<Call name="addCustomizer"> <Call name="addCustomizer">
<Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg> <Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg>
</Call> </Call>
@ -105,7 +105,7 @@
<Call id="sslConnector" name="addConnector"> <Call id="sslConnector" name="addConnector">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.ServerConnector"> <New class="org.eclipse.jetty.server.ServerConnector">
<Arg name="server"><Ref id="Server" /></Arg> <Arg name="server"><Ref refid="Server" /></Arg>
<Arg name="factories"> <Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory"> <Array type="org.eclipse.jetty.server.ConnectionFactory">
@ -113,7 +113,7 @@
<Item> <Item>
<New class="org.eclipse.jetty.server.SslConnectionFactory"> <New class="org.eclipse.jetty.server.SslConnectionFactory">
<Arg name="next">npn</Arg> <Arg name="next">npn</Arg>
<Arg name="sslContextFactory"><Ref id="sslContextFactory" /></Arg> <Arg name="sslContextFactory"><Ref refid="sslContextFactory" /></Arg>
</New> </New>
</Item> </Item>
@ -133,8 +133,8 @@
<Item> <Item>
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory"> <New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">3</Arg> <Arg name="version" type="int">3</Arg>
<Arg name="config"><Ref id="tlsHttpConfig" /></Arg> <Arg name="config"><Ref refid="tlsHttpConfig" /></Arg>
<Arg name="pushStrategy"><Ref id="pushStrategy"/></Arg> <Arg name="pushStrategy"><Ref refid="pushStrategy"/></Arg>
</New> </New>
</Item> </Item>
@ -142,14 +142,14 @@
<Item> <Item>
<New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory"> <New class="org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory">
<Arg name="version" type="int">2</Arg> <Arg name="version" type="int">2</Arg>
<Arg name="config"><Ref id="tlsHttpConfig" /></Arg> <Arg name="config"><Ref refid="tlsHttpConfig" /></Arg>
</New> </New>
</Item> </Item>
<!-- HTTP Connection factory --> <!-- HTTP Connection factory -->
<Item> <Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory"> <New class="org.eclipse.jetty.server.HttpConnectionFactory">
<Arg name="config"><Ref id="tlsHttpConfig" /></Arg> <Arg name="config"><Ref refid="tlsHttpConfig" /></Arg>
</New> </New>
</Item> </Item>
</Array> </Array>

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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> </New>
<Get class="org.eclipse.jetty.util.log.Log" name="rootLogger"> <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> </Get>
<Call class="java.lang.System" name="setErr"><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 id="ServerLog"/></Arg></Call> <Call class="java.lang.System" name="setOut"><Arg><Ref refid="ServerLog"/></Arg></Call>
</Configure> </Configure>

2
tests/test-integration/src/test/resources/BIOHttp.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">

2
tests/test-integration/src/test/resources/BIOHttps.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Configure the Jetty Server -->

2
tests/test-integration/src/test/resources/NIOHttp.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">

2
tests/test-integration/src/test/resources/NIOHttps.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Configure the Jetty Server -->
@ -91,7 +91,7 @@
<Call name="addBean"> <Call name="addBean">
<Arg> <Arg>
<New class="org.eclipse.jetty.deploy.ContextDeployer"> <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="configurationDir"><Property name="test.resourcesdir" default="src/test/resources"/>/webapp-contexts/RFC2616</Set>
<Set name="scanInterval">0</Set> <Set name="scanInterval">0</Set>
<Set name="configurationManager"> <Set name="configurationManager">
@ -120,7 +120,7 @@
<Call name="addBean"> <Call name="addBean">
<Arg> <Arg>
<New class="org.eclipse.jetty.deploy.WebAppDeployer"> <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="webAppDir"><Property name="test.targetdir" default="target"/>/webapps</Set>
<Set name="parentLoaderPriority">false</Set> <Set name="parentLoaderPriority">false</Set>
<Set name="extract">true</Set> <Set name="extract">true</Set>

4
tests/test-integration/src/test/resources/RFC2616_Filters.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">
</Configure> </Configure>

16
tests/test-integration/src/test/resources/RFC2616_Redirects.xml
View File

@ -1,16 +1,16 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Configure Rewrite Handler --> <!-- Configure Rewrite Handler -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Get id="oldhandler" name="handler"/> <Get id="oldhandler" name="handler"/>
<Set name="handler"> <Set name="handler">
<New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler"> <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="rewriteRequestURI">true</Set>
<Set name="rewritePathInfo">false</Set> <Set name="rewritePathInfo">false</Set>
<Set name="originalPathAttribute">requestedPath</Set> <Set name="originalPathAttribute">requestedPath</Set>
@ -19,7 +19,7 @@
<Array type="org.eclipse.jetty.rewrite.handler.Rule"> <Array type="org.eclipse.jetty.rewrite.handler.Rule">
<!-- add a response rule --> <!-- add a response rule -->
<!-- <!--
<Item> <Item>
<New id="response" class="org.eclipse.jetty.rewrite.handler.ResponsePatternRule"> <New id="response" class="org.eclipse.jetty.rewrite.handler.ResponsePatternRule">
<Set name="pattern">/rewrite/session/</Set> <Set name="pattern">/rewrite/session/</Set>
@ -30,7 +30,7 @@
--> -->
<!-- add a simple redirect --> <!-- add a simple redirect -->
<!-- <!--
<Item> <Item>
<New id="redirect" class="org.eclipse.jetty.rewrite.handler.RedirectPatternRule"> <New id="redirect" class="org.eclipse.jetty.rewrite.handler.RedirectPatternRule">
<Set name="pattern">/redirect/*</Set> <Set name="pattern">/redirect/*</Set>
@ -50,5 +50,5 @@
</Set> </Set>
</New> </New>
</Set> </Set>
</Configure> </Configure>

2
tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?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"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/rfc2616-webapp</Set> <Set name="contextPath">/rfc2616-webapp</Set>
<Set name="war"> <Set name="war">

2
tests/test-webapps/test-jaas-webapp/src/main/config/webapps/test-jaas.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Configure the test-jndi webapp -->

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?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"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Get class="org.eclipse.jetty.util.log.Log" name="rootLogger"> <Get class="org.eclipse.jetty.util.log.Log" name="rootLogger">

10
tests/test-webapps/test-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?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 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 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 then the default configuration of jetty.xml would discover the test
webapplication with a WebAppDeployer. By specifying a context in this 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. detected.
===================================================================== --> ===================================================================== -->
@ -40,7 +40,7 @@ detected.
</Set> </Set>
--> -->
<!-- disable cookies <!-- disable cookies
<Get name="sessionHandler"> <Get name="sessionHandler">
<Get name="sessionManager"> <Get name="sessionManager">
<Set name="usingCookies" type="boolean">false</Set> <Set name="usingCookies" type="boolean">false</Set>
@ -55,7 +55,7 @@ detected.
<Set name="config"><Property name="this.web-inf.url"/>realm.properties</Set> <Set name="config"><Property name="this.web-inf.url"/>realm.properties</Set>
<!-- To enable reload of realm when properties change, uncomment the following lines --> <!-- To enable reload of realm when properties change, uncomment the following lines -->
<!-- changing refreshInterval (in seconds) as desired --> <!-- changing refreshInterval (in seconds) as desired -->
<!-- <!--
<Set name="refreshInterval">5</Set> <Set name="refreshInterval">5</Set>
<Call name="start"></Call> <Call name="start"></Call>
--> -->
@ -63,7 +63,7 @@ detected.
</Set> </Set>
<Set name="checkWelcomeFiles">true</Set> <Set name="checkWelcomeFiles">true</Set>
</Get> </Get>
<!-- Non standard error page mapping --> <!-- Non standard error page mapping -->
<!-- <!--
<Get name="errorHandler"> <Get name="errorHandler">

6
tests/test-webapps/test-jetty-webapp/src/main/config/etc/test-realm.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Configure Authentication Login Service --> <!-- Configure Authentication Login Service -->
@ -17,8 +17,8 @@
</New> </New>
</Arg> </Arg>
</Call> </Call>
<Get class="org.eclipse.jetty.util.log.Log" name="rootLogger"> <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> <Call name="warn"><Arg>test-realm is deployed. DO NOT USE IN PRODUCTION!</Arg></Call>
</Get> </Get>
</Configure> </Configure>

12
tests/test-webapps/test-jetty-webapp/src/main/config/webapps/test.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?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 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 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 then the default configuration of jetty.xml would discover the test
webapplication with a WebAppDeployer. By specifying a context in this 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. detected.
===================================================================== --> ===================================================================== -->
@ -41,7 +41,7 @@ detected.
<New class="org.eclipse.jetty.server.handler.ContextHandler$ApproveSameSuffixAliases"/> <New class="org.eclipse.jetty.server.handler.ContextHandler$ApproveSameSuffixAliases"/>
</Arg> </Arg>
</Call> </Call>
<!-- virtual hosts <!-- virtual hosts
<Set name="virtualHosts"> <Set name="virtualHosts">
<Array type="String"> <Array type="String">
@ -52,7 +52,7 @@ detected.
</Set> </Set>
--> -->
<!-- disable cookies <!-- disable cookies
<Get name="sessionHandler"> <Get name="sessionHandler">
<Get name="sessionManager"> <Get name="sessionManager">
<Set name="usingCookies" type="boolean">false</Set> <Set name="usingCookies" type="boolean">false</Set>
@ -67,7 +67,7 @@ detected.
<Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set> <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
<!-- To enable reload of realm when properties change, uncomment the following lines --> <!-- To enable reload of realm when properties change, uncomment the following lines -->
<!-- changing refreshInterval (in seconds) as desired --> <!-- changing refreshInterval (in seconds) as desired -->
<!-- <!--
<Set name="refreshInterval">5</Set> <Set name="refreshInterval">5</Set>
<Call name="start"></Call> <Call name="start"></Call>
--> -->
@ -80,7 +80,7 @@ detected.
</Set> </Set>
<Set name="checkWelcomeFiles">true</Set> <Set name="checkWelcomeFiles">true</Set>
</Get> </Get>
<!-- Non standard error page mapping --> <!-- Non standard error page mapping -->
<!-- <!--
<Get name="errorHandler"> <Get name="errorHandler">

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?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 This is the jetty specific web application configuration file. When starting

10
tests/test-webapps/test-jndi-webapp/src/main/templates/env-definitions.xml
View File

@ -1,15 +1,15 @@
<!-- Define an env entry with Server scope for java:comp/env --> <!-- 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><Property name='server'/></Arg>
<Arg>woggle</Arg> <Arg>woggle</Arg>
<Arg type="java.lang.Integer">4000</Arg> <Arg type="java.lang.Integer">4000</Arg>
<Arg type="boolean">false</Arg> <Arg type="boolean">false</Arg>
</New> </New>
<!-- Define an env entry with webapp scope for java:comp/env --> <!-- Define an env entry with webapp scope for java:comp/env -->
<New id="wiggle" class="org.eclipse.jetty.plus.jndi.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>wiggle</Arg>
<Arg type="java.lang.Double">100</Arg> <Arg type="java.lang.Double">100</Arg>
<Arg type="boolean">true</Arg> <Arg type="boolean">true</Arg>
@ -17,7 +17,7 @@
<!-- Mail Session setup --> <!-- Mail Session setup -->
<New id="xxxmail" class="org.eclipse.jetty.plus.jndi.Resource"> <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>mail/Session</Arg>
<Arg> <Arg>
<New class="org.eclipse.jetty.jndi.factories.MailSessionReference"> <New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
@ -37,7 +37,7 @@
<!-- A mock DataSource --> <!-- A mock DataSource -->
<New id="mydatasource" class="org.eclipse.jetty.plus.jndi.Resource"> <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>jdbc/mydatasource</Arg>
<Arg> <Arg>
<New class="com.acme.MockDataSource"/> <New class="com.acme.MockDataSource"/>

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Configure the test-jndi webapp -->

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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 --> <!-- Configure the test-jndi webapp -->
@ -12,7 +12,7 @@
</Arg> </Arg>
</New> </New>
<!-- only necessary for mvn jetty:run --> <!-- only necessary for mvn jetty:run -->

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

@ -1,11 +1,11 @@
<?xml version="1.0"?> <?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"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
<!-- Add an EnvEntry only valid for this webapp --> <!-- Add an EnvEntry only valid for this webapp -->
<New id="gargle" class="org.eclipse.jetty.plus.jndi.EnvEntry"> <New id="gargle" class="org.eclipse.jetty.plus.jndi.EnvEntry">
<Arg><Ref id='wac'/></Arg> <Arg><Ref refid='wac'/></Arg>
<Arg>gargle</Arg> <Arg>gargle</Arg>
<Arg type="java.lang.Double">100</Arg> <Arg type="java.lang.Double">100</Arg>
<Arg type="boolean">true</Arg> <Arg type="boolean">true</Arg>
@ -13,7 +13,7 @@
<!-- Add an override for a global EnvEntry --> <!-- Add an override for a global EnvEntry -->
<New id="wiggle" class="org.eclipse.jetty.plus.jndi.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>wiggle</Arg>
<Arg type="java.lang.Double">55.0</Arg> <Arg type="java.lang.Double">55.0</Arg>
<Arg type="boolean">true</Arg> <Arg type="boolean">true</Arg>
@ -21,7 +21,7 @@
<!-- Add a mapping from name in web.xml to the environment --> <!-- Add a mapping from name in web.xml to the environment -->
<New id="map1" class="org.eclipse.jetty.plus.jndi.Link"> <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/mydatasource1</Arg> <!-- name in web.xml -->
<Arg>jdbc/mydatasource</Arg> <!-- name in environment --> <Arg>jdbc/mydatasource</Arg> <!-- name in environment -->
</New> </New>

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?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"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Get class="org.eclipse.jetty.util.log.Log" name="rootLogger"> <Get class="org.eclipse.jetty.util.log.Log" name="rootLogger">

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?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"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/proxy</Set> <Set name="contextPath">/proxy</Set>

4
tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/env-definitions.xml
View File

@ -1,6 +1,6 @@
<New id="maxAmount" class="org.eclipse.jetty.plus.jndi.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>maxAmount</Arg>
<Arg type="java.lang.Double">100</Arg> <Arg type="java.lang.Double">100</Arg>
<Arg type="boolean">true</Arg> <Arg type="boolean">true</Arg>
@ -8,7 +8,7 @@
<New id="mydatasource" class="org.eclipse.jetty.plus.jndi.Resource"> <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>jdbc/mydatasource</Arg>
<Arg> <Arg>
<New class="com.acme.MockDataSource"> <New class="com.acme.MockDataSource">

2
tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/plugin-context-header.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?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">
<!-- =============================================================== --> <!-- =============================================================== -->

4
tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0"?> <?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"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
<!-- Add an override for a global EnvEntry --> <!-- Add an override for a global EnvEntry -->
<New id="maxAmount" class="org.eclipse.jetty.plus.jndi.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>maxAmount</Arg>
<Arg type="java.lang.Double">55.0</Arg> <Arg type="java.lang.Double">55.0</Arg>
<Arg type="boolean">true</Arg> <Arg type="boolean">true</Arg>

2
tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?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"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Get class="org.eclipse.jetty.util.log.Log" name="rootLogger"> <Get class="org.eclipse.jetty.util.log.Log" name="rootLogger">

6
tests/test-webapps/test-servlet-spec/test-spec-webapp/src/test/jetty-plugin-env.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0"?> <?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"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
<!-- Add an override for a global EnvEntry --> <!-- Add an override for a global EnvEntry -->
<New id="maxAmount" class="org.eclipse.jetty.plus.jndi.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>maxAmount</Arg>
<Arg type="java.lang.Double">55.0</Arg> <Arg type="java.lang.Double">55.0</Arg>
<Arg type="boolean">true</Arg> <Arg type="boolean">true</Arg>
@ -31,7 +31,7 @@
<New id="mydatasource" class="org.eclipse.jetty.plus.jndi.Resource"> <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>jdbc/mydatasource</Arg>
<Arg> <Arg>
<New class="com.acme.MockDataSource"/> <New class="com.acme.MockDataSource"/>