This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3d96f3b2c846c440cea65de95ae0f504459c89a9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 23 22:34:25 2019 +0100
Align version specific tests with 8.5.x
---
test/org/apache/jasper/compiler/TestJspConfig.java | 2 +-
test/org/apache/jasper/compiler/TestValidator.java | 27 +++++++++++++++-
test/webapp-2.2/WEB-INF/web.xml | 4 +--
test/webapp-2.3/WEB-INF/web.xml | 4 +--
test/webapp-2.4/WEB-INF/web.xml | 4 +--
test/webapp-2.5/WEB-INF/web.xml | 4 +--
.../web.xml => webapp-3.0/WEB-INF/listener.tld} | 30 ++++++++----------
.../web.xml => webapp-3.0/WEB-INF/tags11.tld} | 36 ++++++++++++----------
.../web.xml => webapp-3.0/WEB-INF/tags12.tld} | 36 ++++++++++++----------
.../web.xml => webapp-3.0/WEB-INF/tags20.tld} | 36 ++++++++++++----------
.../web.xml => webapp-3.0/WEB-INF/tags21.tld} | 36 ++++++++++++----------
test/{webapp-2.5 => webapp-3.0}/WEB-INF/web.xml | 15 +++++----
test/{webapp => webapp-3.0}/el-as-literal.jsp | 0
test/{webapp => webapp-3.0}/tld-versions.jsp | 0
.../WEB-INF/web.xml | 4 +--
test/webapp-fragments/WEB-INF/web.xml | 4 +--
test/webapp-servletsecurity/WEB-INF/web.xml | 4 +--
test/webapp-servletsecurity2/WEB-INF/web.xml | 4 +--
.../src/main/webapp/WEB-INF/web.xml | 4 +--
19 files changed, 147 insertions(+), 107 deletions(-)
diff --git a/test/org/apache/jasper/compiler/TestJspConfig.java
b/test/org/apache/jasper/compiler/TestJspConfig.java
index 48e3833..510e5b0 100644
--- a/test/org/apache/jasper/compiler/TestJspConfig.java
+++ b/test/org/apache/jasper/compiler/TestJspConfig.java
@@ -92,7 +92,7 @@ public class TestJspConfig extends TomcatBaseTest {
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
diff --git a/test/org/apache/jasper/compiler/TestValidator.java
b/test/org/apache/jasper/compiler/TestValidator.java
index 15ec1fc..dfdda0a 100644
--- a/test/org/apache/jasper/compiler/TestValidator.java
+++ b/test/org/apache/jasper/compiler/TestValidator.java
@@ -51,6 +51,31 @@ public class TestValidator extends TomcatBaseTest {
}
@Test
+ public void testTldVersions22() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir =
+ new File("test/webapp-2.2");
+ // app dir is relative to server home
+ tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+ tomcat.start();
+
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
+ "/test/tld-versions.jsp");
+
+ String result = res.toString();
+
+ Assert.assertTrue(result.indexOf("<p>${'00-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>${'02-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>${'04-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>${'06-hello world'}</p>") > 0);
+ }
+
+ @Test
public void testTldVersions23() throws Exception {
Tomcat tomcat = getTomcatInstance();
@@ -130,7 +155,7 @@ public class TestValidator extends TomcatBaseTest {
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
diff --git a/test/webapp-2.2/WEB-INF/web.xml b/test/webapp-2.2/WEB-INF/web.xml
index cfcaccd..ad7a83d 100644
--- a/test/webapp-2.2/WEB-INF/web.xml
+++ b/test/webapp-2.2/WEB-INF/web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -29,4 +29,4 @@
specification do not change the behaviour of applications that declared an
earlier version of the specification.
</description>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/test/webapp-2.3/WEB-INF/web.xml b/test/webapp-2.3/WEB-INF/web.xml
index d385917..9e2373c 100644
--- a/test/webapp-2.3/WEB-INF/web.xml
+++ b/test/webapp-2.3/WEB-INF/web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -29,4 +29,4 @@
specification do not change the behaviour of applications that declared an
earlier version of the specification.
</description>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/test/webapp-2.4/WEB-INF/web.xml b/test/webapp-2.4/WEB-INF/web.xml
index 9d5cff6..693d7e5 100644
--- a/test/webapp-2.4/WEB-INF/web.xml
+++ b/test/webapp-2.4/WEB-INF/web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -30,4 +30,4 @@
specification do not change the behaviour of applications that declared an
earlier version of the specification.
</description>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/test/webapp-2.5/WEB-INF/web.xml b/test/webapp-2.5/WEB-INF/web.xml
index 6a3b374..c9c7635 100644
--- a/test/webapp-2.5/WEB-INF/web.xml
+++ b/test/webapp-2.5/WEB-INF/web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -30,4 +30,4 @@
specification do not change the behaviour of applications that declared an
earlier version of the specification.
</description>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
b/test/webapp-3.0/WEB-INF/listener.tld
similarity index 59%
copy from test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
copy to test/webapp-3.0/WEB-INF/listener.tld
index ce466c7..457d682 100644
--- a/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
+++ b/test/webapp-3.0/WEB-INF/listener.tld
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,20 +14,16 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
- version="3.0"
- metadata-complete="false">
+--><taglib xmlns="http://java.sun.com/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd";
+ version="2.1">
+ <tlib-version>1.0</tlib-version>
+ <short-name>listener</short-name>
+ <uri>http://tomcat.apache.org/listener</uri>
- <display-name>Tomcat Test Application</display-name>
- <description>
- Used as part of the Tomcat unit tests when a full web application is
- required.
- </description>
-
- <absolute-ordering/>
-
-</web-app>
\ No newline at end of file
+ <listener>
+ <listener-class>org.apache.catalina.core.TesterTldListener</listener-class>
+ </listener>
+</taglib>
\ No newline at end of file
diff --git a/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
b/test/webapp-3.0/WEB-INF/tags11.tld
similarity index 55%
copy from test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
copy to test/webapp-3.0/WEB-INF/tags11.tld
index ce466c7..3c7ae98 100644
--- a/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
+++ b/test/webapp-3.0/WEB-INF/tags11.tld
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,20 +14,24 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
- version="3.0"
- metadata-complete="false">
+--><!DOCTYPE taglib
+ PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
+ "http://java.sun.com/dtd/web-jsptaglibrary_1_1.dtd";>
+<taglib>
+ <tlibversion>1.0</tlibversion>
+ <jspversion>1.1</jspversion>
+ <shortname>Tags11</shortname>
+ <uri>http://tomcat.apache.org/tags11</uri>
- <display-name>Tomcat Test Application</display-name>
- <description>
- Used as part of the Tomcat unit tests when a full web application is
- required.
- </description>
+ <tag>
+ <name>Echo</name>
+ <tagclass>org.apache.jasper.compiler.TestValidator$Echo</tagclass>
+ <bodycontent>empty</bodycontent>
+ <attribute>
+ <name>echo</name>
+ <required>yes</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
- <absolute-ordering/>
-
-</web-app>
\ No newline at end of file
+</taglib>
\ No newline at end of file
diff --git a/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
b/test/webapp-3.0/WEB-INF/tags12.tld
similarity index 55%
copy from test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
copy to test/webapp-3.0/WEB-INF/tags12.tld
index ce466c7..533235b 100644
--- a/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
+++ b/test/webapp-3.0/WEB-INF/tags12.tld
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,20 +14,24 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
- version="3.0"
- metadata-complete="false">
+--><!DOCTYPE taglib
+ PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+ "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";>
+<taglib>
+ <tlib-version>1.0</tlib-version>
+ <jsp-version>1.2</jsp-version>
+ <short-name>Tags12</short-name>
+ <uri>http://tomcat.apache.org/tags12</uri>
- <display-name>Tomcat Test Application</display-name>
- <description>
- Used as part of the Tomcat unit tests when a full web application is
- required.
- </description>
+ <tag>
+ <name>Echo</name>
+ <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>echo</name>
+ <required>yes</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
- <absolute-ordering/>
-
-</web-app>
\ No newline at end of file
+</taglib>
\ No newline at end of file
diff --git a/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
b/test/webapp-3.0/WEB-INF/tags20.tld
similarity index 52%
copy from test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
copy to test/webapp-3.0/WEB-INF/tags20.tld
index ce466c7..056c484 100644
--- a/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
+++ b/test/webapp-3.0/WEB-INF/tags20.tld
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,20 +14,24 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
- version="3.0"
- metadata-complete="false">
+--><taglib xmlns="http://java.sun.com/xml/ns/j2ee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd";
+ version="2.0">
+ <tlib-version>1.0</tlib-version>
+ <short-name>Tags20</short-name>
+ <uri>http://tomcat.apache.org/tags20</uri>
- <display-name>Tomcat Test Application</display-name>
- <description>
- Used as part of the Tomcat unit tests when a full web application is
- required.
- </description>
+ <tag>
+ <name>Echo</name>
+ <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>echo</name>
+ <required>yes</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
- <absolute-ordering/>
-
-</web-app>
\ No newline at end of file
+</taglib>
\ No newline at end of file
diff --git a/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
b/test/webapp-3.0/WEB-INF/tags21.tld
similarity index 52%
copy from test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
copy to test/webapp-3.0/WEB-INF/tags21.tld
index ce466c7..4a19675 100644
--- a/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
+++ b/test/webapp-3.0/WEB-INF/tags21.tld
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,20 +14,24 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
- version="3.0"
- metadata-complete="false">
+--><taglib xmlns="http://java.sun.com/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd";
+ version="2.1">
+ <tlib-version>1.0</tlib-version>
+ <short-name>Tags21</short-name>
+ <uri>http://tomcat.apache.org/tags21</uri>
- <display-name>Tomcat Test Application</display-name>
- <description>
- Used as part of the Tomcat unit tests when a full web application is
- required.
- </description>
+ <tag>
+ <name>Echo</name>
+ <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>echo</name>
+ <required>yes</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
- <absolute-ordering/>
-
-</web-app>
\ No newline at end of file
+</taglib>
\ No newline at end of file
diff --git a/test/webapp-2.5/WEB-INF/web.xml b/test/webapp-3.0/WEB-INF/web.xml
similarity index 82%
copy from test/webapp-2.5/WEB-INF/web.xml
copy to test/webapp-3.0/WEB-INF/web.xml
index 6a3b374..3cab0cf 100644
--- a/test/webapp-2.5/WEB-INF/web.xml
+++ b/test/webapp-3.0/WEB-INF/web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -18,16 +18,19 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
- version="2.5">
- <display-name>Tomcat Servlet 2.5 Tests</display-name>
+ http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+ version="3.0"
+ metadata-complete="true">
+
+ <display-name>Tomcat Servlet 3.0 Tests</display-name>
<description>
Provides a web application used by the Tomcat unit tests to ensure that
Tomcat meets the requirements of the current JSP and Servlet specification
- for web applications that declare that they follow version 2.5 of the
- Servlet specification and version 2.1 of the JSP specification. This
+ for web applications that declare that they follow version 3.0 of the
+ Servlet specification and version 2.2 of the JSP specification. This
typically means ensuring that features introduced in later versions of the
specification do not change the behaviour of applications that declared an
earlier version of the specification.
</description>
+
</web-app>
\ No newline at end of file
diff --git a/test/webapp/el-as-literal.jsp b/test/webapp-3.0/el-as-literal.jsp
similarity index 100%
rename from test/webapp/el-as-literal.jsp
rename to test/webapp-3.0/el-as-literal.jsp
diff --git a/test/webapp/tld-versions.jsp b/test/webapp-3.0/tld-versions.jsp
similarity index 100%
rename from test/webapp/tld-versions.jsp
rename to test/webapp-3.0/tld-versions.jsp
diff --git a/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
b/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
index ce466c7..0a735190 100644
--- a/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
+++ b/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -30,4 +30,4 @@
<absolute-ordering/>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/test/webapp-fragments/WEB-INF/web.xml
b/test/webapp-fragments/WEB-INF/web.xml
index 156c906..3c2bc07 100644
--- a/test/webapp-fragments/WEB-INF/web.xml
+++ b/test/webapp-fragments/WEB-INF/web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -176,4 +176,4 @@
<lookup-name>java:comp/env/env-entry/basic</lookup-name>
</env-entry>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/test/webapp-servletsecurity/WEB-INF/web.xml
b/test/webapp-servletsecurity/WEB-INF/web.xml
index fea216c..2f08870 100644
--- a/test/webapp-servletsecurity/WEB-INF/web.xml
+++ b/test/webapp-servletsecurity/WEB-INF/web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -45,4 +45,4 @@
<url-pattern>/</url-pattern>
</servlet-mapping>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/test/webapp-servletsecurity2/WEB-INF/web.xml
b/test/webapp-servletsecurity2/WEB-INF/web.xml
index 47bf7e7..4961bf9 100644
--- a/test/webapp-servletsecurity2/WEB-INF/web.xml
+++ b/test/webapp-servletsecurity2/WEB-INF/web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -40,4 +40,4 @@
<url-pattern>/protected.jsp</url-pattern>
</web-resource-collection>
</security-constraint>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/web.xml
b/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/web.xml
index 6eb9546..944ffd5 100644
--- a/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -21,4 +21,4 @@
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
version="3.0"
metadata-complete="false">
-</web-app>
\ No newline at end of file
+</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
