diff options
| author | Greg Wilkins | 2015-05-07 06:23:53 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2015-05-07 06:24:11 +0000 |
| commit | 5d041ad54f1796d0640623b06678bc58ce4fec93 (patch) | |
| tree | b5676466f79a49469c21a572744e50454da3791e | |
| parent | dbf4b2d72dbedcd61b106e4fde943286adf4580f (diff) | |
| download | org.eclipse.jetty.project-5d041ad54f1796d0640623b06678bc58ce4fec93.tar.gz org.eclipse.jetty.project-5d041ad54f1796d0640623b06678bc58ce4fec93.tar.xz org.eclipse.jetty.project-5d041ad54f1796d0640623b06678bc58ce4fec93.zip | |
466645 Allow XmlConfiguration Properties to use Elements or Attributes
103 files changed, 788 insertions, 288 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 9376677fe8..c15dc38f11 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="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.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 a0fc811ab1..deae1ddec1 100644 --- a/examples/embedded/src/main/resources/exampleserver.xml +++ b/examples/embedded/src/main/resources/exampleserver.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="ExampleServer" class="org.eclipse.jetty.server.Server"> diff --git a/examples/embedded/src/main/resources/fileserver.xml b/examples/embedded/src/main/resources/fileserver.xml index 0b4daa31f9..126f0987c8 100644 --- a/examples/embedded/src/main/resources/fileserver.xml +++ b/examples/embedded/src/main/resources/fileserver.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="FileServer" class="org.eclipse.jetty.server.Server"> diff --git a/examples/embedded/src/main/resources/jetty-otherserver.xml b/examples/embedded/src/main/resources/jetty-otherserver.xml index 4c8a5cd778..21272bb3a9 100644 --- a/examples/embedded/src/main/resources/jetty-otherserver.xml +++ b/examples/embedded/src/main/resources/jetty-otherserver.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="OtherServer" class="org.eclipse.jetty.server.Server"> <Set name="handler"> diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml b/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml index 5f16222c28..a8b0e35c9e 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml +++ b/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector"> @@ -16,10 +16,10 @@ <Arg> <New id="alpn" class="org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory"> <Arg type="String"> - <Property name="jetty.alpn.protocols,alpn.protocols" default="" /> + <Property name="jetty.alpn.protocols" deprecated="alpn.protocols" default="" /> </Arg> <Set name="defaultProtocol"> - <Property name="jetty.alpn.defaultProtocol,alpn.defaultProtocol" /> + <Property name="jetty.alpn.defaultProtocol" deprecated="alpn.defaultProtocol" /> </Set> </New> </Arg> diff --git a/jetty-annotations/src/main/config/etc/jetty-annotations.xml b/jetty-annotations/src/main/config/etc/jetty-annotations.xml index 637b511ea1..3eb3f6ba27 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> <!-- =========================================================== --> diff --git a/jetty-cdi/cdi-servlet/src/main/config/etc/jetty-cdi.xml b/jetty-cdi/cdi-servlet/src/main/config/etc/jetty-cdi.xml index f89ed7fc34..79ebdaee51 100644 --- a/jetty-cdi/cdi-servlet/src/main/config/etc/jetty-cdi.xml +++ b/jetty-cdi/cdi-servlet/src/main/config/etc/jetty-cdi.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Mixin the Weld / CDI classes to the class loader --> diff --git a/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-deploy/src/main/config/etc/jetty-deploy.xml index 813012c2a5..4544362f2a 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Create the deployment manager --> @@ -39,7 +39,7 @@ <Call id="webappprovider" name="addAppProvider"> <Arg> <New class="org.eclipse.jetty.deploy.providers.WebAppProvider"> - <Set name="monitoredDirName"><Property name="jetty.base" default="." />/<Property name="jetty.deploy.monitoredDir,jetty.deploy.monitoredDirName" default="webapps"/></Set> + <Set name="monitoredDirName"><Property name="jetty.base" default="." />/<Property name="jetty.deploy.monitoredDir" deprecated="jetty.deploy.monitoredDirName" default="webapps"/></Set> <Set name="defaultsDescriptor"><Property name="jetty.home" default="." />/etc/webdefault.xml</Set> <Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="1"/></Set> <Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set> 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 3c6a950c00..d49cf705c0 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> diff --git a/jetty-deploy/src/test/resources/jetty-deploy-wars.xml b/jetty-deploy/src/test/resources/jetty-deploy-wars.xml index 9933cb6ed9..1760a674f5 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> diff --git a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml index 8d55d22010..b16fbd7101 100644 --- a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml +++ b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> <Call name="addBean"> diff --git a/jetty-deploy/src/test/resources/jetty-http.xml b/jetty-deploy/src/test/resources/jetty-http.xml index 42b889b383..7fa6def071 100644 --- a/jetty-deploy/src/test/resources/jetty-http.xml +++ b/jetty-deploy/src/test/resources/jetty-http.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ============================================================= --> <!-- Configure the Jetty Server instance with an ID "Server" --> diff --git a/jetty-deploy/src/test/resources/jetty.xml b/jetty-deploy/src/test/resources/jetty.xml index 18e6a403be..a08e270f99 100644 --- a/jetty-deploy/src/test/resources/jetty.xml +++ b/jetty-deploy/src/test/resources/jetty.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Documentation of this file format can be found at: --> diff --git a/jetty-deploy/src/test/resources/webapps/foo.xml b/jetty-deploy/src/test/resources/webapps/foo.xml index e7c6e9daed..f0a96119a3 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="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Set name="contextPath">/foo</Set> <Set name="war"> diff --git a/jetty-distribution/src/main/resources/demo-base/webapps/example-moved.xml b/jetty-distribution/src/main/resources/demo-base/webapps/example-moved.xml index 53d6bfd3e7..e9ad12443b 100644 --- a/jetty-distribution/src/main/resources/demo-base/webapps/example-moved.xml +++ b/jetty-distribution/src/main/resources/demo-base/webapps/example-moved.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- Simple handler to redirect from old path to new --> <Configure class="org.eclipse.jetty.server.handler.MovedContextHandler"> diff --git a/jetty-distribution/src/main/resources/etc/hawtio.xml b/jetty-distribution/src/main/resources/etc/hawtio.xml index d6144358ec..cc87fce987 100644 --- a/jetty-distribution/src/main/resources/etc/hawtio.xml +++ b/jetty-distribution/src/main/resources/etc/hawtio.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"> <Call name="addHandler"> diff --git a/jetty-distribution/src/main/resources/etc/jamon.xml b/jetty-distribution/src/main/resources/etc/jamon.xml index 4a1c0d371d..ec1d3f509b 100644 --- a/jetty-distribution/src/main/resources/etc/jamon.xml +++ b/jetty-distribution/src/main/resources/etc/jamon.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Mixin the Jamon Handler --> diff --git a/jetty-distribution/src/main/resources/etc/jetty-setuid.xml b/jetty-distribution/src/main/resources/etc/jetty-setuid.xml index 75a4ebdf39..cb33a1a542 100644 --- a/jetty-distribution/src/main/resources/etc/jetty-setuid.xml +++ b/jetty-distribution/src/main/resources/etc/jetty-setuid.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ================================================================ --> <!-- Configure the Jetty SetUIDListener --> @@ -9,10 +9,10 @@ <Call name="addLifeCycleListener"> <Arg> <New class="org.eclipse.jetty.setuid.SetUIDListener"> - <Set name="startServerAsPrivileged"><Property name="jetty.setuid.startServerAsPrivileged,jetty.startServerAsPrivileged" default="false"/></Set> - <Set name="umaskOctal"><Property name="jetty.setuid.umask,jetty.umask" default="002"/></Set> - <Set name="username"><Property name="jetty.setuid.userName,jetty.username" default="jetty"/></Set> - <Set name="groupname"><Property name="jetty.setuid.groupName,jetty.groupname" default="jetty"/></Set> + <Set name="startServerAsPrivileged"><Property name="jetty.setuid.startServerAsPrivileged" deprecated="jetty.startServerAsPrivileged" default="false"/></Set> + <Set name="umaskOctal"><Property name="jetty.setuid.umask" deprecated="jetty.umask" default="002"/></Set> + <Set name="username"><Property name="jetty.setuid.userName" deprecated="jetty.username" default="jetty"/></Set> + <Set name="groupname"><Property name="jetty.setuid.groupName" deprecated="jetty.groupname" default="jetty"/></Set> <!-- uncomment to change the limits on number of open file descriptors for root --> <!-- <Call name="setRLimitNoFiles"> diff --git a/jetty-distribution/src/main/resources/etc/jetty-started.xml b/jetty-distribution/src/main/resources/etc/jetty-started.xml index b958074e5d..faa28395ac 100644 --- a/jetty-distribution/src/main/resources/etc/jetty-started.xml +++ b/jetty-distribution/src/main/resources/etc/jetty-started.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Mixin the Start FileNoticeLifeCycleListener --> diff --git a/jetty-distribution/src/main/resources/etc/jminix.xml b/jetty-distribution/src/main/resources/etc/jminix.xml index 21206666a2..15c699ea4b 100644 --- a/jetty-distribution/src/main/resources/etc/jminix.xml +++ b/jetty-distribution/src/main/resources/etc/jminix.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> <Call name="addBean"> diff --git a/jetty-distribution/src/main/resources/etc/jolokia.xml b/jetty-distribution/src/main/resources/etc/jolokia.xml index 3bc4dc1cc2..b6e240497a 100644 --- a/jetty-distribution/src/main/resources/etc/jolokia.xml +++ b/jetty-distribution/src/main/resources/etc/jolokia.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"> <Call name="addHandler"> diff --git a/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml b/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml index 18880e6846..423dd80564 100644 --- a/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml +++ b/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ============================================================= --> <!-- Configure a HTTP2 on the ssl connector. --> @@ -9,7 +9,7 @@ <Arg> <New class="org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory"> <Arg name="config"><Ref refid="sslHttpConfig"/></Arg> - <Set name="maxConcurrentStreams"><Property name="jetty.http2.maxConcurrentStreams,http2.maxConcurrentStreams" default="1024"/></Set> + <Set name="maxConcurrentStreams"><Property name="jetty.http2.maxConcurrentStreams" deprecated="http2.maxConcurrentStreams" default="1024"/></Set> <Set name="initialStreamSendWindow"><Property name="jetty.http2.initialStreamSendWindow" default="65535"/></Set> </New> </Arg> diff --git a/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml b/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml index bf021e386d..ab9a060694 100644 --- a/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml +++ b/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ============================================================= --> <!-- Configure a HTTP2 on the ssl connector. --> @@ -9,7 +9,7 @@ <Arg> <New class="org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory"> <Arg name="config"><Ref refid="httpConfig"/></Arg> - <Set name="maxConcurrentStreams"><Property name="jetty.http2.maxConcurrentStreams,http2.maxConcurrentStreams" default="1024"/></Set> + <Set name="maxConcurrentStreams"><Property name="jetty.http2.maxConcurrentStreams" deprecated="http2.maxConcurrentStreams" default="1024"/></Set> <Set name="initialStreamSendWindow"><Property name="jetty.http2.initialStreamSendWindow" default="65535"/></Set> </New> </Arg> diff --git a/jetty-infinispan/src/main/config/etc/jetty-infinispan.xml b/jetty-infinispan/src/main/config/etc/jetty-infinispan.xml index 6e6c1a207f..55be61bd20 100644 --- a/jetty-infinispan/src/main/config/etc/jetty-infinispan.xml +++ b/jetty-infinispan/src/main/config/etc/jetty-infinispan.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> diff --git a/jetty-jaas/src/main/config/etc/jetty-jaas.xml b/jetty-jaas/src/main/config/etc/jetty-jaas.xml index 262591140c..4e42594db6 100644 --- a/jetty-jaas/src/main/config/etc/jetty-jaas.xml +++ b/jetty-jaas/src/main/config/etc/jetty-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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> @@ -10,7 +10,7 @@ <!-- ======================================================== --> <Call class="java.lang.System" name="setProperty"> <Arg>java.security.auth.login.config</Arg> - <Arg><Property name="jetty.base" default="." />/<Property name="jetty.jaas.login.conf,jaas.login.conf" default="etc/login.conf"/></Arg> + <Arg><Property name="jetty.base" default="." />/<Property name="jetty.jaas.login.conf" deprecated="jaas.login.conf" default="etc/login.conf"/></Arg> </Call> </Configure> diff --git a/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml b/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml index c71b7a8aa3..48c8760a16 100644 --- a/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml +++ b/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> <!-- =========================================================== --> @@ -28,9 +28,9 @@ <Arg> <New class="javax.management.remote.JMXServiceURL"> <Arg type="java.lang.String">rmi</Arg> - <Arg type="java.lang.String"><Property name="jetty.jmxremote.rmihost,jetty.jmxrmihost" default="localhost"/></Arg> - <Arg type="java.lang.Integer"><Property name="jetty.jmxremote.rmiport,jetty.jmxrmiport" default="1099"/></Arg> - <Arg type="java.lang.String">/jndi/rmi://<Property name="jetty.jmxremote.rmihost,jetty.jmxrmihost" default="localhost"/>:<Property name="jetty.jmxremote.rmiport,jetty.jmxrmiport" default="1099"/>/jmxrmi</Arg> + <Arg type="java.lang.String"><Property name="jetty.jmxremote.rmihost" deprecated="jetty.jmxrmihost" default="localhost"/></Arg> + <Arg type="java.lang.Integer"><Property name="jetty.jmxremote.rmiport" deprecated="jetty.jmxrmiport" default="1099"/></Arg> + <Arg type="java.lang.String">/jndi/rmi://<Property name="jetty.jmxremote.rmihost" deprecated="jetty.jmxrmihost" default="localhost"/>:<Property name="jetty.jmxremote.rmiport,jetty.jmxrmiport" default="1099"/>/jmxrmi</Arg> </New> </Arg> <Arg>org.eclipse.jetty.jmx:name=rmiconnectorserver</Arg> diff --git a/jetty-jmx/src/main/config/etc/jetty-jmx.xml b/jetty-jmx/src/main/config/etc/jetty-jmx.xml index 4c67b8bc78..e07ea74435 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> diff --git a/jetty-monitor/src/main/config/etc/jetty-monitor.xml b/jetty-monitor/src/main/config/etc/jetty-monitor.xml index dcb15a6c40..e2cfe06743 100644 --- a/jetty-monitor/src/main/config/etc/jetty-monitor.xml +++ b/jetty-monitor/src/main/config/etc/jetty-monitor.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> <!-- Create Thread Monitor, and add to the Server as a lifecycle --> 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 b03a648e3d..19b3a5db09 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> 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 0613a1ab05..9c9dfbaf8d 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml index a4bc2fe4c1..a3850c9259 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> diff --git a/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml b/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml index 6aae6e9bf0..e1044c88bc 100644 --- a/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml +++ b/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- Copyright (c) 2009-2011 Intalio, Inc. diff --git a/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml b/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml index ef5122d24b..63cb0ee655 100644 --- a/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml +++ b/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure class="org.eclipse.jetty.server.handler.ContextHandler"> 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 b03a648e3d..19b3a5db09 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml index dd35c6f374..319ae6cbef 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ============================================================= --> <!-- Configure the Jetty Server instance with an ID "Server" --> diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml index 13258ae68f..3362c1bfd0 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ============================================================= --> <!-- Configure a HTTP2 on the ssl connector. --> diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml index f27cec070b..c9d497e2c1 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ============================================================= --> <!-- Configure a HTTPS connector. --> diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml index d80cf81b3e..a7b0f0746b 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ============================================================= --> <!-- Base SSL configuration --> 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 d26b427b5c..4c8cb533cc 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> <!-- =========================================================== --> <!-- Configure Authentication Login Service --> 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 a4bc2fe4c1..a3850c9259 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> diff --git a/jetty-overlay-deployer/src/main/config/etc/jetty-overlay.xml b/jetty-overlay-deployer/src/main/config/etc/jetty-overlay.xml index 72af906e92..60f23d677c 100644 --- a/jetty-overlay-deployer/src/main/config/etc/jetty-overlay.xml +++ b/jetty-overlay-deployer/src/main/config/etc/jetty-overlay.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Add a ContextProvider to the deployment manager --> diff --git a/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=blue/WEB-INF/overlay.xml b/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=blue/WEB-INF/overlay.xml index 8e7954fe8c..8d29a8aea2 100644 --- a/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=blue/WEB-INF/overlay.xml +++ b/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=blue/WEB-INF/overlay.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> diff --git a/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=green/WEB-INF/overlay.xml b/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=green/WEB-INF/overlay.xml index 1a962ed2a8..7a15e73af2 100644 --- a/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=green/WEB-INF/overlay.xml +++ b/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=green/WEB-INF/overlay.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> diff --git a/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=red/WEB-INF/overlay.xml b/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=red/WEB-INF/overlay.xml index c225d33f39..90685db44f 100644 --- a/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=red/WEB-INF/overlay.xml +++ b/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=red/WEB-INF/overlay.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> diff --git a/jetty-overlay-deployer/src/test/resources/home/overlays/instances/root=root/WEB-INF/overlay.xml b/jetty-overlay-deployer/src/test/resources/home/overlays/instances/root=root/WEB-INF/overlay.xml index 752b7088ee..ca23e18bac 100644 --- a/jetty-overlay-deployer/src/test/resources/home/overlays/instances/root=root/WEB-INF/overlay.xml +++ b/jetty-overlay-deployer/src/test/resources/home/overlays/instances/root=root/WEB-INF/overlay.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure class="org.eclipse.jetty.server.handler.ContextHandler"> <!-- diff --git a/jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/jetty-web.xml b/jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/jetty-web.xml index 7c44a4f84c..4723bf7369 100644 --- a/jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/jetty-web.xml +++ b/jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Call class="org.eclipse.jetty.util.log.Log" name="info"><Arg>Executing jetty-web.xml for <Property name="overlay.instance"/></Arg></Call> diff --git a/jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/template.xml b/jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/template.xml index 202dab0938..fddd63b673 100644 --- a/jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/template.xml +++ b/jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure class="org.eclipse.jetty.overlays.TemplateContext"> <Set name="parentLoaderPriority" type="boolean">false</Set> diff --git a/jetty-overlay-deployer/src/test/resources/home/overlays/templates/root/WEB-INF/overlay.xml b/jetty-overlay-deployer/src/test/resources/home/overlays/templates/root/WEB-INF/overlay.xml index 5131581cb7..f3037a1b13 100644 --- a/jetty-overlay-deployer/src/test/resources/home/overlays/templates/root/WEB-INF/overlay.xml +++ b/jetty-overlay-deployer/src/test/resources/home/overlays/templates/root/WEB-INF/overlay.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.eclipse.org/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.eclipse.org/configure_9_3.dtd"> <Configure class="org.eclipse.jetty.server.handler.ContextHandler"> diff --git a/jetty-plus/src/main/config/etc/jetty-plus.xml b/jetty-plus/src/main/config/etc/jetty-plus.xml index bfbcce5053..ed3082408a 100644 --- a/jetty-plus/src/main/config/etc/jetty-plus.xml +++ b/jetty-plus/src/main/config/etc/jetty-plus.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Configure extended support for webapps --> diff --git a/jetty-proxy/src/main/config/etc/jetty-proxy.xml b/jetty-proxy/src/main/config/etc/jetty-proxy.xml index 046537fc22..20ef31890e 100644 --- a/jetty-proxy/src/main/config/etc/jetty-proxy.xml +++ b/jetty-proxy/src/main/config/etc/jetty-proxy.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> diff --git a/jetty-quickstart/src/main/config/etc/example-quickstart.xml b/jetty-quickstart/src/main/config/etc/example-quickstart.xml index 3f02e60cf4..ddeedf9b74 100644 --- a/jetty-quickstart/src/main/config/etc/example-quickstart.xml +++ b/jetty-quickstart/src/main/config/etc/example-quickstart.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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- An example context XML for a quickstart webapp A quick started webapp has all the jar scanning and fragment resolution done in a diff --git a/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml b/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml index 714bcd91e6..43ae117c17 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Mixin the RewriteHandler --> @@ -16,9 +16,9 @@ <Set name="handler"> <New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler"> <Set name="handler"><Ref refid="oldhandler"/></Set> - <Set name="rewriteRequestURI"><Property name="jetty.rewrite.rewriteRequestURI,rewrite.rewriteRequestURI" default="true"/></Set> - <Set name="rewritePathInfo"><Property name="jetty.rewrite.rewritePathInfo,rewrite.rewritePathInfo" default="false"/></Set> - <Set name="originalPathAttribute"><Property name="jetty.rewrite.originalPathAttribute,rewrite.originalPathAttribute" default="requestedPath"/></Set> + <Set name="rewriteRequestURI"><Property name="jetty.rewrite.rewriteRequestURI" deprecated="rewrite.rewriteRequestURI" default="true"/></Set> + <Set name="rewritePathInfo"><Property name="jetty.rewrite.rewritePathInfo" deprecated="rewrite.rewritePathInfo" default="false"/></Set> + <Set name="originalPathAttribute"><Property name="jetty.rewrite.originalPathAttribute" deprecated="rewrite.originalPathAttribute" default="requestedPath"/></Set> </New> </Set> 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 6f0dede493..9ac510991d 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Configure the Jetty Server --> 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 21417947ab..7d7a9b491e 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Configure the Jetty Reverse HTTP Connector --> diff --git a/jetty-server/src/main/config/etc/home-base-warning.xml b/jetty-server/src/main/config/etc/home-base-warning.xml index b83f36f63d..4d568f138e 100644 --- a/jetty-server/src/main/config/etc/home-base-warning.xml +++ b/jetty-server/src/main/config/etc/home-base-warning.xml @@ -1,8 +1,8 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ============================================================= --> <!-- Display a Warning Message if {jetty.home} == {jetty.base} --> <!-- ============================================================= --> <Configure id="homeBaseWarning" class="org.eclipse.jetty.server.HomeBaseWarning"> -</Configure>
\ No newline at end of file +</Configure> diff --git a/jetty-server/src/main/config/etc/jetty-debuglog.xml b/jetty-server/src/main/config/etc/jetty-debuglog.xml index b4a2f5645a..adbb10a5d4 100644 --- a/jetty-server/src/main/config/etc/jetty-debuglog.xml +++ b/jetty-server/src/main/config/etc/jetty-debuglog.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- The DebugHandler --> @@ -12,7 +12,7 @@ <Set name="handler"><Ref refid="oldhandler"/></Set> <Set name="outputStream"> <New class="org.eclipse.jetty.util.RolloverFileOutputStream"> - <Arg type="String"><Property name="jetty.debuglog.dir,jetty.logs" default="./logs"/>/yyyy_mm_dd.debug.log</Arg> + <Arg type="String"><Property name="jetty.debuglog.dir" deprecated="jetty.logs" default="./logs"/>/yyyy_mm_dd.debug.log</Arg> <Arg type="boolean"><Property name="jetty.debuglog.append" default="true"/></Arg> <Arg type="int"><Property name="jetty.debuglog.retainDays" default="90"/></Arg> <Arg> diff --git a/jetty-server/src/main/config/etc/jetty-gzip.xml b/jetty-server/src/main/config/etc/jetty-gzip.xml index 35c8dcc70b..f26ef0b5a1 100644 --- a/jetty-server/src/main/config/etc/jetty-gzip.xml +++ b/jetty-server/src/main/config/etc/jetty-gzip.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Mixin the GZIP Handler --> @@ -13,12 +13,12 @@ <Set name="handler"> <New id="GzipHandler" class="org.eclipse.jetty.server.handler.gzip.GzipHandler"> <Set name="handler"><Ref refid="next" /></Set> - <Set name="minGzipSize"><Property name="jetty.gzip.minGzipSize,gzip.minGzipSize" default="2048"/></Set> - <Set name="checkGzExists"><Property name="jetty.gzip.checkGzExists,gzip.checkGzExists" default="false"/></Set> - <Set name="compressionLevel"><Property name="jetty.gzip.compressionLevel,gzip.compressionLevel" default="-1"/></Set> + <Set name="minGzipSize"><Property name="jetty.gzip.minGzipSize" deprecated="gzip.minGzipSize" default="2048"/></Set> + <Set name="checkGzExists"><Property name="jetty.gzip.checkGzExists" deprecated="gzip.checkGzExists" default="false"/></Set> + <Set name="compressionLevel"><Property name="jetty.gzip.compressionLevel" deprecated="gzip.compressionLevel" default="-1"/></Set> <Set name="excludedAgentPatterns"> <Array type="String"> - <Item><Property name="jetty.gzip.excludedUserAgent,gzip.excludedUserAgent" default=".*MSIE.6\.0.*"/></Item> + <Item><Property name="jetty.gzip.excludedUserAgent" deprecated="gzip.excludedUserAgent" default=".*MSIE.6\.0.*"/></Item> </Array> </Set> diff --git a/jetty-server/src/main/config/etc/jetty-http.xml b/jetty-server/src/main/config/etc/jetty-http.xml index 963f8db2b3..1a82aef5a2 100644 --- a/jetty-server/src/main/config/etc/jetty-http.xml +++ b/jetty-server/src/main/config/etc/jetty-http.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ============================================================= --> <!-- Configure the Jetty Server instance with an ID "Server" --> @@ -22,8 +22,8 @@ <Arg> <New id="httpConnector" class="org.eclipse.jetty.server.ServerConnector"> <Arg name="server"><Ref refid="Server" /></Arg> - <Arg name="acceptors" type="int"><Property name="jetty.http.acceptors,http.acceptors" default="-1"/></Arg> - <Arg name="selectors" type="int"><Property name="jetty.http.selectors,http.selectors" default="-1"/></Arg> + <Arg name="acceptors" type="int"><Property name="jetty.http.acceptors" deprecated="http.acceptors" default="-1"/></Arg> + <Arg name="selectors" type="int"><Property name="jetty.http.selectors" deprecated="http.selectors" default="-1"/></Arg> <Arg name="factories"> <Array type="org.eclipse.jetty.server.ConnectionFactory"> <!-- uncomment to support proxy protocol @@ -37,12 +37,12 @@ </Item> </Array> </Arg> - <Set name="host"><Property name="jetty.http.host,jetty.host" /></Set> - <Set name="port"><Property name="jetty.http.port,jetty.port" default="80" /></Set> - <Set name="idleTimeout"><Property name="jetty.http.idleTimeout,http.timeout" default="30000"/></Set> - <Set name="soLingerTime"><Property name="jetty.http.soLingerTime,http.soLingerTime" default="-1"/></Set> - <Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta,http.acceptorPriorityDelta" default="0"/></Set> - <Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize,http.acceptQueueSize" default="0"/></Set> + <Set name="host"><Property name="jetty.http.host" deprecated="jetty.host" /></Set> + <Set name="port"><Property name="jetty.http.port" deprecated="jetty.port" default="80" /></Set> + <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" deprecated="http.timeout" default="30000"/></Set> + <Set name="soLingerTime"><Property name="jetty.http.soLingerTime" deprecated="http.soLingerTime" default="-1"/></Set> + <Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta" deprecated="http.acceptorPriorityDelta" default="0"/></Set> + <Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize" deprecated="http.acceptQueueSize" default="0"/></Set> </New> </Arg> </Call> diff --git a/jetty-server/src/main/config/etc/jetty-https.xml b/jetty-server/src/main/config/etc/jetty-https.xml index f27cec070b..c9d497e2c1 100644 --- a/jetty-server/src/main/config/etc/jetty-https.xml +++ b/jetty-server/src/main/config/etc/jetty-https.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ============================================================= --> <!-- Configure a HTTPS connector. --> diff --git a/jetty-server/src/main/config/etc/jetty-ipaccess.xml b/jetty-server/src/main/config/etc/jetty-ipaccess.xml index d87ca02cfa..d8236a99a0 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- The IP Access Handler --> diff --git a/jetty-server/src/main/config/etc/jetty-lowresources.xml b/jetty-server/src/main/config/etc/jetty-lowresources.xml index 5884c42b99..f6442c8b5e 100644 --- a/jetty-server/src/main/config/etc/jetty-lowresources.xml +++ b/jetty-server/src/main/config/etc/jetty-lowresources.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Mixin the Low Resources Monitor --> @@ -10,12 +10,12 @@ <Arg> <New class="org.eclipse.jetty.server.LowResourceMonitor"> <Arg name="server"><Ref refid='Server'/></Arg> - <Set name="period"><Property name="jetty.lowresources.period,lowresources.period" default="1000"/></Set> - <Set name="lowResourcesIdleTimeout"><Property name="jetty.lowresources.idleTimeout,lowresources.lowResourcesIdleTimeout" default="1000"/></Set> - <Set name="monitorThreads"><Property name="jetty.lowresources.monitorThreads,lowresources.monitorThreads" default="true"/></Set> - <Set name="maxConnections"><Property name="jetty.lowresources.maxConnections,lowresources.maxConnections" default="0"/></Set> - <Set name="maxMemory"><Property name="jetty.lowresources.maxMemory,lowresources.maxMemory" default="0"/></Set> - <Set name="maxLowResourcesTime"><Property name="jetty.lowresources.maxLowResourcesTime,lowresources.maxLowResourcesTime" default="5000"/></Set> + <Set name="period"><Property name="jetty.lowresources.period" deprecated="lowresources.period" default="1000"/></Set> + <Set name="lowResourcesIdleTimeout"><Property name="jetty.lowresources.idleTimeout" deprecated="lowresources.lowResourcesIdleTimeout" default="1000"/></Set> + <Set name="monitorThreads"><Property name="jetty.lowresources.monitorThreads" deprecated="lowresources.monitorThreads" default="true"/></Set> + <Set name="maxConnections"><Property name="jetty.lowresources.maxConnections" deprecated="lowresources.maxConnections" default="0"/></Set> + <Set name="maxMemory"><Property name="jetty.lowresources.maxMemory" deprecated="lowresources.maxMemory" default="0"/></Set> + <Set name="maxLowResourcesTime"><Property name="jetty.lowresources.maxLowResourcesTime" deprecated="lowresources.maxLowResourcesTime" default="5000"/></Set> </New> </Arg> </Call> diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml index 4e512d1db9..a29dc638f0 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Configure the Jetty Request Log --> @@ -13,7 +13,6 @@ <Set name="RequestLog"> <New id="RequestLog" class="org.eclipse.jetty.server.AsyncNCSARequestLog"> - <Set name="filename"><Property name="jetty.base" default="." /> <Property> <Name>jetty.requestlog.filePath</Name> @@ -23,15 +22,18 @@ </Property> </Set> - - - <Set name="filename"><Property name="jetty.base" default="." /><Property name="jetty.requestlog.filePath,requestlog.filename" default="${jetty.requestlog.dir|/logs}/yyyy_mm_dd.request.log"/></Set> - <Set name="filenameDateFormat"><Property name="jetty.requestlog.filenameDateFormat,requestlog.filenameDateFormat" default="yyyy_MM_dd"/></Set> - <Set name="retainDays"><Property name="jetty.requestlog.retainDays,requestlog.retain" default="90"/></Set> - <Set name="append"><Property name="jetty.requestlog.append,requestlog.append" default="false"/></Set> - <Set name="extended"><Property name="jetty.requestlog.extended,requestlog.extended" default="false"/></Set> + <Set name="filename"><Property name="jetty.base" default="." /><Property> + <Name>jetty.requestlog.filePath</Name> + <Deprecated>requestlog.filename</Deprecated> + <Default><Property naem="jetty.requestlog.dir" default="/logs"/>/yyyy_mm_dd.request.log"</Default> + </Property> + </Set> + <Set name="filenameDateFormat"><Property name="jetty.requestlog.filenameDateFormat" deprecated="requestlog.filenameDateFormat" default="yyyy_MM_dd"/></Set> + <Set name="retainDays"><Property name="jetty.requestlog.retainDays" deprecated="requestlog.retain" default="90"/></Set> + <Set name="append"><Property name="jetty.requestlog.append" deprecated="requestlog.append" default="false"/></Set> + <Set name="extended"><Property name="jetty.requestlog.extended" deprecated="requestlog.extended" default="false"/></Set> <Set name="logCookies"><Property name="jetty.requestlog.cookies" deprecated="requestlog.cookies,ALLOWED" default="false"/></Set> - <Set name="LogTimeZone"><Property name="jetty.requestlog.timezone,requestlog.timezone" default="GMT"/></Set> + <Set name="LogTimeZone"><Property name="jetty.requestlog.timezone" deprecated="requestlog.timezone" default="GMT"/></Set> </New> </Set> </Configure> diff --git a/jetty-server/src/main/config/etc/jetty-ssl-context.xml b/jetty-server/src/main/config/etc/jetty-ssl-context.xml index d1052e2a6c..f6a8dcfedd 100644 --- a/jetty-server/src/main/config/etc/jetty-ssl-context.xml +++ b/jetty-server/src/main/config/etc/jetty-ssl-context.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ============================================================= --> <!-- SSL ContextFactory configuration --> @@ -7,14 +7,14 @@ <!-- jetty-ssl-extended-context.xml --> <!-- ============================================================= --> <Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory"> - <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath,jetty.keystore" default="etc/keystore"/></Set> - <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword,jetty.keystore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set> - <Set name="KeyManagerPassword"><Property name="jetty.sslContext.keyManagerPassword,jetty.keymanager.password" default="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/></Set> - <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath,jetty.truststore" default="etc/keystore"/></Set> - <Set name="TrustStorePassword"><Property name="jetty.sslContext.trustStorePassword,jetty.truststore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set> + <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="etc/keystore"/></Set> + <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set> + <Set name="KeyManagerPassword"><Property name="jetty.sslContext.keyManagerPassword" deprecated="jetty.keymanager.password" default="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/></Set> + <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="etc/keystore"/></Set> + <Set name="TrustStorePassword"><Property name="jetty.sslContext.trustStorePassword" deprecated="jetty.truststore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set> <Set name="EndpointIdentificationAlgorithm"></Set> - <Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth,jetty.ssl.needClientAuth" default="false"/></Set> - <Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth,jetty.ssl.wantClientAuth" default="false"/></Set> + <Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" deprecated="jetty.ssl.needClientAuth" default="false"/></Set> + <Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" deprecated="jetty.ssl.wantClientAuth" default="false"/></Set> <Set name="ExcludeCipherSuites"> <Array type="String"> <Item>SSL_RSA_WITH_DES_CBC_SHA</Item> diff --git a/jetty-server/src/main/config/etc/jetty-ssl-extended-context.xml b/jetty-server/src/main/config/etc/jetty-ssl-extended-context.xml index 7069affc56..29a7a3310e 100644 --- a/jetty-server/src/main/config/etc/jetty-ssl-extended-context.xml +++ b/jetty-server/src/main/config/etc/jetty-ssl-extended-context.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> <!-- ============================================================= --> diff --git a/jetty-server/src/main/config/etc/jetty-ssl.xml b/jetty-server/src/main/config/etc/jetty-ssl.xml index 4e1798235c..30169d023e 100644 --- a/jetty-server/src/main/config/etc/jetty-ssl.xml +++ b/jetty-server/src/main/config/etc/jetty-ssl.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ============================================================= --> <!-- Base SSL configuration --> @@ -15,8 +15,8 @@ <Arg> <New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector"> <Arg name="server"><Ref refid="Server" /></Arg> - <Arg name="acceptors" type="int"><Property name="jetty.ssl.acceptors,ssl.acceptors" default="-1"/></Arg> - <Arg name="selectors" type="int"><Property name="jetty.ssl.selectors,ssl.selectors" default="-1"/></Arg> + <Arg name="acceptors" type="int"><Property name="jetty.ssl.acceptors" deprecated="ssl.acceptors" default="-1"/></Arg> + <Arg name="selectors" type="int"><Property name="jetty.ssl.selectors" deprecated="ssl.selectors" default="-1"/></Arg> <Arg name="factories"> <Array type="org.eclipse.jetty.server.ConnectionFactory"> <!-- uncomment to support proxy protocol @@ -26,12 +26,12 @@ </Array> </Arg> - <Set name="host"><Property name="jetty.ssl.host,jetty.host" /></Set> - <Set name="port"><Property name="jetty.ssl.port,ssl.port" default="443" /></Set> - <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout,ssl.timeout" default="30000"/></Set> - <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime,ssl.soLingerTime" default="-1"/></Set> - <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta,ssl.acceptorPriorityDelta" default="0"/></Set> - <Set name="acceptQueueSize"><Property name="jetty.ssl.acceptQueueSize,ssl.acceptQueueSize" default="0"/></Set> + <Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host" /></Set> + <Set name="port"><Property name="jetty.ssl.port" deprecated="ssl.port" default="443" /></Set> + <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" deprecated="ssl.timeout" default="30000"/></Set> + <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime" deprecated="ssl.soLingerTime" default="-1"/></Set> + <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" deprecated="ssl.acceptorPriorityDelta" default="0"/></Set> + <Set name="acceptQueueSize"><Property name="jetty.ssl.acceptQueueSize" deprecated="ssl.acceptQueueSize" default="0"/></Set> </New> </Arg> </Call> diff --git a/jetty-server/src/main/config/etc/jetty-stats.xml b/jetty-server/src/main/config/etc/jetty-stats.xml index 2e7a57c7fa..4e014906a5 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Mixin the Statistics Handler --> diff --git a/jetty-server/src/main/config/etc/jetty.xml b/jetty-server/src/main/config/etc/jetty.xml index cbd0a1998e..c55953f8f3 100644 --- a/jetty-server/src/main/config/etc/jetty.xml +++ b/jetty-server/src/main/config/etc/jetty.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Documentation of this file format can be found at: --> @@ -46,9 +46,9 @@ <Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg> --> <Get name="ThreadPool"> - <Set name="minThreads" type="int"><Property name="jetty.threadPool.minThreads,threads.min" default="10"/></Set> - <Set name="maxThreads" type="int"><Property name="jetty.threadPool.maxThreads,threads.max" default="200"/></Set> - <Set name="idleTimeout" type="int"><Property name="jetty.threadPool.idleTimeout,threads.timeout" default="60000"/></Set> + <Set name="minThreads" type="int"><Property name="jetty.threadPool.minThreads" deprecated="threads.min" default="10"/></Set> + <Set name="maxThreads" type="int"><Property name="jetty.threadPool.maxThreads" deprecated="threads.max" default="200"/></Set> + <Set name="idleTimeout" type="int"><Property name="jetty.threadPool.idleTimeout" deprecated="threads.timeout" default="60000"/></Set> <Set name="detailedDump">false</Set> </Get> @@ -78,15 +78,15 @@ <!-- =========================================================== --> <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration"> <Set name="secureScheme"><Property name="jetty.httpConfig.secureScheme" default="https" /></Set> - <Set name="securePort"><Property name="jetty.httpConfig.securePort,jetty.secure.port" default="8443" /></Set> - <Set name="outputBufferSize"><Property name="jetty.httpConfig.outputBufferSize,jetty.output.buffer.size" default="32768" /></Set> - <Set name="outputAggregationSize"><Property name="jetty.httpConfig.outputAggregationSize,jetty.output.aggregation.size" default="8192" /></Set> - <Set name="requestHeaderSize"><Property name="jetty.httpConfig.requestHeaderSize,jetty.request.header.size" default="8192" /></Set> - <Set name="responseHeaderSize"><Property name="jetty.httpConfig.responseHeaderSize,jetty.response.header.size" default="8192" /></Set> - <Set name="sendServerVersion"><Property name="jetty.httpConfig.sendServerVersion,jetty.send.server.version" default="true" /></Set> - <Set name="sendDateHeader"><Property name="jetty.httpConfig.sendDateHeader,jetty.send.date.header" default="false" /></Set> + <Set name="securePort"><Property name="jetty.httpConfig.securePort" deprecated="jetty.secure.port" default="8443" /></Set> + <Set name="outputBufferSize"><Property name="jetty.httpConfig.outputBufferSize" deprecated="jetty.output.buffer.size" default="32768" /></Set> + <Set name="outputAggregationSize"><Property name="jetty.httpConfig.outputAggregationSize" deprecated="jetty.output.aggregation.size" default="8192" /></Set> + <Set name="requestHeaderSize"><Property name="jetty.httpConfig.requestHeaderSize" deprecated="jetty.request.header.size" default="8192" /></Set> + <Set name="responseHeaderSize"><Property name="jetty.httpConfig.responseHeaderSize" deprecated="jetty.response.header.size" default="8192" /></Set> + <Set name="sendServerVersion"><Property name="jetty.httpConfig.sendServerVersion" deprecated="jetty.send.server.version" default="true" /></Set> + <Set name="sendDateHeader"><Property name="jetty.httpConfig.sendDateHeader" deprecated="jetty.send.date.header" default="false" /></Set> <Set name="headerCacheSize"><Property name="jetty.httpConfig.headerCacheSize" default="512" /></Set> - <Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent,jetty.delayDispatchUntilContent" default="true"/></Set> + <Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent" deprecated="jetty.delayDispatchUntilContent" default="true"/></Set> <!-- Uncomment to enable handling of X-Forwarded- style headers <Call name="addCustomizer"> <Arg><New class="org.eclipse.jetty.server.ForwardedRequestCustomizer"/></Arg> @@ -125,7 +125,7 @@ <!-- =========================================================== --> <Set name="stopAtShutdown"><Property name="jetty.server.stopAtShutdown" default="true"/></Set> <Set name="stopTimeout">5000</Set> - <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart,jetty.dump.start" default="false"/></Set> - <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop,jetty.dump.stop" default="false"/></Set> + <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart" deprecated="jetty.dump.start" default="false"/></Set> + <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop" deprecated="jetty.dump.stop" default="false"/></Set> </Configure> diff --git a/jetty-util/src/main/config/etc/jetty-logging.xml b/jetty-util/src/main/config/etc/jetty-logging.xml index 3f3e72b51b..dc7fe9ed14 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Configure stderr and stdout to a Jetty rollover log file --> @@ -12,7 +12,7 @@ <New id="ServerLog" class="java.io.PrintStream"> <Arg> <New class="org.eclipse.jetty.util.RolloverFileOutputStream"> - <Arg><Property name="jetty.logging.dir,jetty.logs" default="./logs"/>/yyyy_mm_dd.stderrout.log</Arg> + <Arg><Property name="jetty.logging.dir" deprecated="jetty.logs" default="./logs"/>/yyyy_mm_dd.stderrout.log</Arg> <Arg type="boolean"><Property name="jetty.logging.append" default="false"/></Arg> <Arg type="int"><Property name="jetty.logging.retainDays" default="90"/></Arg> <Arg> diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java b/jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java index 33655ccb4d..88e10f1cfd 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java @@ -746,4 +746,17 @@ public class StringUtil return s.substring(1,s.length()-1).split(" *, *"); } + + /* ------------------------------------------------------------ */ + /** The String value of an Object + * <p>This method calls {@link String#valueOf(Object)} unless the object is null, + * in which case null is returned</p> + * @param object The object + * @return String value or null + */ + public static String valueOf(Object object) + { + return object==null?null:String.valueOf(object); + } + } diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java index f5c404a79c..4cd73c9b30 100644 --- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java +++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java @@ -52,6 +52,7 @@ import java.util.regex.Pattern; import org.eclipse.jetty.util.ArrayQueue; import org.eclipse.jetty.util.LazyList; import org.eclipse.jetty.util.Loader; +import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.log.Log; @@ -96,6 +97,7 @@ public class XmlConfiguration URL config60 = Loader.getResource(XmlConfiguration.class, "org/eclipse/jetty/xml/configure_6_0.dtd"); URL config76 = Loader.getResource(XmlConfiguration.class,"org/eclipse/jetty/xml/configure_7_6.dtd"); URL config90 = Loader.getResource(XmlConfiguration.class,"org/eclipse/jetty/xml/configure_9_0.dtd"); + URL config93 = Loader.getResource(XmlConfiguration.class,"org/eclipse/jetty/xml/configure_9_3.dtd"); parser.redirectEntity("configure.dtd",config90); parser.redirectEntity("configure_1_0.dtd",config60); parser.redirectEntity("configure_1_1.dtd",config60); @@ -104,13 +106,14 @@ public class XmlConfiguration parser.redirectEntity("configure_6_0.dtd",config60); parser.redirectEntity("configure_7_6.dtd",config76); parser.redirectEntity("configure_9_0.dtd",config90); + parser.redirectEntity("configure_9_3.dtd",config93); - parser.redirectEntity("http://jetty.mortbay.org/configure.dtd",config90); - parser.redirectEntity("http://jetty.eclipse.org/configure.dtd",config90); - parser.redirectEntity("http://www.eclipse.org/jetty/configure.dtd",config90); + parser.redirectEntity("http://jetty.mortbay.org/configure.dtd",config93); + parser.redirectEntity("http://jetty.eclipse.org/configure.dtd",config93); + parser.redirectEntity("http://www.eclipse.org/jetty/configure.dtd",config93); - parser.redirectEntity("-//Mort Bay Consulting//DTD Configure//EN",config90); - parser.redirectEntity("-//Jetty//Configure//EN",config90); + parser.redirectEntity("-//Mort Bay Consulting//DTD Configure//EN",config93); + parser.redirectEntity("-//Jetty//Configure//EN",config93); return parser; } @@ -270,9 +273,11 @@ public class XmlConfiguration public void initializeDefaults(Object object) { } + private static class JettyXmlConfiguration implements ConfigurationProcessor { + private String _url; XmlParser.Node _root; XmlConfiguration _configuration; @@ -429,6 +434,12 @@ public class XmlConfiguration case "Property": propertyObj(node); break; + case "SystemProperty": + systemPropertyObj(node); + break; + case "Env": + envObj(node); + break; default: throw new IllegalStateException("Unknown tag: " + tag + " in " + _url); } @@ -686,49 +697,36 @@ public class XmlConfiguration */ private Object call(Object obj, XmlParser.Node node) throws Exception { - String id = node.getAttribute("id"); - Class<?> oClass = nodeClass(node); - if (oClass != null) - obj = null; - else if (obj != null) - oClass = obj.getClass(); - if (oClass == null) - throw new IllegalArgumentException(node.toString()); + AttrOrElementNode aoeNode=new AttrOrElementNode(obj,node,"Id","Name","Class","Arg"); + String id = aoeNode.getString("Id"); + String name = aoeNode.getString("Name"); + String clazz = aoeNode.getString("Class"); + List<Object> args = aoeNode.getList("Arg"); - int size = 0; - int argIndex = node.size(); - for (int i = 0; i < node.size(); i++) + + Class<?> oClass; + if (clazz!=null) { - Object o = node.get(i); - if (o instanceof String) - continue; - if (!((XmlParser.Node)o).getTag().equals("Arg")) - { - argIndex = i; - break; - } - size++; + // static call + oClass=Loader.loadClass(XmlConfiguration.class,clazz); + obj=null; } - - Object[] arg = new Object[size]; - for (int i = 0, j = 0; j < size; i++) + else if (obj!=null) { - Object o = node.get(i); - if (o instanceof String) - continue; - arg[j++] = value(obj,(XmlParser.Node)o); + oClass = obj.getClass(); } - - String method = node.getAttribute("name"); + else + throw new IllegalArgumentException(node.toString()); + if (LOG.isDebugEnabled()) - LOG.debug("XML call " + method); + LOG.debug("XML call " + name); try { - Object n= TypeUtil.call(oClass,method,obj,arg); + Object n= TypeUtil.call(oClass,name,obj,args.toArray(new Object[args.size()])); if (id != null) _configuration.getIdMap().put(id,n); - configure(n,node,argIndex); + configure(n,node,aoeNode.getNext()); return n; } catch (NoSuchMethodException e) @@ -943,76 +941,124 @@ public class XmlConfiguration */ private Object propertyObj(XmlParser.Node node) throws Exception { - String idAttr = node.getAttribute("id"); - String nameAttr = node.getAttribute("name"); - String defaultValue = node.getAttribute("default"); + AttrOrElementNode aoeNode=new AttrOrElementNode(node,"Id","Name","Deprecated","Default"); + String id = aoeNode.getString("Id"); + String name = aoeNode.getString("Name",true); + List<Object> deprecated = aoeNode.getList("Deprecated"); + String dftValue = aoeNode.getString("Default"); - Object value = null; + // Look for a value Map<String,String> properties = _configuration.getProperties(); - if (properties != null && nameAttr != null) - value = resolve(properties, nameAttr); - - if (value == null && defaultValue != null) - value = interpolate(properties, defaultValue); - - if (idAttr != null) - _configuration.getIdMap().put(idAttr, value); - - if (value != null) - configure(value, node, 0); + String value = properties.get(name); + + // Look for a deprecated name value + if (value==null && !deprecated.isEmpty()) + { + for (Object d : deprecated) + { + value = properties.get(StringUtil.valueOf(d)); + if (value!=null) + { + LOG.warn("Property '{}' is deprecated, use '{}' instead", d, name); + break; + } + } + } + + // use default value + if (value==null) + value=dftValue; + // Set value if ID set + if (id != null) + _configuration.getIdMap().put(id, value); return value; } - private String resolve(Map<String, String> properties, String nameAttr) + /* + * Get a SystemProperty. + * + * @param node + * @return + * @exception Exception + */ + private Object systemPropertyObj(XmlParser.Node node) throws Exception { - String preferredName = null; - String[] names = nameAttr.split(","); - for (String name : names) + AttrOrElementNode aoeNode=new AttrOrElementNode(node,"Id","Name","Deprecated","Default"); + String id = aoeNode.getString("Id"); + String name = aoeNode.getString("Name",true); + List<Object> deprecated = aoeNode.getList("Deprecated"); + String dftValue = aoeNode.getString("Default"); + + // Look for a value + String value = System.getProperty(name); + + // Look for a deprecated name value + if (value==null && !deprecated.isEmpty()) { - name = name.trim(); - if (name.length() == 0) - continue; - if (preferredName == null) - preferredName = name; - - String value = properties.get(name); - if (value != null) + for (Object d : deprecated) { - if (!name.equals(preferredName)) - LOG.warn("Property '{}' is deprecated, use '{}' instead", name, preferredName); - return value; + value = System.getProperty(StringUtil.valueOf(d)); + if (value!=null) + { + LOG.warn("Property '{}' is deprecated, use '{}' instead", d, name); + break; + } } } - return null; - } + + // use default value + if (value==null) + value=dftValue; + + // Set value if ID set + if (id != null) + _configuration.getIdMap().put(id, value); - private String interpolate(Map<String, String> properties, String text) + return value; + } + + /* + * Get a Environment Property. + * + * @param node + * @return + * @exception Exception + */ + private Object envObj(XmlParser.Node node) throws Exception { - StringBuilder result = new StringBuilder(); - Matcher matcher = __propertyPattern.matcher(text); - int start = 0; - while (matcher.find(start)) + AttrOrElementNode aoeNode=new AttrOrElementNode(node,"Id","Name","Deprecated","Default"); + String id = aoeNode.getString("Id"); + String name = aoeNode.getString("Name",true); + List<Object> deprecated = aoeNode.getList("Deprecated"); + String dftValue = aoeNode.getString("Default"); + + // Look for a value + String value = System.getenv(name); + + // Look for a deprecated name value + if (value==null && !deprecated.isEmpty()) { - int match = matcher.start(); - result.append(text.substring(start, match)); - String name = matcher.group(1); - String dftValue = null; - int bar = name.indexOf('|'); - if (bar > 0) + for (Object d : deprecated) { - dftValue = name.substring(bar + 1).trim(); - name = name.substring(0, bar).trim(); + value = System.getenv(StringUtil.valueOf(d)); + if (value!=null) + { + LOG.warn("Property '{}' is deprecated, use '{}' instead", d, name); + break; + } } - String value = resolve(properties, name); - if (value == null) - value = dftValue; - result.append(value); - start = matcher.end(); } - result.append(text.substring(start, text.length())); - String r = result.toString(); - return r.isEmpty() ? null : r; + + // use default value + if (value==null) + value=dftValue; + + // Set value if ID set + if (id != null) + _configuration.getIdMap().put(id, value); + + return value; } /* @@ -1186,21 +1232,146 @@ public class XmlConfiguration if ("Property".equals(tag)) return propertyObj(node); if ("SystemProperty".equals(tag)) + return systemPropertyObj(node); + if ("Env".equals(tag)) + return envObj(node); + + LOG.warn("Unknown value tag: " + node,new Throwable()); + return null; + } + + + private class AttrOrElementNode + { + final Object _obj; + final XmlParser.Node _node; + final Set<String> _elements = new HashSet<>(); + final int _next; + + AttrOrElementNode(XmlParser.Node node,String... elements ) { - String name = node.getAttribute("name"); - String defaultValue = node.getAttribute("default"); - return System.getProperty(name,defaultValue); + this(null,node,elements); } - if ("Env".equals(tag)) + + AttrOrElementNode(Object obj, XmlParser.Node node,String... elements ) + { + _obj=obj; + _node=node; + for (String e:elements) + _elements.add(e); + + int next=0; + for (Object o: _node) + { + if (o instanceof String) + { + if (((String)o).trim().length()==0) + { + next++; + continue; + } + break; + } + + if (!(o instanceof XmlParser.Node)) + break; + + XmlParser.Node n = (XmlParser.Node)o; + if (!_elements.contains(n.getTag())) + break; + + next++; + } + _next=next; + } + + public int getNext() { - String name = node.getAttribute("name"); - String defaultValue = node.getAttribute("default"); - String value=System.getenv(name); - return value==null?defaultValue:value; + return _next; } - LOG.warn("Unknown value tag: " + node,new Throwable()); - return null; + public String getString(String elementName) throws Exception + { + return StringUtil.valueOf(get(elementName,false)); + } + + public Object get(String elementName) throws Exception + { + return get(elementName,false); + } + + public String getString(String elementName, boolean manditory) throws Exception + { + return StringUtil.valueOf(get(elementName,manditory)); + } + + + public Object get(String elementName, boolean manditory) throws Exception + { + String attrName=StringUtil.asciiToLowerCase(elementName); + String attr = _node.getAttribute(attrName); + Object value=attr; + + for (int i=0;i<_next;i++) + { + Object o = _node.get(i); + if (!(o instanceof XmlParser.Node)) + continue; + XmlParser.Node n = (XmlParser.Node)o; + if (elementName.equals(n.getTag())) + { + if (attr!=null) + throw new IllegalStateException("Cannot have attr '"+attrName+"' and element '"+elementName+"'"); + + value=value(_obj,n); + break; + } + } + + if (manditory && value==null) + throw new IllegalStateException("Must have attr '"+attrName+"' or element '"+elementName+"'"); + + return value; + } + + public List<Object> getList(String elementName) throws Exception + { + return getList(elementName,false); + } + + public List<Object> getList(String elementName, boolean manditory) throws Exception + { + String attrName=StringUtil.asciiToLowerCase(elementName); + final List<Object> values=new ArrayList<>(); + + String attr = _node.getAttribute(attrName); + if (attr!=null) + { + for (String a : attr.split(",")) + values.add(a); + } + + for (int i=0;i<_next;i++) + { + Object o = _node.get(i); + if (!(o instanceof XmlParser.Node)) + continue; + XmlParser.Node n = (XmlParser.Node)o; + + if (elementName.equals(n.getTag())) + { + if (attr!=null) + throw new IllegalStateException("Cannot have attr '"+attrName+"' and element '"+elementName+"'"); + + values.add(value(_obj,n)); + } + } + + if (manditory && values.isEmpty()) + throw new IllegalStateException("Must have attr '"+attrName+"' or element '"+elementName+"'"); + + return values; + } } } @@ -1231,7 +1402,6 @@ public class XmlConfiguration { try { - Properties properties = null; // Look for properties from start.jar diff --git a/jetty-xml/src/main/resources/org/eclipse/jetty/xml/configure_9_0.dtd b/jetty-xml/src/main/resources/org/eclipse/jetty/xml/configure_9_0.dtd index 542bc8c9db..7d6045bfb2 100644 --- a/jetty-xml/src/main/resources/org/eclipse/jetty/xml/configure_9_0.dtd +++ b/jetty-xml/src/main/resources/org/eclipse/jetty/xml/configure_9_0.dtd @@ -274,15 +274,6 @@ Property Element. This element allows arbitrary properties to be retrieved by name. The name attribute specifies the property name and the optional default argument provides a default value. - -A Property element can contain a sequence of elements such as Set, Put, Call, etc. -which act on the retrieved object: - - <Property name="Server"> - <Call id="jdbcIdMgr" name="getAttribute"> - <Arg>jdbcIdMgr</Arg> - </Call> - </Property> --> <!ELEMENT Property (%CONFIG;)* > <!ATTLIST Property %NAMEATTR; %DEFAULTATTR; %IDATTR; > diff --git a/jetty-xml/src/main/resources/org/eclipse/jetty/xml/configure_9_3.dtd b/jetty-xml/src/main/resources/org/eclipse/jetty/xml/configure_9_3.dtd new file mode 100644 index 0000000000..1b0b37f06b --- /dev/null +++ b/jetty-xml/src/main/resources/org/eclipse/jetty/xml/configure_9_3.dtd @@ -0,0 +1,280 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!-- +This is the document type descriptor for the +org.eclipse.jetty.xml.XmlConfiguration class. It allows a java object to be +configured by with a sequence of Set, Put and Call elements. These tags are +mapped to methods on the object to be configured as follows: + + <Set name="Test">value</Set> == obj.setTest("value"); + <Put name="Test">value</Put> == obj.put("Test","value"); + <Call name="test"><Arg>value</Arg></Call> == obj.test("value"); + +Values themselves may be configured objects that are created with the +<New> tag or returned from a <Call> tag. + +Values are matched to arguments on a best effort approach, but types +my be specified if a match is not achieved. + +--> + +<!ENTITY % CONFIG "Set|Get|Put|Call|New|Ref|Array|Map|Property"> +<!ENTITY % VALUE "#PCDATA|Get|Call|New|Ref|Array|Map|SystemProperty|Env|Property"> + +<!ENTITY % TYPEATTR "type CDATA #IMPLIED " > <!-- String|Character|Short|Byte|Integer|Long|Boolean|Float|Double|char|short|byte|int|long|boolean|float|double|URL|InetAddress|InetAddrPort| #classname --> +<!ENTITY % IMPLIEDCLASSATTR "class CDATA #IMPLIED" > +<!ENTITY % CLASSATTR "class CDATA #REQUIRED" > +<!ENTITY % NAMEATTR "name CDATA #REQUIRED" > +<!ENTITY % IMPLIEDNAMEATTR "name CDATA #IMPLIED" > +<!ENTITY % DEPRECATEDATTR "deprecated CDATA #IMPLIED" > +<!ENTITY % DEFAULTATTR "default CDATA #IMPLIED" > +<!ENTITY % IDATTR "id ID #IMPLIED" > +<!ENTITY % ARGATTR "arg CDATA #IMPLIED" > +<!ENTITY % REFATTR "refid CDATA #IMPLIED" > +<!ENTITY % REQUIREDIDATTR "id ID #REQUIRED" > + + +<!-- +Configure Element. +This is the root element that specifies the class of object that +can be configured: + + <Configure class="com.acme.MyClass"> ... </Configure> +--> +<!ELEMENT Configure (Arg*,(%CONFIG;)*) > +<!ATTLIST Configure %IMPLIEDCLASSATTR; %IDATTR; > + + +<!-- +Set Element. +This element maps to a call to a setter method or field on the current object. +The name and optional type attributes are used to select the setter +method. If the name given is xxx, then a setXxx method is used, or +the xxx field is used of setXxx cannot be found. +A Set element can contain value text and/or the value objects returned +by other elements such as Call, New, SystemProperty, etc. +If no value type is specified, then white +space is trimmed out of the value. If it contains multiple value +elements they are added as strings before being converted to any +specified type. + +A Set with a class attribute is treated as a static set method invocation. +--> +<!ELEMENT Set (%VALUE;)* > +<!ATTLIST Set %NAMEATTR; %TYPEATTR; %IMPLIEDCLASSATTR; > + + +<!-- +Get Element. +This element maps to a call to a getter method or field on the current object. +The name attribute is used to select the get method. +If the name given is xxx, then a getXxx method is used, or +the xxx field is used if getXxx cannot be found. +A Get element can contain other elements such as Set, Put, Call, etc. +which act on the object returned by the get call. + +A Get with a class attribute is treated as a static get method or field. +--> +<!ELEMENT Get (%CONFIG;)* > +<!ATTLIST Get %NAMEATTR; %IMPLIEDCLASSATTR; %IDATTR; > + + +<!-- +Put Element. +This element maps to a call to a put method on the current object, +which must implement the Map interface. The name attribute is used +as the put key and the optional type attribute can force the type +of the value. + +A Put element can contain value text and/or value elements such as Call, +New, SystemProperty, etc. If no value type is specified, then white +space is trimmed out of the value. If it contains multiple value +elements they are added as strings before being converted to any +specified type. +--> +<!ELEMENT Put (%VALUE;)* > +<!ATTLIST Put %NAMEATTR; %TYPEATTR; > + + +<!-- +Call Element. +This element maps to an arbitrary call to a method on the current object, +The name attribute and Arg elements are used to select the method. + +A Call element can contain a sequence of Arg elements followed by +a sequence of other elements such as Set, Put, Call, etc. which act on any object +returned by the original call: + + <Call id="o2" name="test"> + <Arg>value1</Arg> + <Set name="Test">Value2</Set> + </Call> + +This is equivalent to: + + Object o2 = o1.test("value1"); + o2.setTest("value2"); + +A Call with a class attribute is treated as a static call. +--> +<!ELEMENT Call (Id?,Name?,Class?,Arg*,(%CONFIG;)*) > +<!ATTLIST Call %ARGATTR; %IMPLIEDNAMEATTR; %IMPLIEDCLASSATTR; %IDATTR; > + + +<!-- +Arg Element. +This element defines a positional or optional named argument for the +Call and New elements. The optional type attribute can force the type +of the value. + +An Arg element can contain value text and/or value elements such as Call, +New, SystemProperty, etc. If no value type is specified, then white +space is trimmed out of the value. If it contains multiple value +elements they are added as strings before being converted to any +specified type. +--> +<!ELEMENT Arg (%VALUE;)* > +<!ATTLIST Arg %TYPEATTR; %IMPLIEDNAMEATTR; > + + +<!-- +New Element. +This element allows the creation of a new object as part of a +value for elements such as Set, Put, Arg, etc. The class attribute +determines the type of the new object and the contained Arg elements +are used to select the constructor for the new object. + +A New element can contain a sequence of Arg elements followed by +a sequence of elements such as Set, Put, Call, etc. elements +which act on the new object: + + <New id="o" class="com.acme.MyClass"> + <Arg>value1</Arg> + <Set name="test">Value2</Set> + </New> + +This is equivalent to: + + Object o = new com.acme.MyClass("value1"); + o.setTest("Value2"); +--> +<!ELEMENT New (Arg*,(%CONFIG;)*) > +<!ATTLIST New %CLASSATTR; %IDATTR;> + + +<!-- +Ref Element. +This element allows a previously created object to be referenced by id. The +attribute refid is used to specify the id of another object (the attribute id can +also be used, but it's use is deprecated). +A Ref element can contain a sequence of elements such as Set, Put, Call, etc. +which act on the referenced object. + + <Ref refid="myobject"> + <Set name="Test">Value2</Set> + </New> +--> +<!ELEMENT Ref (%CONFIG;)* > +<!ATTLIST Ref %IDATTR; %REFATTR;> + + +<!-- +Array Element. +This element allows the creation of a new array as part of a +value of elements such as Set, Put, Arg, etc. The type attribute determines +the type of the new array and the contained Item elements +are used for each element of the array: + + <Array type="java.lang.String"> + <Item>value0</Item> + <Item><New class="java.lang.String"><Arg>value1</Arg></New></Item> + </Array> + +This is equivalent to: + String[] a = new String[] { "value0", new String("value1") }; +--> +<!ELEMENT Array (Item*) > +<!ATTLIST Array %TYPEATTR; %IDATTR; > + + +<!-- +Map Element. +This element allows the creation of a new map as part of a +value of elements such as Set, Put, Arg, etc. The type attribute determines +the type of the new array and the contained Item elements +are used for each element of the array: + + <Map> + <Entry> + <Item>keyName</Item> + <Item><New class="java.lang.String"><Arg>value1</Arg></New></Item> + </Entry> + </Map> + +This is equivalent to: + Map m = new HashMap(); + m.put("keyName", new String("value1")); +--> +<!ELEMENT Map (Entry*) > +<!ATTLIST Map %IDATTR; > +<!ELEMENT Entry (Item,Item) > + + +<!-- +Item Element. +This element defines an entry for the Array or Map Entry elements. +The optional type attribute can force the type of the value. + +An Item element can contain value text and/or the value object of +elements such as Call, New, SystemProperty, etc. If no value type +is specified, then white space is trimmed out of the value. +If it contains multiple value elements they are added as strings +before being converted to any specified type. +--> +<!ELEMENT Item (%VALUE;)* > +<!ATTLIST Item %TYPEATTR; %IDATTR; > + + +<!-- +System Property Element. +This element allows JVM System properties to be retrieved as +part of the value of elements such as Set, Put, Arg, etc. +The name attribute specifies the property name and the optional +default argument provides a default value. + + <SystemProperty name="Test" default="value" /> + +This is equivalent to: + + System.getProperty("Test","value"); +--> +<!ELEMENT SystemProperty (Id?,Name?,Deprecated*,Default?) > +<!ATTLIST SystemProperty %IMPLIEDNAMEATTR; %DEFAULTATTR; %DEPRECATEDATTR; %IDATTR; > + +<!-- +Environment variable Element. +This element allows OS Environment variables to be retrieved as +part of the value of elements such as Set, Put, Arg, etc. +The name attribute specifies the env variable name and the optional +default argument provides a default value. + + <Env name="Test" default="value" /> + +This is equivalent to: + + String v=System.getEnv("Test"); + if (v==null) v="value"; + +--> +<!ELEMENT Env (Id?,Name?,Deprecated*,Default?) > +<!ATTLIST Env %IMPLIEDNAMEATTR; %DEFAULTATTR; %DEPRECATEDATTR; %IDATTR; > + + +<!-- +Property Element. +This element allows arbitrary properties to be retrieved by name. +The name attribute specifies the property name and the optional +default argument provides a default value. +--> +<!ELEMENT Property (Id?,Name?,Deprecated*,Default?) > +<!ATTLIST Property %IMPLIEDNAMEATTR; %DEFAULTATTR; %DEPRECATEDATTR; %IDATTR; > diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java index 1cc9a61c83..aeb90ca928 100644 --- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java +++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java @@ -787,7 +787,7 @@ public class XmlConfigurationTest String defolt = "baz"; XmlConfiguration xmlConfiguration = new XmlConfiguration("" + "<Configure class=\"org.eclipse.jetty.xml.DefaultTestConfiguration\">" + - " <Set name=\"first\"><Property name=\"foo,bar\" default=\"" + defolt + "\"/></Set> " + + " <Set name=\"first\"><Property name=\"wibble\" deprecated=\"foo,bar\" default=\"" + defolt + "\"/></Set> " + "</Configure>"); DefaultTestConfiguration config = (DefaultTestConfiguration)xmlConfiguration.configure(); assertEquals(defolt, config.getFirst()); @@ -800,7 +800,7 @@ public class XmlConfigurationTest String value = "foo"; XmlConfiguration xmlConfiguration = new XmlConfiguration("" + "<Configure class=\"org.eclipse.jetty.xml.DefaultTestConfiguration\">" + - " <Set name=\"first\"><Property name=\"" + name + ",bar\" default=\"baz\"/></Set> " + + " <Set name=\"first\"><Property name=\"" + name + "\" deprecated=\"other,bar\" default=\"baz\"/></Set> " + "</Configure>"); xmlConfiguration.getProperties().put(name, value); DefaultTestConfiguration config = (DefaultTestConfiguration)xmlConfiguration.configure(); @@ -814,7 +814,42 @@ public class XmlConfigurationTest String value = "bar"; XmlConfiguration xmlConfiguration = new XmlConfiguration("" + "<Configure class=\"org.eclipse.jetty.xml.DefaultTestConfiguration\">" + - " <Set name=\"first\"><Property name=\"foo," + name + "\" default=\"baz\"/></Set> " + + " <Set name=\"first\"><Property name=\"foo\" deprecated=\"" + name + "\" default=\"baz\"/></Set> " + + "</Configure>"); + xmlConfiguration.getProperties().put(name, value); + DefaultTestConfiguration config = (DefaultTestConfiguration)xmlConfiguration.configure(); + assertEquals(value, config.getFirst()); + } + + @Test + public void testWithMultiplePropertyNamesWithDeprecatedThenThirdIsChosen() throws Exception + { + String name = "bar"; + String value = "bar"; + XmlConfiguration xmlConfiguration = new XmlConfiguration("" + + "<Configure class=\"org.eclipse.jetty.xml.DefaultTestConfiguration\">" + + " <Set name=\"first\"><Property name=\"foo\" deprecated=\"other," + name + "\" default=\"baz\"/></Set> " + + "</Configure>"); + xmlConfiguration.getProperties().put(name, value); + DefaultTestConfiguration config = (DefaultTestConfiguration)xmlConfiguration.configure(); + assertEquals(value, config.getFirst()); + } + + @Test + public void testWithMultiplePropertyNameElementsWithDeprecatedThenThirdIsChosen() throws Exception + { + String name = "bar"; + String value = "bar"; + XmlConfiguration xmlConfiguration = new XmlConfiguration("" + + "<Configure class=\"org.eclipse.jetty.xml.DefaultTestConfiguration\">" + + " <Set name=\"first\">" + + " <Property> " + + " <Name>foo</Name>" + + " <Deprecated>foo</Deprecated>" + + " <Deprecated>"+name+"</Deprecated>" + + " <Default>baz</Default>" + + " </Property> " + + " </Set> " + "</Configure>"); xmlConfiguration.getProperties().put(name, value); DefaultTestConfiguration config = (DefaultTestConfiguration)xmlConfiguration.configure(); @@ -826,11 +861,16 @@ public class XmlConfigurationTest { String name = "bar"; String value = "bar"; - String defaultValue = "_${bar}_${bar}_"; + String defaultValue = "_<Property name=\"bar\"/>_<Property name=\"bar\"/>_"; String expectedValue = "_" + value + "_" + value + "_"; XmlConfiguration xmlConfiguration = new XmlConfiguration("" + "<Configure class=\"org.eclipse.jetty.xml.DefaultTestConfiguration\">" + - " <Set name=\"first\"><Property name=\"not_found\" default=\"" + defaultValue + "\"/></Set> " + + " <Set name=\"first\">" + + " <Property>" + + " <Name>not_found</Name>" + + " <Default>" + defaultValue + "</Default>" + + " </Property>" + + " </Set> " + "</Configure>"); xmlConfiguration.getProperties().put(name, value); DefaultTestConfiguration config = (DefaultTestConfiguration)xmlConfiguration.configure(); @@ -843,7 +883,11 @@ public class XmlConfigurationTest String value = "bar"; XmlConfiguration xmlConfiguration = new XmlConfiguration("" + "<Configure class=\"org.eclipse.jetty.xml.DefaultTestConfiguration\">" + - " <Set name=\"first\"><Property name=\"not_found\" default=\"${not_found|" + value + "}\"/></Set> " + + " <Set name=\"first\">" + + " <Property name=\"not_found\">" + + " <Default><Property name=\"also_not_found\" default=\"" + value + "\"/></Default>" + + " </Property>" + + " </Set> " + "</Configure>"); DefaultTestConfiguration config = (DefaultTestConfiguration)xmlConfiguration.configure(); assertEquals(value, config.getFirst()); diff --git a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configure.xml b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configure.xml index 46c85718cf..29f3de97e1 100644 --- a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configure.xml +++ b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configure.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure class="org.eclipse.jetty.xml.TestConfiguration"> <Arg name="name">name</Arg> diff --git a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/mortbay.xml b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/mortbay.xml index 08e75df181..c8e20cee27 100644 --- a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/mortbay.xml +++ b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/mortbay.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure_9_3.dtd"> <Configure class="java.lang.Object"> </Configure> diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java index 91e4c173fe..a6b1d10e8e 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java @@ -103,7 +103,7 @@ public class HttpInputIntegrationTest // SSL Context Factory for HTTPS and HTTP/2 String jetty_distro = System.getProperty("jetty.distro","../../jetty-distribution/target/distribution"); __sslContextFactory = new SslContextFactory(); - __sslContextFactory.setKeyStorePath(jetty_distro + "/etc/example-keystore"); + __sslContextFactory.setKeyStorePath(jetty_distro + "/../../../jetty-server/src/test/config/etc/keystore"); __sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); __sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); diff --git a/tests/test-integration/src/test/resources/DefaultHandler.xml b/tests/test-integration/src/test/resources/DefaultHandler.xml index 644e7f981c..a0504083bf 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.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 a140c17745..d58befb1b9 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.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 cef54b53bf..5146752a77 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.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 2c300d1498..a35088f5e8 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Configure the Jetty Server --> diff --git a/tests/test-integration/src/test/resources/RFC2616_Filters.xml b/tests/test-integration/src/test/resources/RFC2616_Filters.xml index a798bfd986..73dbb385f8 100644 --- a/tests/test-integration/src/test/resources/RFC2616_Filters.xml +++ b/tests/test-integration/src/test/resources/RFC2616_Filters.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> diff --git a/tests/test-integration/src/test/resources/RFC2616_Redirects.xml b/tests/test-integration/src/test/resources/RFC2616_Redirects.xml index a3cc7a3711..a777ad1e89 100644 --- a/tests/test-integration/src/test/resources/RFC2616_Redirects.xml +++ b/tests/test-integration/src/test/resources/RFC2616_Redirects.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> <!-- =========================================================== --> 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 999cdc4593..36e624f56d 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="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Set name="contextPath">/rfc2616-webapp</Set> <Set name="war"><Property name="test.webapps" default="." />/test-webapp-rfc2616.war</Set> diff --git a/tests/test-quickstart/src/test/resources/test-jndi.xml b/tests/test-quickstart/src/test/resources/test-jndi.xml index 14c0934845..5f4ab4fa2d 100644 --- a/tests/test-quickstart/src/test/resources/test-jndi.xml +++ b/tests/test-quickstart/src/test/resources/test-jndi.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Configure the test-jndi webapp --> diff --git a/tests/test-quickstart/src/test/resources/test-spec.xml b/tests/test-quickstart/src/test/resources/test-spec.xml index 99fc577205..a136d28395 100644 --- a/tests/test-quickstart/src/test/resources/test-spec.xml +++ b/tests/test-quickstart/src/test/resources/test-spec.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext"> diff --git a/tests/test-quickstart/src/test/resources/test.xml b/tests/test-quickstart/src/test/resources/test.xml index 41eba0c290..85156563b4 100644 --- a/tests/test-quickstart/src/test/resources/test.xml +++ b/tests/test-quickstart/src/test/resources/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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ================================================================== Configure and deploy the test web application in $(jetty.home)/webapps/test diff --git a/tests/test-webapps/test-jaas-webapp/src/main/config/demo-base/webapps/test-jaas.xml b/tests/test-webapps/test-jaas-webapp/src/main/config/demo-base/webapps/test-jaas.xml index f3b0a18b1a..c56276b0a7 100644 --- a/tests/test-webapps/test-jaas-webapp/src/main/config/demo-base/webapps/test-jaas.xml +++ b/tests/test-webapps/test-jaas-webapp/src/main/config/demo-base/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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.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 e7830c65bc..ecd5e307bb 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="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.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 5d223e3cf5..9b4e89280b 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="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ================================================================== Configure and deploy the test web application in $(jetty.home)/webapps/test diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/demo-rewrite-rules.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/demo-rewrite-rules.xml index 35a8f87582..df2c608e8b 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/demo-rewrite-rules.xml +++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/demo-rewrite-rules.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Configure the demos --> diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/test-realm.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/test-realm.xml index f5f32e1f0c..f1b342bf3e 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/test-realm.xml +++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/test-realm.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> <!-- =========================================================== --> <!-- Configure Authentication Login Service --> diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml index 5776e38f35..0037cb4906 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml +++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- ================================================================== Configure and deploy the test web application in $(jetty.home)/webapps/test 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 19fb028dda..c04f74c789 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="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- This is the jetty specific web application configuration file. When starting 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 4f4ded0846..484551a6b3 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.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 3e877a59ef..bd97eb1360 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> <!-- Configure the test-jndi webapp --> 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 b7fa49f07b..7899c45d58 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,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext"> 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 fd4831e8b6..203f811885 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="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.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 030fd192cf..e2cb8ec33c 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="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.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/annotations-context-header.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/annotations-context-header.xml index 50b5981445..ff2f6a1f96 100644 --- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/annotations-context-header.xml +++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/annotations-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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> 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 450eddacfd..36ff548a92 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_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.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 c15926b1a6..909ac83052 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,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext"> 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 62b92f994d..e360f5c202 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="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.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 774184305d..23c4b5b9cb 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,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext"> |