Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/async-rest/async-rest-jar/src/main/resources/META-INF/web-fragment.xml2
-rw-r--r--examples/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml2
-rw-r--r--jetty-ant/src/test/resources/foo/WEB-INF/acme-taglib.tld2
-rw-r--r--jetty-ant/src/test/resources/foo/WEB-INF/web.xml2
-rw-r--r--jetty-deploy/src/test/resources/etc/webdefault.xml2
-rw-r--r--jetty-deploy/src/test/resources/webapps/foo.xml2
-rw-r--r--jetty-distribution/src/main/resources/demo-base/webapps/example-moved.xml2
-rw-r--r--jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml2
-rw-r--r--jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml2
-rw-r--r--jetty-osgi/test-jetty-osgi/src/test/config/etc/webdefault.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=blue/WEB-INF/overlay.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=blue/WEB-INF/web-overlay.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=green/WEB-INF/overlay.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=green/WEB-INF/web-overlay.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=red/WEB-INF/overlay.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=red/WEB-INF/web-overlay.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/instances/root=root/WEB-INF/overlay.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/nodes/nodeA/WEB-INF/web-overlay.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/nodes/nodeB/WEB-INF/web.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/jetty-web.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/template.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/web-default.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/web-overlay.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/templates/root/WEB-INF/overlay.xml2
-rw-r--r--jetty-overlay-deployer/src/test/resources/home/overlays/webapps/foo/WEB-INF/web.xml2
-rw-r--r--jetty-plus/src/test/resources/web-fragment-1.xml2
-rw-r--r--jetty-plus/src/test/resources/web-fragment-2.xml2
-rw-r--r--jetty-plus/src/test/resources/web-fragment-3.xml2
-rw-r--r--jetty-plus/src/test/resources/web.xml2
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java5
-rw-r--r--jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorCloseTestBase.java3
-rw-r--r--jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java27
-rw-r--r--jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java7
-rw-r--r--jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java6
-rw-r--r--jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java7
-rw-r--r--jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java12
-rw-r--r--jetty-webapp/src/main/config/etc/webdefault.xml2
-rw-r--r--jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlAppendable.java2
-rw-r--r--jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java4
-rw-r--r--jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlAppendableTest.java2
-rw-r--r--jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java5
-rw-r--r--jetty-xml/src/test/resources/org/eclipse/jetty/xml/configure.xml2
-rw-r--r--jetty-xml/src/test/resources/org/eclipse/jetty/xml/mortbay.xml2
-rw-r--r--tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml2
-rw-r--r--tests/test-integration/src/test/resources/webdefault.xml2
-rw-r--r--tests/test-webapps/test-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml2
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml2
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.d/override-web.xml2
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml2
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/acme-taglib.tld2
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml2
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml2
-rw-r--r--tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml2
-rw-r--r--tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/web.xml2
-rw-r--r--tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml2
-rw-r--r--tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/web.xml2
-rw-r--r--tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml2
-rw-r--r--tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/web.xml2
-rw-r--r--tests/test-webapps/test-servlet-spec/test-web-fragment/src/main/resources/META-INF/web-fragment.xml2
59 files changed, 90 insertions, 86 deletions
diff --git a/examples/async-rest/async-rest-jar/src/main/resources/META-INF/web-fragment.xml b/examples/async-rest/async-rest-jar/src/main/resources/META-INF/web-fragment.xml
index 559eeafb45..db2b21bebc 100644
--- a/examples/async-rest/async-rest-jar/src/main/resources/META-INF/web-fragment.xml
+++ b/examples/async-rest/async-rest-jar/src/main/resources/META-INF/web-fragment.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<web-fragment
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
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 3fc6a3b02e..9376677fe8 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,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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">
<!--
diff --git a/jetty-ant/src/test/resources/foo/WEB-INF/acme-taglib.tld b/jetty-ant/src/test/resources/foo/WEB-INF/acme-taglib.tld
index 03adecef5e..09b70aece5 100644
--- a/jetty-ant/src/test/resources/foo/WEB-INF/acme-taglib.tld
+++ b/jetty-ant/src/test/resources/foo/WEB-INF/acme-taglib.tld
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
"http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
diff --git a/jetty-ant/src/test/resources/foo/WEB-INF/web.xml b/jetty-ant/src/test/resources/foo/WEB-INF/web.xml
index ea481e5d6f..b3b1176cac 100644
--- a/jetty-ant/src/test/resources/foo/WEB-INF/web.xml
+++ b/jetty-ant/src/test/resources/foo/WEB-INF/web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<web-app
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/jetty-deploy/src/test/resources/etc/webdefault.xml b/jetty-deploy/src/test/resources/etc/webdefault.xml
index 35a5a9b7a1..d87a7e24e1 100644
--- a/jetty-deploy/src/test/resources/etc/webdefault.xml
+++ b/jetty-deploy/src/test/resources/etc/webdefault.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- ===================================================================== -->
<!-- This file contains the default descriptor for web applications. -->
diff --git a/jetty-deploy/src/test/resources/webapps/foo.xml b/jetty-deploy/src/test/resources/webapps/foo.xml
index adf1ac2648..e7c6e9daed 100644
--- a/jetty-deploy/src/test/resources/webapps/foo.xml
+++ b/jetty-deploy/src/test/resources/webapps/foo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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">
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/foo</Set>
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 4b176a4467..53d6bfd3e7 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,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- Simple handler to redirect from old path to new -->
diff --git a/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml b/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml
index 8839eaa543..6aae6e9bf0 100644
--- a/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml
+++ b/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.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 53bbbdb3af..1ff97a49fc 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,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
<Configure class="org.eclipse.jetty.server.handler.ContextHandler">
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/webdefault.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/webdefault.xml
index 366ff798c9..1d61c93dba 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/webdefault.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/webdefault.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- ===================================================================== -->
<!-- This file contains the default descriptor for web applications. -->
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 9d5eaea456..11c70acf13 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,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
diff --git a/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=blue/WEB-INF/web-overlay.xml b/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=blue/WEB-INF/web-overlay.xml
index 8499944f90..6eee674e02 100644
--- a/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=blue/WEB-INF/web-overlay.xml
+++ b/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=blue/WEB-INF/web-overlay.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<web-app
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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 08ab9458bc..f6cfcf639c 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,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
diff --git a/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=green/WEB-INF/web-overlay.xml b/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=green/WEB-INF/web-overlay.xml
index ddda5385c6..92ed7290d7 100644
--- a/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=green/WEB-INF/web-overlay.xml
+++ b/jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=green/WEB-INF/web-overlay.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<web-app
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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 6494f38bed..6a71455dfd 100644
--- a/jetty-overlay-deployer/src/test/resources/h