This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2f5fa345668ef8beb972027b72e33ae496bd4a07 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Mar 28 08:42:47 2024 +0000 Add/update tests for the Jakarta EE 11 schema --- .../apache/tomcat/util/descriptor/web/WebXml.java | 4 +++ .../servlet/resources/TestSchemaValidation.java | 17 +++++++++- test/org/apache/jasper/TestJspC.java | 8 +++++ test/org/apache/jasper/compiler/TestJspConfig.java | 17 ++++++++++ test/org/apache/jasper/compiler/TestValidator.java | 26 +++++++++++++++ .../jasper/servlet/TestJspCServletContext.java | 12 ++++++- test/webapp-6.1/WEB-INF/tags11.tld | 37 ++++++++++++++++++++++ test/webapp-6.1/WEB-INF/tags12.tld | 37 ++++++++++++++++++++++ test/webapp-6.1/WEB-INF/tags20.tld | 37 ++++++++++++++++++++++ test/webapp-6.1/WEB-INF/tags21.tld | 37 ++++++++++++++++++++++ test/webapp-6.1/WEB-INF/tags30.tld | 37 ++++++++++++++++++++++ test/webapp-6.1/WEB-INF/tags31.tld | 37 ++++++++++++++++++++++ test/webapp-6.1/WEB-INF/tags40.tld | 37 ++++++++++++++++++++++ test/webapp-6.1/WEB-INF/web.xml | 36 +++++++++++++++++++++ test/webapp-6.1/el-as-literal.jsp | 21 ++++++++++++ test/webapp-6.1/tld-versions.jsp | 35 ++++++++++++++++++++ test/webapp/WEB-INF/web.xml | 4 +-- 17 files changed, 435 insertions(+), 4 deletions(-) diff --git a/java/org/apache/tomcat/util/descriptor/web/WebXml.java b/java/org/apache/tomcat/util/descriptor/web/WebXml.java index 47f45ced36..99dfe8890e 100644 --- a/java/org/apache/tomcat/util/descriptor/web/WebXml.java +++ b/java/org/apache/tomcat/util/descriptor/web/WebXml.java @@ -194,6 +194,10 @@ public class WebXml extends XmlEncodingBase implements DocumentProperties.Charse majorVersion = 6; minorVersion = 0; break; + case "6.1": + majorVersion = 6; + minorVersion = 1; + break; default: log.warn(sm.getString("webXml.version.unknown", version)); } diff --git a/test/jakarta/servlet/resources/TestSchemaValidation.java b/test/jakarta/servlet/resources/TestSchemaValidation.java index dd070fbc75..146ad5cbcd 100644 --- a/test/jakarta/servlet/resources/TestSchemaValidation.java +++ b/test/jakarta/servlet/resources/TestSchemaValidation.java @@ -39,7 +39,7 @@ public class TestSchemaValidation { digester.push(new WebXml()); WebXml desc = (WebXml) digester.parse( new File("test/webapp/WEB-INF/web.xml")); - Assert.assertEquals("6.0", desc.getVersion()); + Assert.assertEquals("6.1", desc.getVersion()); Assert.assertEquals(0, handler.getErrors().size()); Assert.assertEquals(0, handler.getWarnings().size()); } @@ -172,4 +172,19 @@ public class TestSchemaValidation { Assert.assertEquals(0, handler.getErrors().size()); Assert.assertEquals(0, handler.getWarnings().size()); } + + + @Test + public void testWebapp_6_1() throws Exception { + XmlErrorHandler handler = new XmlErrorHandler(); + Digester digester = DigesterFactory.newDigester( + true, true, new WebRuleSet(false), true); + digester.setErrorHandler(handler); + digester.push(new WebXml()); + WebXml desc = (WebXml) digester.parse( + new File("test/webapp-6.1/WEB-INF/web.xml")); + Assert.assertEquals("6.1", desc.getVersion()); + Assert.assertEquals(0, handler.getErrors().size()); + Assert.assertEquals(0, handler.getWarnings().size()); + } } diff --git a/test/org/apache/jasper/TestJspC.java b/test/org/apache/jasper/TestJspC.java index b544c7bf19..82ed163c74 100644 --- a/test/org/apache/jasper/TestJspC.java +++ b/test/org/apache/jasper/TestJspC.java @@ -119,6 +119,14 @@ public class TestJspC { verify(webappOut); } + @Test + public void precompileWebapp_6_1() throws IOException { + File appDir = new File("test/webapp-6.1"); + File webappOut = new File(outputDir, appDir.getName()); + precompile(appDir, webappOut); + verify(webappOut); + } + private void verify(File webappOut) { // for now, just check some expected files exist Assert.assertTrue(new File(webappOut, "generated_web.xml").exists()); diff --git a/test/org/apache/jasper/compiler/TestJspConfig.java b/test/org/apache/jasper/compiler/TestJspConfig.java index 4f9cf26cd9..2583a632f6 100644 --- a/test/org/apache/jasper/compiler/TestJspConfig.java +++ b/test/org/apache/jasper/compiler/TestJspConfig.java @@ -185,6 +185,23 @@ public class TestJspConfig extends TomcatBaseTest { Assert.assertTrue(result.indexOf("<p>00-hello world</p>") > 0); } + @Test + public void testServlet61NoEL() throws Exception { + Tomcat tomcat = getTomcatInstance(); + + File appDir = new File("test/webapp-6.1"); + // app dir is relative to server home + tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); + + tomcat.start(); + + ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/el-as-literal.jsp"); + + String result = res.toString(); + + Assert.assertTrue(result.indexOf("<p>00-hello world</p>") > 0); + } + @Test public void testErrorOnELNotFound01() throws Exception { // Defaults diff --git a/test/org/apache/jasper/compiler/TestValidator.java b/test/org/apache/jasper/compiler/TestValidator.java index aec4efc425..4cceccfef5 100644 --- a/test/org/apache/jasper/compiler/TestValidator.java +++ b/test/org/apache/jasper/compiler/TestValidator.java @@ -251,6 +251,32 @@ public class TestValidator extends TomcatBaseTest { Assert.assertTrue(result.indexOf("<p>08-hello world</p>") > 0); } + @Test + public void testTldVersions61() throws Exception { + Tomcat tomcat = getTomcatInstance(); + + File appDir = new File("test/webapp-6.1"); + // 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); + Assert.assertTrue(result.indexOf("<p>07-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>08-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>09-hello world</p>") > 0); + } + public static class Echo extends TagSupport { private static final long serialVersionUID = 1L; diff --git a/test/org/apache/jasper/servlet/TestJspCServletContext.java b/test/org/apache/jasper/servlet/TestJspCServletContext.java index cc0032e099..48b14500db 100644 --- a/test/org/apache/jasper/servlet/TestJspCServletContext.java +++ b/test/org/apache/jasper/servlet/TestJspCServletContext.java @@ -35,7 +35,7 @@ public class TestJspCServletContext { JspCServletContext context = new JspCServletContext( null, appDir.toURI().toURL(), null, false, false); Assert.assertEquals(6, context.getEffectiveMajorVersion()); - Assert.assertEquals(0, context.getEffectiveMinorVersion()); + Assert.assertEquals(1, context.getEffectiveMinorVersion()); JspConfigDescriptor jspConfigDescriptor = context.getJspConfigDescriptor(); Assert.assertTrue(jspConfigDescriptor.getTaglibs().isEmpty()); @@ -143,6 +143,16 @@ public class TestJspCServletContext { } + @Test + public void testWebapp_6_1() throws Exception { + File appDir = new File("test/webapp-6.1"); + JspCServletContext context = new JspCServletContext( + null, appDir.toURI().toURL(), null, false, false); + Assert.assertEquals(6, context.getEffectiveMajorVersion()); + Assert.assertEquals(1, context.getEffectiveMinorVersion()); + } + + @Test public void testWebresources() throws Exception { File appDir = new File("test/webresources/dir1"); diff --git a/test/webapp-6.1/WEB-INF/tags11.tld b/test/webapp-6.1/WEB-INF/tags11.tld new file mode 100644 index 0000000000..3c7ae98afe --- /dev/null +++ b/test/webapp-6.1/WEB-INF/tags11.tld @@ -0,0 +1,37 @@ +<?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 + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. +--><!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> + + <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> + +</taglib> \ No newline at end of file diff --git a/test/webapp-6.1/WEB-INF/tags12.tld b/test/webapp-6.1/WEB-INF/tags12.tld new file mode 100644 index 0000000000..533235bd7e --- /dev/null +++ b/test/webapp-6.1/WEB-INF/tags12.tld @@ -0,0 +1,37 @@ +<?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 + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. +--><!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> + + <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> + +</taglib> \ No newline at end of file diff --git a/test/webapp-6.1/WEB-INF/tags20.tld b/test/webapp-6.1/WEB-INF/tags20.tld new file mode 100644 index 0000000000..056c48423d --- /dev/null +++ b/test/webapp-6.1/WEB-INF/tags20.tld @@ -0,0 +1,37 @@ +<?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 + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. +--><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> + + <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> + +</taglib> \ No newline at end of file diff --git a/test/webapp-6.1/WEB-INF/tags21.tld b/test/webapp-6.1/WEB-INF/tags21.tld new file mode 100644 index 0000000000..4a196753ea --- /dev/null +++ b/test/webapp-6.1/WEB-INF/tags21.tld @@ -0,0 +1,37 @@ +<?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 + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. +--><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> + + <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> + +</taglib> \ No newline at end of file diff --git a/test/webapp-6.1/WEB-INF/tags30.tld b/test/webapp-6.1/WEB-INF/tags30.tld new file mode 100644 index 0000000000..76443f59ef --- /dev/null +++ b/test/webapp-6.1/WEB-INF/tags30.tld @@ -0,0 +1,37 @@ +<?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 + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. +--><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_3_0.xsd" + version="3.0"> + <tlib-version>1.0</tlib-version> + <short-name>Tags30</short-name> + <uri>http://tomcat.apache.org/tags30</uri> + + <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> + +</taglib> \ No newline at end of file diff --git a/test/webapp-6.1/WEB-INF/tags31.tld b/test/webapp-6.1/WEB-INF/tags31.tld new file mode 100644 index 0000000000..7d8ef32349 --- /dev/null +++ b/test/webapp-6.1/WEB-INF/tags31.tld @@ -0,0 +1,37 @@ +<?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 + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. +--><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_3_1.xsd" + version="3.1"> + <tlib-version>1.0</tlib-version> + <short-name>Tags31</short-name> + <uri>http://tomcat.apache.org/tags31</uri> + + <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> + +</taglib> \ No newline at end of file diff --git a/test/webapp-6.1/WEB-INF/tags40.tld b/test/webapp-6.1/WEB-INF/tags40.tld new file mode 100644 index 0000000000..12e829ee61 --- /dev/null +++ b/test/webapp-6.1/WEB-INF/tags40.tld @@ -0,0 +1,37 @@ +<?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 + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. +--><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_4_0.xsd" + version="4.0"> + <tlib-version>1.0</tlib-version> + <short-name>Tags40</short-name> + <uri>http://tomcat.apache.org/tags40</uri> + + <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> + +</taglib> \ No newline at end of file diff --git a/test/webapp-6.1/WEB-INF/web.xml b/test/webapp-6.1/WEB-INF/web.xml new file mode 100644 index 0000000000..530ee3f73a --- /dev/null +++ b/test/webapp-6.1/WEB-INF/web.xml @@ -0,0 +1,36 @@ +<?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 + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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="https://jakarta.ee/xml/ns/jakartaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee + https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd" + version="6.1" + metadata-complete="true"> + + <display-name>Tomcat Servlet 6.1 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 6.1 of the + Servlet specification and version 4.0 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-6.1/el-as-literal.jsp b/test/webapp-6.1/el-as-literal.jsp new file mode 100644 index 0000000000..f48e1143bd --- /dev/null +++ b/test/webapp-6.1/el-as-literal.jsp @@ -0,0 +1,21 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. +--%> +<html> + <body> + <p>00-${'hello world'}</p> + </body> +</html> \ No newline at end of file diff --git a/test/webapp-6.1/tld-versions.jsp b/test/webapp-6.1/tld-versions.jsp new file mode 100644 index 0000000000..4b8fa8f2c5 --- /dev/null +++ b/test/webapp-6.1/tld-versions.jsp @@ -0,0 +1,35 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. +--%> +<html><body> +<%@ taglib prefix="tags11" uri="http://tomcat.apache.org/tags11" %> +<%@ taglib prefix="tags12" uri="http://tomcat.apache.org/tags12" %> +<%@ taglib prefix="tags20" uri="http://tomcat.apache.org/tags20" %> +<%@ taglib prefix="tags21" uri="http://tomcat.apache.org/tags21" %> +<%@ taglib prefix="tags30" uri="http://tomcat.apache.org/tags30" %> +<%@ taglib prefix="tags31" uri="http://tomcat.apache.org/tags31" %> +<%@ taglib prefix="tags40" uri="http://tomcat.apache.org/tags40" %> +<tags11:Echo echo="${'00-hello world'}"/> +<tags11:Echo echo="#{'01-hello world'}"/> +<tags12:Echo echo="${'02-hello world'}"/> +<tags12:Echo echo="#{'03-hello world'}"/> +<tags20:Echo echo="${'04-hello world'}"/> +<tags20:Echo echo="#{'05-hello world'}"/> +<tags21:Echo echo="${'06-hello world'}"/> +<tags30:Echo echo="${'07-hello world'}"/> +<tags31:Echo echo="${'08-hello world'}"/> +<tags40:Echo echo="${'09-hello world'}"/> +</body></html> \ No newline at end of file diff --git a/test/webapp/WEB-INF/web.xml b/test/webapp/WEB-INF/web.xml index 43eb0f1137..8c07330535 100644 --- a/test/webapp/WEB-INF/web.xml +++ b/test/webapp/WEB-INF/web.xml @@ -18,8 +18,8 @@ <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee - https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd" - version="6.0" + https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd" + version="6.1" metadata-complete="true"> <display-name>Tomcat Test Application</display-name> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org