From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 7 Mar 2010 10:16:38 +0000 (+0000)
Subject: Rename webapp to allow tetsing with webapps with different servlet spec versions... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=8089c74228e90d3e6c976f0aecb3aabf88e249bd;p=tomcat7.0

Rename webapp to allow tetsing with webapps with different servlet spec versions in web.xml

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@919961 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/org/apache/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java
index 56e50cc79..5d704fb7e 100644
--- a/test/org/apache/el/TestELInJsp.java
+++ b/test/org/apache/el/TestELInJsp.java
@@ -33,7 +33,7 @@ public class TestELInJsp extends TomcatBaseTest {
     public void testBug36923() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp");
+        File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
         
@@ -49,7 +49,7 @@ public class TestELInJsp extends TomcatBaseTest {
     public void testBug42565() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp");
+        File appDir = new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
         
@@ -81,7 +81,7 @@ public class TestELInJsp 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());
         
@@ -100,7 +100,7 @@ public class TestELInJsp 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());
         
@@ -135,7 +135,7 @@ public class TestELInJsp 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());
         
@@ -235,7 +235,7 @@ public class TestELInJsp 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());
         
@@ -253,7 +253,7 @@ public class TestELInJsp 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());
         
@@ -269,7 +269,7 @@ public class TestELInJsp 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());
         
@@ -297,7 +297,7 @@ public class TestELInJsp 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());
         
@@ -313,7 +313,7 @@ public class TestELInJsp 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());
         
@@ -346,7 +346,7 @@ public class TestELInJsp 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());
         
@@ -373,7 +373,7 @@ public class TestELInJsp 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/TestGenerator.java b/test/org/apache/jasper/compiler/TestGenerator.java
index 30bab8411..78c5856c3 100644
--- a/test/org/apache/jasper/compiler/TestGenerator.java
+++ b/test/org/apache/jasper/compiler/TestGenerator.java
@@ -30,7 +30,7 @@ public class TestGenerator 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());
         
@@ -58,7 +58,7 @@ public class TestGenerator 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/TestJspDocumentParser.java b/test/org/apache/jasper/compiler/TestJspDocumentParser.java
index a0e87b6aa..c1c493d6f 100644
--- a/test/org/apache/jasper/compiler/TestJspDocumentParser.java
+++ b/test/org/apache/jasper/compiler/TestJspDocumentParser.java
@@ -29,7 +29,7 @@ public class TestJspDocumentParser 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());
         
@@ -50,7 +50,7 @@ public class TestJspDocumentParser 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/TestParser.java b/test/org/apache/jasper/compiler/TestParser.java
index 4db2cba6d..6c3eebdaa 100644
--- a/test/org/apache/jasper/compiler/TestParser.java
+++ b/test/org/apache/jasper/compiler/TestParser.java
@@ -29,7 +29,7 @@ public class TestParser 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());
         
@@ -49,7 +49,7 @@ public class TestParser 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());
         
@@ -94,7 +94,7 @@ public class TestParser 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/TestScriptingVariabler.java b/test/org/apache/jasper/compiler/TestScriptingVariabler.java
index 87e796031..8b372c3e4 100644
--- a/test/org/apache/jasper/compiler/TestScriptingVariabler.java
+++ b/test/org/apache/jasper/compiler/TestScriptingVariabler.java
@@ -34,7 +34,7 @@ public class TestScriptingVariabler 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());
         
@@ -76,7 +76,7 @@ public class TestScriptingVariabler 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());
         
@@ -97,7 +97,7 @@ public class TestScriptingVariabler 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 a367a646f..17fc195f7 100644
--- a/test/org/apache/jasper/compiler/TestValidator.java
+++ b/test/org/apache/jasper/compiler/TestValidator.java
@@ -29,7 +29,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-3.0/WEB-INF/bugs.tld b/test/webapp-3.0/WEB-INF/bugs.tld
new file mode 100644
index 000000000..bcbeb4db1
--- /dev/null
+++ b/test/webapp-3.0/WEB-INF/bugs.tld
@@ -0,0 +1,38 @@
+<?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>BugTags</short-name>
+  <uri>http://tomcat.apache.org/bugs</uri>
+
+  <tag>
+    <name>Bug46816a</name>
+    <tag-class>org.apache.jasper.compiler.TestScriptingVariabler$Bug48616aTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <name>Bug48616b</name>
+    <tag-class>org.apache.jasper.compiler.TestScriptingVariabler$Bug48616bTag</tag-class>
+    <tei-class>org.apache.jasper.compiler.TestScriptingVariabler$Bug48616bTei</tei-class>
+    <body-content>JSP</body-content>
+  </tag>
+</taglib>
\ No newline at end of file
diff --git a/test/webapp-3.0/WEB-INF/tags/bug42390.tag b/test/webapp-3.0/WEB-INF/tags/bug42390.tag
new file mode 100644
index 000000000..2e6840a60
--- /dev/null
+++ b/test/webapp-3.0/WEB-INF/tags/bug42390.tag
@@ -0,0 +1,18 @@
+<%--
+ 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.
+--%>
+<%@ variable name-given="X" scope="AT_BEGIN" %>
+<jsp:doBody/>
\ No newline at end of file
diff --git a/test/webapp-3.0/WEB-INF/tags/bug48668.tagx b/test/webapp-3.0/WEB-INF/tags/bug48668.tagx
new file mode 100644
index 000000000..db8587acc
--- /dev/null
+++ b/test/webapp-3.0/WEB-INF/tags/bug48668.tagx
@@ -0,0 +1,26 @@
+<?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.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+<jsp:directive.tag body-content="scriptless" />
+<jsp:directive.attribute name="expr" type="java.lang.String" rtexprvalue="true"/>
+<jsp:directive.attribute name="noexpr" type="java.lang.String" rtexprvalue="false"/>
+<jsp:directive.attribute name="fragment" fragment="true" />
+<jsp:text>${expr}${noexpr}</jsp:text>
+<jsp:invoke fragment="fragment" />
+<jsp:doBody />
+</jsp:root>
diff --git a/test/webapp-3.0/WEB-INF/tags/echo-deferred.tag b/test/webapp-3.0/WEB-INF/tags/echo-deferred.tag
new file mode 100644
index 000000000..27530fac6
--- /dev/null
+++ b/test/webapp-3.0/WEB-INF/tags/echo-deferred.tag
@@ -0,0 +1,18 @@
+<%--
+ 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.
+--%>
+<%@ tag %><%@ attribute name="echo" deferredValue="true" %><%@
+tag body-content="empty" %><p>${echo}</p>
\ No newline at end of file
diff --git a/test/webapp-3.0/WEB-INF/tags/echo-double.tag b/test/webapp-3.0/WEB-INF/tags/echo-double.tag
new file mode 100644
index 000000000..460a9d4d0
--- /dev/null
+++ b/test/webapp-3.0/WEB-INF/tags/echo-double.tag
@@ -0,0 +1,20 @@
+<%--
+ 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.
+--%>
+<%@ tag %><%@
+attribute name="echo" type="java.lang.Double"%><%@
+attribute name="index" type="java.lang.String" %><%@
+tag body-content="empty" %><p>${index}-${echo}</p>
\ No newline at end of file
diff --git a/test/webapp-3.0/WEB-INF/tags/echo-long.tag b/test/webapp-3.0/WEB-INF/tags/echo-long.tag
new file mode 100644
index 000000000..78151b7bb
--- /dev/null
+++ b/test/webapp-3.0/WEB-INF/tags/echo-long.tag
@@ -0,0 +1,20 @@
+<%--
+ 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.
+--%>
+<%@ tag %><%@
+attribute name="echo" type="java.lang.Long"%><%@
+attribute name="index" type="java.lang.String" %><%@
+tag body-content="empty" %><p>${index}-${echo}</p>
\ No newline at end of file
diff --git a/test/webapp-3.0/WEB-INF/tags/echo-noel.tag b/test/webapp-3.0/WEB-INF/tags/echo-noel.tag
new file mode 100644
index 000000000..edb174ace
--- /dev/null
+++ b/test/webapp-3.0/WEB-INF/tags/echo-noel.tag
@@ -0,0 +1,19 @@
+<%--
+ 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.
+--%>
+<%@ tag%><%@
+attribute name="echo" type="java.lang.String" rtexprvalue="false"
+%><%@ tag body-content="empty" %><p>${echo}</p>
\ No newline at end of file
diff --git a/test/webapp-3.0/WEB-INF/tags/echo.tag b/test/webapp-3.0/WEB-INF/tags/echo.tag
new file mode 100644
index 000000000..e14eb496a
--- /dev/null
+++ b/test/webapp-3.0/WEB-INF/tags/echo.tag
@@ -0,0 +1,18 @@
+<%--
+ 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.
+--%><%@ tag %><%@
+attribute name="echo" type="java.lang.String"%><%@
+tag body-content="empty" %><p>${echo}</p>
\ No newline at end of file
diff --git a/test/webapp-3.0/WEB-INF/tags/implicit.tld b/test/webapp-3.0/WEB-INF/tags/implicit.tld
new file mode 100644
index 000000000..e99820ae4
--- /dev/null
+++ b/test/webapp-3.0/WEB-INF/tags/implicit.tld
@@ -0,0 +1,23 @@
+<?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">
+</taglib>
\ No newline at end of file
diff --git a/test/webapp-3.0/WEB-INF/test.tld b/test/webapp-3.0/WEB-INF/test.tld
new file mode 100644
index 000000000..64f9324c4
--- /dev/null
+++ b/test/webapp-3.0/WEB-INF/test.tld
@@ -0,0 +1,34 @@
+<?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>TesterFunctions</short-name>
+  <uri>http://tomcat.apache.org/testerFunctions</uri>
+  
+  <function>
+    <name>trim</name>
+    <function-class>org.apache.el.TesterFunctions</function-class>
+    <function-signature>
+      java.lang.String trim(java.lang.String)
+    </function-signature>
+  </function>
+</taglib>
\ No newline at end of file
diff --git a/test/webapp-3.0/WEB-INF/web.xml b/test/webapp-3.0/WEB-INF/web.xml
new file mode 100644
index 000000000..947d4ea32
--- /dev/null
+++ b/test/webapp-3.0/WEB-INF/web.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+<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="true">  
+
+  <display-name>Tomcat Test Application</display-name>
+  <description>
+     Used as part of the Tomcat unit tests when a full web application is
+     required.
+  </description>
+</web-app>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug36923.jsp b/test/webapp-3.0/bug36923.jsp
new file mode 100644
index 000000000..a4ea00b03
--- /dev/null
+++ b/test/webapp-3.0/bug36923.jsp
@@ -0,0 +1,24 @@
+<%--
+ 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.
+--%>
+<%@ page isELIgnored="true" %>
+<html>
+  <head><title>Bug 44994 test case</title></head>
+  <body>
+    <p>00-${<%= "hello world" %>}</p>
+  </body>
+</html>
+
diff --git a/test/webapp-3.0/bug42390.jsp b/test/webapp-3.0/bug42390.jsp
new file mode 100644
index 000000000..7e4c00072
--- /dev/null
+++ b/test/webapp-3.0/bug42390.jsp
@@ -0,0 +1,18 @@
+<%--
+ 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 prefix="tags" tagdir="/WEB-INF/tags" %>
+<tags:bug42390><tags:bug42390/></tags:bug42390>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug42565.jsp b/test/webapp-3.0/bug42565.jsp
new file mode 100644
index 000000000..8aeb5392e
--- /dev/null
+++ b/test/webapp-3.0/bug42565.jsp
@@ -0,0 +1,38 @@
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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>
+  <head><title>Bug 42565 test case</title></head>
+  <body>
+    <tags:echo echo="00-${false?true:false}" />
+    <tags:echo echo="01-${false?true: false}" />
+    <tags:echo echo="02-${false?true :false}" />
+    <tags:echo echo="03-${false?true : false}" />
+    <tags:echo echo="04-${false? true:false}" />
+    <tags:echo echo="05-${false? true: false}" />
+    <tags:echo echo="06-${false? true :false}" />
+    <tags:echo echo="07-${false? true : false}" />
+    <tags:echo echo="08-${ false?true:false}" />
+    <tags:echo echo="09-${ false?true: false}" />
+    <tags:echo echo="10-${ false?true :false}" />
+    <tags:echo echo="11-${ false?true : false}" />
+    <tags:echo echo="12-${ false? true:false}" />
+    <tags:echo echo="13-${ false? true: false}" />
+    <tags:echo echo="14-${ false? true :false}" />
+    <tags:echo echo="15-${ false? true : false}" />
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug44994.jsp b/test/webapp-3.0/bug44994.jsp
new file mode 100644
index 000000000..43410d004
--- /dev/null
+++ b/test/webapp-3.0/bug44994.jsp
@@ -0,0 +1,25 @@
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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>
+  <head><title>Bug 44994 test case</title></head>
+  <body>
+    <tags:echo echo="00-${0 lt 0 ? 1 lt 0 ? 'many': 'one': 'none'}" />
+    <tags:echo echo="01-${0 lt 1 ? 1 lt 1 ? 'many': 'one': 'none'}" />
+    <tags:echo echo="02-${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}" />
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug45015a.jsp b/test/webapp-3.0/bug45015a.jsp
new file mode 100644
index 000000000..3d85ba424
--- /dev/null
+++ b/test/webapp-3.0/bug45015a.jsp
@@ -0,0 +1,32 @@
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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>
+  <head><title>Bug 45015 test case A</title></head>
+  <body>
+    <tags:echo echo="00-hello 'world'" />
+    <tags:echo echo="01-hello 'world" />
+    <tags:echo echo="02-hello world'" />
+    <tags:echo echo="03-hello world\'" />
+    <tags:echo echo="04-hello world\"" />
+    <tags:echo echo='05-hello "world"' />
+    <tags:echo echo='06-hello "world' />
+    <tags:echo echo='07-hello world"' />
+    <tags:echo echo='08-hello world\'' />
+    <tags:echo echo='09-hello world\"' />
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug45015b.jsp b/test/webapp-3.0/bug45015b.jsp
new file mode 100644
index 000000000..a032a1109
--- /dev/null
+++ b/test/webapp-3.0/bug45015b.jsp
@@ -0,0 +1,23 @@
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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>
+  <head><title>Bug 45015 test case B</title></head>
+  <body>
+    <tags:echo echo="hello "wo"rld" />
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug45427.jsp b/test/webapp-3.0/bug45427.jsp
new file mode 100644
index 000000000..41cd19ba8
--- /dev/null
+++ b/test/webapp-3.0/bug45427.jsp
@@ -0,0 +1,41 @@
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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>
+  <head><title>Bug 45427 test case</title></head>
+  <body>
+    <p>00-${'hello world'}</p>
+    <p>01-${'hello \'world'}</p>
+    <p>02-${'hello "world'}</p>
+    <p>03-${"hello world"}</p>
+    <p>04-${"hello 'world"}</p>
+    <p>05-${"hello \"world"}</p>
+
+    <tags:echo echo="06-${'hello world'}" />
+    <tags:echo echo="07-${'hello \\\'world'}" />
+    <tags:echo echo="08-${'hello \"world'}" />
+    <tags:echo echo="09-${\"hello world\"}" />
+    <tags:echo echo="10-${\"hello 'world\"}" />
+    <tags:echo echo="11-${\"hello \\\"world\"}" />
+    <tags:echo echo='12-${\'hello world\'}' />
+    <tags:echo echo='13-${\'hello \\\'world\'}' />
+    <tags:echo echo='14-${\'hello "world\'}' />
+    <tags:echo echo='15-${"hello world"}' />
+    <tags:echo echo='16-${"hello \'world"}' />
+    <tags:echo echo='17-${"hello \\\"world"}' />
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug45451.jspf b/test/webapp-3.0/bug45451.jspf
new file mode 100644
index 000000000..e4483e366
--- /dev/null
+++ b/test/webapp-3.0/bug45451.jspf
@@ -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.
+--%>
+<p>00-${1+1}</p>
+<p>01-\${1+1}</p>
+<p>02-\\${1+1}</p>
+<p>03-\\\${1+1}</p>
+<tags:echo echo="04-${1+1}" />
+<tags:echo echo="05-\${1+1}" />
+<tags:echo echo="06-\\${1+1}" />
+<tags:echo echo="07-\\\${1+1}" />
+<tags:echo echo="08-\\\\${1+1}" />
+<tags:echo echo="04-${1+1}" />
+<tags:echo echo="05-\${1+1}" />
+<tags:echo echo="06-\\${1+1}" />
+<tags:echo echo="07-\\\${1+1}" />
+<tags:echo echo="08-\\\\${1+1}" />
+<tags:echo-deferred echo="09-#{1+1}" />
+<tags:echo-deferred echo="10-\#{1+1}" />
+<tags:echo-deferred echo="11-\\#{1+1}" />
+<tags:echo-deferred echo="12-\\\#{1+1}" />
+<tags:echo-deferred echo="13-\\\\#{1+1}" />
diff --git a/test/webapp-3.0/bug45451a.jsp b/test/webapp-3.0/bug45451a.jsp
new file mode 100644
index 000000000..f3a67f4d9
--- /dev/null
+++ b/test/webapp-3.0/bug45451a.jsp
@@ -0,0 +1,26 @@
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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>
+  <head><title>Bug 45451 test case</title></head>
+  <body>
+    <tags:echo echo="00-\\\'${'hello world'}\\\'" />
+    <tags:echo echo="01-\\\'${\"hello world\"}\\\'" />
+    <tags:echo echo='02-\\\'${\'hello world\'}\\\'' />
+    <tags:echo echo='03-\\\'${"hello world"}\\\'' />
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug45451b.jsp b/test/webapp-3.0/bug45451b.jsp
new file mode 100644
index 000000000..3f3e1664b
--- /dev/null
+++ b/test/webapp-3.0/bug45451b.jsp
@@ -0,0 +1,19 @@
+<%--
+ 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.
+--%>
+<%@page isELIgnored="false" %>
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%@ include file="bug45451.jspf" %>
diff --git a/test/webapp-3.0/bug45451c.jsp b/test/webapp-3.0/bug45451c.jsp
new file mode 100644
index 000000000..38324a3aa
--- /dev/null
+++ b/test/webapp-3.0/bug45451c.jsp
@@ -0,0 +1,19 @@
+<%--
+ 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.
+--%>
+<%@page isELIgnored="true" deferredSyntaxAllowedAsLiteral="true" %>
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%@ include file="bug45451.jspf" %>
diff --git a/test/webapp-3.0/bug45451d.jspx b/test/webapp-3.0/bug45451d.jspx
new file mode 100644
index 000000000..5a0039f75
--- /dev/null
+++ b/test/webapp-3.0/bug45451d.jspx
@@ -0,0 +1,40 @@
+<!--
+  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.
+-->
+<jsp:root
+  xmlns:bug45451="urn:jsptagdir:/WEB-INF/tags/bug45451"
+  xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"
+  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >
+  <jsp:directive.page isELIgnored="false" />
+<html>
+  <body>
+    <p>00-${1+1}</p>
+    <p>01-\${1+1}</p>
+    <p>02-\\${1+1}</p>
+    <p>03-\\\${1+1}</p>
+    <tags:echo echo="04-${1+1}" />
+    <tags:echo echo="05-\${1+1}" />
+    <tags:echo echo="06-\\${1+1}" />
+    <tags:echo echo="07-\\\${1+1}" />
+    <tags:echo echo="08-\\\\${1+1}" />
+    <tags:echo-deferred echo="09-#{1+1}" />
+    <tags:echo-deferred echo="10-\#{1+1}" />
+    <tags:echo-deferred echo="11-\\#{1+1}" />
+    <tags:echo-deferred echo="12-\\\#{1+1}" />
+    <tags:echo-deferred echo="13-\\\\#{1+1}" />
+  </body>
+</html>
+</jsp:root>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug45451e.jsp b/test/webapp-3.0/bug45451e.jsp
new file mode 100644
index 000000000..b181d136c
--- /dev/null
+++ b/test/webapp-3.0/bug45451e.jsp
@@ -0,0 +1,19 @@
+<%--
+ 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.
+--%>
+<%@page deferredSyntaxAllowedAsLiteral="true" %>
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%@ include file="bug45451.jspf" %>
diff --git a/test/webapp-3.0/bug45511.jsp b/test/webapp-3.0/bug45511.jsp
new file mode 100644
index 000000000..6279eba72
--- /dev/null
+++ b/test/webapp-3.0/bug45511.jsp
@@ -0,0 +1,24 @@
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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>
+  <head><title>Bug 45511 test case</title></head>
+  <body>
+    <tags:echo echo="00-${empty(null)}" />
+    <tags:echo echo="01-${not(true)}" />
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug46381.jsp b/test/webapp-3.0/bug46381.jsp
new file mode 100644
index 000000000..629a15c43
--- /dev/null
+++ b/test/webapp-3.0/bug46381.jsp
@@ -0,0 +1,28 @@
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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>
+  <head><title>Bug 46381 test case</title></head>
+  <%
+  pageContext.setAttribute("foo","hello");
+  pageContext.setAttribute("bar","world");
+  %>
+  <body>
+    <tags:echo echo="00-${foo}${bar}" />
+    <tags:echo echo="00-${foo}${bar}${undefined}" />
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug46596.jsp b/test/webapp-3.0/bug46596.jsp
new file mode 100644
index 000000000..6da57924e
--- /dev/null
+++ b/test/webapp-3.0/bug46596.jsp
@@ -0,0 +1,25 @@
+<%@ taglib uri="http://tomcat.apache.org/testerFunctions" prefix="fn" %>
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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>
+  <head><title>Bug 46596 test case</title></head>
+  <body>
+    <tags:echo echo="${fn:trim
+                              ('{OK}')}"/>
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug47331.jsp b/test/webapp-3.0/bug47331.jsp
new file mode 100644
index 000000000..a174dc3c1
--- /dev/null
+++ b/test/webapp-3.0/bug47331.jsp
@@ -0,0 +1,23 @@
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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>
+  <head><title>Bug 47331 test case</title></head>
+  <body>
+    <p>This is a #{'test'}</p>
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug47413.jsp b/test/webapp-3.0/bug47413.jsp
new file mode 100644
index 000000000..adfea077b
--- /dev/null
+++ b/test/webapp-3.0/bug47413.jsp
@@ -0,0 +1,51 @@
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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.
+--%>
+<jsp:useBean id="values" class="jsp2.examples.ValuesBean" />
+<html>
+  <head><title>Bug 47413 test case</title></head>
+  <body>
+    <jsp:setProperty name="values" property="string" value="${'hello'} wo${'rld'}"/>
+    <p>00-${values.string}</p>
+    <tags:echo echo="01-${'hello'} wo${'rld'}"/>
+
+    <jsp:setProperty name="values" property="double" value="${1+2}.${220}"/>
+    <p>02-${values.double}</p>
+    <tags:echo-double index="03" echo="${1+2}.${220}"/>
+    
+    <jsp:setProperty name="values" property="long" value="000${1}${7}"/>
+    <p>04-${values.long}</p>
+    <tags:echo-long index="05" echo="000${1}${7}"/>
+    
+    <jsp:setProperty name="values" property="string"
+                     value="${undefinedFoo}hello world${undefinedBar}"/>
+    <p>06-${values.string}</p>
+    <tags:echo echo="${undefinedFoo}07-hello world${undefinedBar}"/>
+
+    <jsp:setProperty name="values" property="double"
+                     value="${undefinedFoo}${undefinedBar}"/>
+    <p>08-${values.double}</p>
+    <tags:echo-double index="09" echo="${undefinedFoo}${undefinedBar}"/>
+
+    <jsp:setProperty name="values" property="long"
+                     value="${undefinedFoo}${undefinedBar}"/>
+    <p>10-${values.long}</p>
+    <tags:echo-long index="11" echo="${undefinedFoo}${undefinedBar}"/>
+
+  </body>
+</html>
+
diff --git a/test/webapp-3.0/bug47977.jspx b/test/webapp-3.0/bug47977.jspx
new file mode 100644
index 000000000..082e8f166
--- /dev/null
+++ b/test/webapp-3.0/bug47977.jspx
@@ -0,0 +1,26 @@
+<!--
+  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.
+-->
+<jsp:root
+  xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"
+  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >
+  <jsp:directive.page isELIgnored="false" />
+<html>
+  <body>
+    <tags:echo echo="00-Hello World">xxx</tags:echo>
+  </body>
+</html>
+</jsp:root>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug48112.jsp b/test/webapp-3.0/bug48112.jsp
new file mode 100644
index 000000000..356e680f4
--- /dev/null
+++ b/test/webapp-3.0/bug48112.jsp
@@ -0,0 +1,24 @@
+<%@ taglib uri="http://tomcat.apache.org/testerFunctions" prefix="fn" %>
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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>
+  <head><title>Bug 48112 test case</title></head>
+  <body>
+    <tags:echo echo="${fn:trim('{OK}')}"/>
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug48616.jsp b/test/webapp-3.0/bug48616.jsp
new file mode 100644
index 000000000..efc77cb58
--- /dev/null
+++ b/test/webapp-3.0/bug48616.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.
+--%>
+<%@ taglib prefix="bugs" uri="http://tomcat.apache.org/bugs" %>
+<bugs:Bug48616b />
+<bugs:Bug46816a>
+  <bugs:Bug48616b />
+</bugs:Bug46816a>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug48616b.jsp b/test/webapp-3.0/bug48616b.jsp
new file mode 100644
index 000000000..31476ce6b
--- /dev/null
+++ b/test/webapp-3.0/bug48616b.jsp
@@ -0,0 +1,28 @@
+<%--
+ 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 prefix="bugs" uri="http://tomcat.apache.org/bugs" %>
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+  Tries to place the classic tag that defines a variable
+  into a simple tag
+--%>
+<bugs:Bug48616b />
+<tags:bug42390>
+  <bugs:Bug46816a>
+    <bugs:Bug48616b />
+  </bugs:Bug46816a>
+</tags:bug42390>
diff --git a/test/webapp-3.0/bug48627.jsp b/test/webapp-3.0/bug48627.jsp
new file mode 100644
index 000000000..54a79fac4
--- /dev/null
+++ b/test/webapp-3.0/bug48627.jsp
@@ -0,0 +1,24 @@
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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>
+  <head><title>Bug 46596 test case</title></head>
+  <body>
+    <tags:echo-noel echo="00-\\"/>
+    <tags:echo echo="01-\\"/>
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp-3.0/bug48668a.jsp b/test/webapp-3.0/bug48668a.jsp
new file mode 100644
index 000000000..dd8bb7c03
--- /dev/null
+++ b/test/webapp-3.0/bug48668a.jsp
@@ -0,0 +1,60 @@
+<%--
+ 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.
+--%>
+<%@ page isELIgnored="true" %>
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<html>
+  <head><title>Bug 48668a test case</title></head>
+  <body>
+    <p><tags:echo echo="00-Hello world" />#{foo.bar}</p>
+    <p><tags:echo echo="01-Hello world" />${foo.bar}</p>
+
+    <p>10-<tags:bug48668 expr="Hello ${'foo.bar}" /></p>
+    <p>11-Hello <tags:bug48668 expr="${'foo.bar}" /></p>
+    <p>12-<tags:bug48668 expr="Hello #{'foo.bar}" /></p>
+    <p>13-Hello <tags:bug48668 expr="#{'foo.bar}" /></p>
+
+    <p>14-<tags:bug48668 expr="Hello ${'foo" />}</p>
+    <p>15-Hello <tags:bug48668 expr="${'foo" />}</p>
+    <p>16-<tags:bug48668 expr="Hello #{'foo" />}</p>
+    <p>17-Hello <tags:bug48668 expr="#{'foo" />}</p>
+
+    <p>18-<tags:bug48668 ><jsp:attribute name="expr">Hello ${'foo.bar}</jsp:attribute></tags:bug48668></p>
+    <p>19-Hello <tags:bug48668 ><jsp:attribute name="expr">${'foo.bar}</jsp:attribute></tags:bug48668></p>
+    <p>20-<tags:bug48668 ><jsp:attribute name="expr">Hello #{'foo.bar}</jsp:attribute></tags:bug48668></p>
+    <p>21-Hello <tags:bug48668 ><jsp:attribute name="expr">#{'foo.bar}</jsp:attribute></tags:bug48668></p>
+
+    <p>30-<tags:bug48668 noexpr="Hello ${'foo}"/></p>
+    <p>31-Hello <tags:bug48668 noexpr="${'foo}"/></p>
+    <p>32-<tags:bug48668 noexpr="Hello #{'foo}"/></p>
+    <p>33-Hello <tags:bug48668 noexpr="#{'foo}"/></p>
+    <p>34-<tags:bug48668><jsp:attribute name="noexpr">Hello ${'foo}</jsp:attribute></tags:bug48668></p>
+    <p>35-Hello <tags:bug48668><jsp:attribute name="noexpr">${'foo}</jsp:attribute></tags:bug48668></p>
+    <p>36-<tags:bug48668><jsp:attribute name="noexpr">Hello #{'foo}</jsp:attribute></tags:bug48668></p>
+    <p>37-Hello <tags:bug48668><jsp:attribute name="noexpr">#{'foo}</jsp:attribute></tags:bug48668></p>
+
+    <p>40-<tags:bug48668><jsp:attribute name="fragment">Hello ${'foo}</jsp:attribute></tags:bug48668></p>
+    <p>41-Hello <tags:bug48668><jsp:attribute name="fragment">${'foo}</jsp:attribute></tags:bug48668></p>
+    <p>42-<tags:bug48668><jsp:attribute name="fragment">Hello #{'foo}</jsp:attribute></tags:bug48668></p>
+    <p>43-Hello <tags:bug48668><jsp:attribute name="fragment">#{'foo}</jsp:attribute></tags:bug48668></p>
+
+    <p>50-<tags:bug48668>Hello ${'foo}</tags:bug48668></p>
+    <p>51-Hello <tags:bug48668>${'foo}</tags:bug48668></p>
+    <p>52-<tags:bug48668>Hello #{'foo}</tags:bug48668></p>
+    <p>53-Hello <tags:bug48668>#{'foo}</tags:bug48668></p>
+  </body>
+</html>
+
diff --git a/test/webapp-3.0/bug48668b.jsp b/test/webapp-3.0/bug48668b.jsp
new file mode 100644
index 000000000..ebdb58b63
--- /dev/null
+++ b/test/webapp-3.0/bug48668b.jsp
@@ -0,0 +1,26 @@
+<%--
+ 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.
+--%>
+<%@ page deferredSyntaxAllowedAsLiteral="true" %>
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<html>
+  <head><title>Bug 48668b test case</title></head>
+  <body>
+    <p><tags:echo echo="00-Hello world" />#{foo.bar}</p>
+    <p><tags:echo echo="01-Hello world" />#{foo${1 + 1}</p>
+  </body>
+</html>
+
diff --git a/test/webapp-3.0/bug48827.jspx b/test/webapp-3.0/bug48827.jspx
new file mode 100644
index 000000000..a6c760ea0
--- /dev/null
+++ b/test/webapp-3.0/bug48827.jspx
@@ -0,0 +1,30 @@
+<!--
+  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.
+-->
+<jsp:root
+  xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"
+  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >
+  <jsp:directive.page isELIgnored="false" />
+<html>
+  <body>
+    <tags:echo>
+      <jsp:attribute name="echo">00-Hello World</jsp:attribute>
+    </tags:echo>
+    <tags:echo echo="01-Hello World"></tags:echo>
+    <tags:echo echo="02-Hello World"> </tags:echo>
+  </body>
+</html>
+</jsp:root>
\ No newline at end of file
diff --git a/test/webapp-3.0/el-method.jsp b/test/webapp-3.0/el-method.jsp
new file mode 100644
index 000000000..a7c9d62c0
--- /dev/null
+++ b/test/webapp-3.0/el-method.jsp
@@ -0,0 +1,35 @@
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%@ page import="org.apache.el.TesterBeanA" %>
+<%@ page import="org.apache.el.TesterBeanB" %>
+<%--
+ 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>
+  <head><title>EL method test cases</title></head>
+  <body>
+    <%
+    TesterBeanA beanA = new TesterBeanA();
+    TesterBeanB beanB = new TesterBeanB();
+    beanB.setName("Tomcat");
+    beanA.setBean(beanB);
+    pageContext.setAttribute("testBeanA", beanA);
+    pageContext.setAttribute("testBeanB", beanB);
+    %>
+    <tags:echo echo="00-${testBeanA[\"bean\"].sayHello('JUnit')}" />
+    <tags:echo echo="01-${testBeanA.bean.sayHello('JUnit')}" />
+    <tags:echo echo="02-${testBeanB.sayHello('JUnit')}" />
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp-3.0/el-misc.jsp b/test/webapp-3.0/el-misc.jsp
new file mode 100644
index 000000000..053252bac
--- /dev/null
+++ b/test/webapp-3.0/el-misc.jsp
@@ -0,0 +1,40 @@
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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>
+  <head><title>Misc EL test cases</title></head>
+  <body>
+    <p>00-\\\"\${'hello world'}</p>
+    <p>01-\\\"\\${'hello world'}</p>
+    <tags:echo echo="02-\\\"\${'hello world'}" />
+    <tags:echo echo="03-\\\"\\${'hello world'}" />
+    <tags:echo echo="${'2'}az-04" />
+    <tags:echo echo="05-a${'2'}z" />
+    <tags:echo echo="06-az${'2'}" />
+    <tags:echo echo="${\"2\"}az-07" />
+    <tags:echo echo="08-a${\"2\"}z" />
+    <tags:echo echo="09-az${\"2\"}" />
+    <tags:echo echo="10-\${'foo'}${'bar'}" />
+    <tags:echo echo="11-${\"\\\"}\"}" />
+    <tags:echo echo="12-${'foo'}\\${'bar'}\\${'baz'}" />
+    <tags:echo echo="13-${'foo'}\\${\"bar\"}\\${'baz'}" />
+    <tags:echo echo="14-${\"foo\"}\\${'bar'}\\${\"baz\"}" />
+    <tags:echo echo='15-${\'foo\'}\\${"bar"}\\${\'baz\'}' />
+    <tags:echo echo='16-${"foo"}\\${\'bar\'}\\${"baz"}' />
+    <tags:echo echo='17-${"foo"}\\${&apos;bar&apos;}\\${&quot;baz&quot;}' />
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp-3.0/script-expr.jsp b/test/webapp-3.0/script-expr.jsp
new file mode 100644
index 000000000..ce4f29157
--- /dev/null
+++ b/test/webapp-3.0/script-expr.jsp
@@ -0,0 +1,34 @@
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+<%--
+ 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>
+  <head><title>Scripting expression test cases</title></head>
+  <body>
+    <p><%= "00-hello world" %></p>
+    <p><%= "01-hello \"world" %></p>
+    <p><%= "02-hello \\\"world" %></p>
+    <p><%= "03-hello ${world" %></p>
+    <p><%= "04-hello \\${world" %></p>
+    <tags:echo echo="<%= "05-hello world" %>" />
+    <tags:echo echo="<%= "06-hello \\\"world" %>" />
+    <tags:echo echo="<%= "07-hello \\\\\\\"world" %>" />
+    <tags:echo echo="<%= "08-hello ${world" %>" />
+    <tags:echo echo="<%= "09-hello \\\\${world" %>" />
+    <tags:echo echo="10-hello <\% world" />
+    <tags:echo echo="11-hello %\> world" />
+  </body>
+</html>
\ No newline at end of file
diff --git a/test/webapp/WEB-INF/bugs.tld b/test/webapp/WEB-INF/bugs.tld
deleted file mode 100644
index bcbeb4db1..000000000
--- a/test/webapp/WEB-INF/bugs.tld
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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>BugTags</short-name>
-  <uri>http://tomcat.apache.org/bugs</uri>
-
-  <tag>
-    <name>Bug46816a</name>
-    <tag-class>org.apache.jasper.compiler.TestScriptingVariabler$Bug48616aTag</tag-class>
-    <body-content>JSP</body-content>
-  </tag>
-
-  <tag>
-    <name>Bug48616b</name>
-    <tag-class>org.apache.jasper.compiler.TestScriptingVariabler$Bug48616bTag</tag-class>
-    <tei-class>org.apache.jasper.compiler.TestScriptingVariabler$Bug48616bTei</tei-class>
-    <body-content>JSP</body-content>
-  </tag>
-</taglib>
\ No newline at end of file
diff --git a/test/webapp/WEB-INF/tags/bug42390.tag b/test/webapp/WEB-INF/tags/bug42390.tag
deleted file mode 100644
index 2e6840a60..000000000
--- a/test/webapp/WEB-INF/tags/bug42390.tag
+++ /dev/null
@@ -1,18 +0,0 @@
-<%--
- 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.
---%>
-<%@ variable name-given="X" scope="AT_BEGIN" %>
-<jsp:doBody/>
\ No newline at end of file
diff --git a/test/webapp/WEB-INF/tags/bug48668.tagx b/test/webapp/WEB-INF/tags/bug48668.tagx
deleted file mode 100644
index db8587acc..000000000
--- a/test/webapp/WEB-INF/tags/bug48668.tagx
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-<jsp:directive.tag body-content="scriptless" />
-<jsp:directive.attribute name="expr" type="java.lang.String" rtexprvalue="true"/>
-<jsp:directive.attribute name="noexpr" type="java.lang.String" rtexprvalue="false"/>
-<jsp:directive.attribute name="fragment" fragment="true" />
-<jsp:text>${expr}${noexpr}</jsp:text>
-<jsp:invoke fragment="fragment" />
-<jsp:doBody />
-</jsp:root>
diff --git a/test/webapp/WEB-INF/tags/echo-deferred.tag b/test/webapp/WEB-INF/tags/echo-deferred.tag
deleted file mode 100644
index 27530fac6..000000000
--- a/test/webapp/WEB-INF/tags/echo-deferred.tag
+++ /dev/null
@@ -1,18 +0,0 @@
-<%--
- 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.
---%>
-<%@ tag %><%@ attribute name="echo" deferredValue="true" %><%@
-tag body-content="empty" %><p>${echo}</p>
\ No newline at end of file
diff --git a/test/webapp/WEB-INF/tags/echo-double.tag b/test/webapp/WEB-INF/tags/echo-double.tag
deleted file mode 100644
index 460a9d4d0..000000000
--- a/test/webapp/WEB-INF/tags/echo-double.tag
+++ /dev/null
@@ -1,20 +0,0 @@
-<%--
- 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.
---%>
-<%@ tag %><%@
-attribute name="echo" type="java.lang.Double"%><%@
-attribute name="index" type="java.lang.String" %><%@
-tag body-content="empty" %><p>${index}-${echo}</p>
\ No newline at end of file
diff --git a/test/webapp/WEB-INF/tags/echo-long.tag b/test/webapp/WEB-INF/tags/echo-long.tag
deleted file mode 100644
index 78151b7bb..000000000
--- a/test/webapp/WEB-INF/tags/echo-long.tag
+++ /dev/null
@@ -1,20 +0,0 @@
-<%--
- 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.
---%>
-<%@ tag %><%@
-attribute name="echo" type="java.lang.Long"%><%@
-attribute name="index" type="java.lang.String" %><%@
-tag body-content="empty" %><p>${index}-${echo}</p>
\ No newline at end of file
diff --git a/test/webapp/WEB-INF/tags/echo-noel.tag b/test/webapp/WEB-INF/tags/echo-noel.tag
deleted file mode 100644
index edb174ace..000000000
--- a/test/webapp/WEB-INF/tags/echo-noel.tag
+++ /dev/null
@@ -1,19 +0,0 @@
-<%--
- 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.
---%>
-<%@ tag%><%@
-attribute name="echo" type="java.lang.String" rtexprvalue="false"
-%><%@ tag body-content="empty" %><p>${echo}</p>
\ No newline at end of file
diff --git a/test/webapp/WEB-INF/tags/echo.tag b/test/webapp/WEB-INF/tags/echo.tag
deleted file mode 100644
index e14eb496a..000000000
--- a/test/webapp/WEB-INF/tags/echo.tag
+++ /dev/null
@@ -1,18 +0,0 @@
-<%--
- 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.
---%><%@ tag %><%@
-attribute name="echo" type="java.lang.String"%><%@
-tag body-content="empty" %><p>${echo}</p>
\ No newline at end of file
diff --git a/test/webapp/WEB-INF/tags/implicit.tld b/test/webapp/WEB-INF/tags/implicit.tld
deleted file mode 100644
index e99820ae4..000000000
--- a/test/webapp/WEB-INF/tags/implicit.tld
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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">
-</taglib>
\ No newline at end of file
diff --git a/test/webapp/WEB-INF/test.tld b/test/webapp/WEB-INF/test.tld
deleted file mode 100644
index 64f9324c4..000000000
--- a/test/webapp/WEB-INF/test.tld
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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>TesterFunctions</short-name>
-  <uri>http://tomcat.apache.org/testerFunctions</uri>
-  
-  <function>
-    <name>trim</name>
-    <function-class>org.apache.el.TesterFunctions</function-class>
-    <function-signature>
-      java.lang.String trim(java.lang.String)
-    </function-signature>
-  </function>
-</taglib>
\ No newline at end of file
diff --git a/test/webapp/WEB-INF/web.xml b/test/webapp/WEB-INF/web.xml
deleted file mode 100644
index 947d4ea32..000000000
--- a/test/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.
--->
-<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="true">  
-
-  <display-name>Tomcat Test Application</display-name>
-  <description>
-     Used as part of the Tomcat unit tests when a full web application is
-     required.
-  </description>
-</web-app>
\ No newline at end of file
diff --git a/test/webapp/bug36923.jsp b/test/webapp/bug36923.jsp
deleted file mode 100644
index a4ea00b03..000000000
--- a/test/webapp/bug36923.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%--
- 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.
---%>
-<%@ page isELIgnored="true" %>
-<html>
-  <head><title>Bug 44994 test case</title></head>
-  <body>
-    <p>00-${<%= "hello world" %>}</p>
-  </body>
-</html>
-
diff --git a/test/webapp/bug42390.jsp b/test/webapp/bug42390.jsp
deleted file mode 100644
index 7e4c00072..000000000
--- a/test/webapp/bug42390.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%--
- 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 prefix="tags" tagdir="/WEB-INF/tags" %>
-<tags:bug42390><tags:bug42390/></tags:bug42390>
\ No newline at end of file
diff --git a/test/webapp/bug42565.jsp b/test/webapp/bug42565.jsp
deleted file mode 100644
index 8aeb5392e..000000000
--- a/test/webapp/bug42565.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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>
-  <head><title>Bug 42565 test case</title></head>
-  <body>
-    <tags:echo echo="00-${false?true:false}" />
-    <tags:echo echo="01-${false?true: false}" />
-    <tags:echo echo="02-${false?true :false}" />
-    <tags:echo echo="03-${false?true : false}" />
-    <tags:echo echo="04-${false? true:false}" />
-    <tags:echo echo="05-${false? true: false}" />
-    <tags:echo echo="06-${false? true :false}" />
-    <tags:echo echo="07-${false? true : false}" />
-    <tags:echo echo="08-${ false?true:false}" />
-    <tags:echo echo="09-${ false?true: false}" />
-    <tags:echo echo="10-${ false?true :false}" />
-    <tags:echo echo="11-${ false?true : false}" />
-    <tags:echo echo="12-${ false? true:false}" />
-    <tags:echo echo="13-${ false? true: false}" />
-    <tags:echo echo="14-${ false? true :false}" />
-    <tags:echo echo="15-${ false? true : false}" />
-  </body>
-</html>
\ No newline at end of file
diff --git a/test/webapp/bug44994.jsp b/test/webapp/bug44994.jsp
deleted file mode 100644
index 43410d004..000000000
--- a/test/webapp/bug44994.jsp
+++ /dev/null
@@ -1,25 +0,0 @@
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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>
-  <head><title>Bug 44994 test case</title></head>
-  <body>
-    <tags:echo echo="00-${0 lt 0 ? 1 lt 0 ? 'many': 'one': 'none'}" />
-    <tags:echo echo="01-${0 lt 1 ? 1 lt 1 ? 'many': 'one': 'none'}" />
-    <tags:echo echo="02-${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}" />
-  </body>
-</html>
\ No newline at end of file
diff --git a/test/webapp/bug45015a.jsp b/test/webapp/bug45015a.jsp
deleted file mode 100644
index 3d85ba424..000000000
--- a/test/webapp/bug45015a.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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>
-  <head><title>Bug 45015 test case A</title></head>
-  <body>
-    <tags:echo echo="00-hello 'world'" />
-    <tags:echo echo="01-hello 'world" />
-    <tags:echo echo="02-hello world'" />
-    <tags:echo echo="03-hello world\'" />
-    <tags:echo echo="04-hello world\"" />
-    <tags:echo echo='05-hello "world"' />
-    <tags:echo echo='06-hello "world' />
-    <tags:echo echo='07-hello world"' />
-    <tags:echo echo='08-hello world\'' />
-    <tags:echo echo='09-hello world\"' />
-  </body>
-</html>
\ No newline at end of file
diff --git a/test/webapp/bug45015b.jsp b/test/webapp/bug45015b.jsp
deleted file mode 100644
index a032a1109..000000000
--- a/test/webapp/bug45015b.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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>
-  <head><title>Bug 45015 test case B</title></head>
-  <body>
-    <tags:echo echo="hello "wo"rld" />
-  </body>
-</html>
\ No newline at end of file
diff --git a/test/webapp/bug45427.jsp b/test/webapp/bug45427.jsp
deleted file mode 100644
index 41cd19ba8..000000000
--- a/test/webapp/bug45427.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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>
-  <head><title>Bug 45427 test case</title></head>
-  <body>
-    <p>00-${'hello world'}</p>
-    <p>01-${'hello \'world'}</p>
-    <p>02-${'hello "world'}</p>
-    <p>03-${"hello world"}</p>
-    <p>04-${"hello 'world"}</p>
-    <p>05-${"hello \"world"}</p>
-
-    <tags:echo echo="06-${'hello world'}" />
-    <tags:echo echo="07-${'hello \\\'world'}" />
-    <tags:echo echo="08-${'hello \"world'}" />
-    <tags:echo echo="09-${\"hello world\"}" />
-    <tags:echo echo="10-${\"hello 'world\"}" />
-    <tags:echo echo="11-${\"hello \\\"world\"}" />
-    <tags:echo echo='12-${\'hello world\'}' />
-    <tags:echo echo='13-${\'hello \\\'world\'}' />
-    <tags:echo echo='14-${\'hello "world\'}' />
-    <tags:echo echo='15-${"hello world"}' />
-    <tags:echo echo='16-${"hello \'world"}' />
-    <tags:echo echo='17-${"hello \\\"world"}' />
-  </body>
-</html>
\ No newline at end of file
diff --git a/test/webapp/bug45451.jspf b/test/webapp/bug45451.jspf
deleted file mode 100644
index e4483e366..000000000
--- a/test/webapp/bug45451.jspf
+++ /dev/null
@@ -1,35 +0,0 @@
-<%--
- 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.
---%>
-<p>00-${1+1}</p>
-<p>01-\${1+1}</p>
-<p>02-\\${1+1}</p>
-<p>03-\\\${1+1}</p>
-<tags:echo echo="04-${1+1}" />
-<tags:echo echo="05-\${1+1}" />
-<tags:echo echo="06-\\${1+1}" />
-<tags:echo echo="07-\\\${1+1}" />
-<tags:echo echo="08-\\\\${1+1}" />
-<tags:echo echo="04-${1+1}" />
-<tags:echo echo="05-\${1+1}" />
-<tags:echo echo="06-\\${1+1}" />
-<tags:echo echo="07-\\\${1+1}" />
-<tags:echo echo="08-\\\\${1+1}" />
-<tags:echo-deferred echo="09-#{1+1}" />
-<tags:echo-deferred echo="10-\#{1+1}" />
-<tags:echo-deferred echo="11-\\#{1+1}" />
-<tags:echo-deferred echo="12-\\\#{1+1}" />
-<tags:echo-deferred echo="13-\\\\#{1+1}" />
diff --git a/test/webapp/bug45451a.jsp b/test/webapp/bug45451a.jsp
deleted file mode 100644
index f3a67f4d9..000000000
--- a/test/webapp/bug45451a.jsp
+++ /dev/null
@@ -1,26 +0,0 @@
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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>
-  <head><title>Bug 45451 test case</title></head>
-  <body>
-    <tags:echo echo="00-\\\'${'hello world'}\\\'" />
-    <tags:echo echo="01-\\\'${\"hello world\"}\\\'" />
-    <tags:echo echo='02-\\\'${\'hello world\'}\\\'' />
-    <tags:echo echo='03-\\\'${"hello world"}\\\'' />
-  </body>
-</html>
\ No newline at end of file
diff --git a/test/webapp/bug45451b.jsp b/test/webapp/bug45451b.jsp
deleted file mode 100644
index 3f3e1664b..000000000
--- a/test/webapp/bug45451b.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%--
- 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.
---%>
-<%@page isELIgnored="false" %>
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%@ include file="bug45451.jspf" %>
diff --git a/test/webapp/bug45451c.jsp b/test/webapp/bug45451c.jsp
deleted file mode 100644
index 38324a3aa..000000000
--- a/test/webapp/bug45451c.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%--
- 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.
---%>
-<%@page isELIgnored="true" deferredSyntaxAllowedAsLiteral="true" %>
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%@ include file="bug45451.jspf" %>
diff --git a/test/webapp/bug45451d.jspx b/test/webapp/bug45451d.jspx
deleted file mode 100644
index 5a0039f75..000000000
--- a/test/webapp/bug45451d.jspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-  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.
--->
-<jsp:root
-  xmlns:bug45451="urn:jsptagdir:/WEB-INF/tags/bug45451"
-  xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"
-  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >
-  <jsp:directive.page isELIgnored="false" />
-<html>
-  <body>
-    <p>00-${1+1}</p>
-    <p>01-\${1+1}</p>
-    <p>02-\\${1+1}</p>
-    <p>03-\\\${1+1}</p>
-    <tags:echo echo="04-${1+1}" />
-    <tags:echo echo="05-\${1+1}" />
-    <tags:echo echo="06-\\${1+1}" />
-    <tags:echo echo="07-\\\${1+1}" />
-    <tags:echo echo="08-\\\\${1+1}" />
-    <tags:echo-deferred echo="09-#{1+1}" />
-    <tags:echo-deferred echo="10-\#{1+1}" />
-    <tags:echo-deferred echo="11-\\#{1+1}" />
-    <tags:echo-deferred echo="12-\\\#{1+1}" />
-    <tags:echo-deferred echo="13-\\\\#{1+1}" />
-  </body>
-</html>
-</jsp:root>
\ No newline at end of file
diff --git a/test/webapp/bug45451e.jsp b/test/webapp/bug45451e.jsp
deleted file mode 100644
index b181d136c..000000000
--- a/test/webapp/bug45451e.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%--
- 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.
---%>
-<%@page deferredSyntaxAllowedAsLiteral="true" %>
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%@ include file="bug45451.jspf" %>
diff --git a/test/webapp/bug45511.jsp b/test/webapp/bug45511.jsp
deleted file mode 100644
index 6279eba72..000000000
--- a/test/webapp/bug45511.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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>
-  <head><title>Bug 45511 test case</title></head>
-  <body>
-    <tags:echo echo="00-${empty(null)}" />
-    <tags:echo echo="01-${not(true)}" />
-  </body>
-</html>
\ No newline at end of file
diff --git a/test/webapp/bug46381.jsp b/test/webapp/bug46381.jsp
deleted file mode 100644
index 629a15c43..000000000
--- a/test/webapp/bug46381.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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>
-  <head><title>Bug 46381 test case</title></head>
-  <%
-  pageContext.setAttribute("foo","hello");
-  pageContext.setAttribute("bar","world");
-  %>
-  <body>
-    <tags:echo echo="00-${foo}${bar}" />
-    <tags:echo echo="00-${foo}${bar}${undefined}" />
-  </body>
-</html>
\ No newline at end of file
diff --git a/test/webapp/bug46596.jsp b/test/webapp/bug46596.jsp
deleted file mode 100644
index 6da57924e..000000000
--- a/test/webapp/bug46596.jsp
+++ /dev/null
@@ -1,25 +0,0 @@
-<%@ taglib uri="http://tomcat.apache.org/testerFunctions" prefix="fn" %>
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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>
-  <head><title>Bug 46596 test case</title></head>
-  <body>
-    <tags:echo echo="${fn:trim
-                              ('{OK}')}"/>
-  </body>
-</html>
\ No newline at end of file
diff --git a/test/webapp/bug47331.jsp b/test/webapp/bug47331.jsp
deleted file mode 100644
index a174dc3c1..000000000
--- a/test/webapp/bug47331.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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>
-  <head><title>Bug 47331 test case</title></head>
-  <body>
-    <p>This is a #{'test'}</p>
-  </body>
-</html>
\ No newline at end of file
diff --git a/test/webapp/bug47413.jsp b/test/webapp/bug47413.jsp
deleted file mode 100644
index adfea077b..000000000
--- a/test/webapp/bug47413.jsp
+++ /dev/null
@@ -1,51 +0,0 @@
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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.
---%>
-<jsp:useBean id="values" class="jsp2.examples.ValuesBean" />
-<html>
-  <head><title>Bug 47413 test case</title></head>
-  <body>
-    <jsp:setProperty name="values" property="string" value="${'hello'} wo${'rld'}"/>
-    <p>00-${values.string}</p>
-    <tags:echo echo="01-${'hello'} wo${'rld'}"/>
-
-    <jsp:setProperty name="values" property="double" value="${1+2}.${220}"/>
-    <p>02-${values.double}</p>
-    <tags:echo-double index="03" echo="${1+2}.${220}"/>
-    
-    <jsp:setProperty name="values" property="long" value="000${1}${7}"/>
-    <p>04-${values.long}</p>
-    <tags:echo-long index="05" echo="000${1}${7}"/>
-    
-    <jsp:setProperty name="values" property="string"
-                     value="${undefinedFoo}hello world${undefinedBar}"/>
-    <p>06-${values.string}</p>
-    <tags:echo echo="${undefinedFoo}07-hello world${undefinedBar}"/>
-
-    <jsp:setProperty name="values" property="double"
-                     value="${undefinedFoo}${undefinedBar}"/>
-    <p>08-${values.double}</p>
-    <tags:echo-double index="09" echo="${undefinedFoo}${undefinedBar}"/>
-
-    <jsp:setProperty name="values" property="long"
-                     value="${undefinedFoo}${undefinedBar}"/>
-    <p>10-${values.long}</p>
-    <tags:echo-long index="11" echo="${undefinedFoo}${undefinedBar}"/>
-
-  </body>
-</html>
-
diff --git a/test/webapp/bug47977.jspx b/test/webapp/bug47977.jspx
deleted file mode 100644
index 082e8f166..000000000
--- a/test/webapp/bug47977.jspx
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-  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.
--->
-<jsp:root
-  xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"
-  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >
-  <jsp:directive.page isELIgnored="false" />
-<html>
-  <body>
-    <tags:echo echo="00-Hello World">xxx</tags:echo>
-  </body>
-</html>
-</jsp:root>
\ No newline at end of file
diff --git a/test/webapp/bug48112.jsp b/test/webapp/bug48112.jsp
deleted file mode 100644
index 356e680f4..000000000
--- a/test/webapp/bug48112.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%@ taglib uri="http://tomcat.apache.org/testerFunctions" prefix="fn" %>
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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>
-  <head><title>Bug 48112 test case</title></head>
-  <body>
-    <tags:echo echo="${fn:trim('{OK}')}"/>
-  </body>
-</html>
\ No newline at end of file
diff --git a/test/webapp/bug48616.jsp b/test/webapp/bug48616.jsp
deleted file mode 100644
index efc77cb58..000000000
--- a/test/webapp/bug48616.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<%--
- 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 prefix="bugs" uri="http://tomcat.apache.org/bugs" %>
-<bugs:Bug48616b />
-<bugs:Bug46816a>
-  <bugs:Bug48616b />
-</bugs:Bug46816a>
\ No newline at end of file
diff --git a/test/webapp/bug48616b.jsp b/test/webapp/bug48616b.jsp
deleted file mode 100644
index 31476ce6b..000000000
--- a/test/webapp/bug48616b.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%--
- 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 prefix="bugs" uri="http://tomcat.apache.org/bugs" %>
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
-  Tries to place the classic tag that defines a variable
-  into a simple tag
---%>
-<bugs:Bug48616b />
-<tags:bug42390>
-  <bugs:Bug46816a>
-    <bugs:Bug48616b />
-  </bugs:Bug46816a>
-</tags:bug42390>
diff --git a/test/webapp/bug48627.jsp b/test/webapp/bug48627.jsp
deleted file mode 100644
index 54a79fac4..000000000
--- a/test/webapp/bug48627.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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>
-  <head><title>Bug 46596 test case</title></head>
-  <body>
-    <tags:echo-noel echo="00-\\"/>
-    <tags:echo echo="01-\\"/>
-  </body>
-</html>
\ No newline at end of file
diff --git a/test/webapp/bug48668a.jsp b/test/webapp/bug48668a.jsp
deleted file mode 100644
index dd8bb7c03..000000000
--- a/test/webapp/bug48668a.jsp
+++ /dev/null
@@ -1,60 +0,0 @@
-<%--
- 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.
---%>
-<%@ page isELIgnored="true" %>
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<html>
-  <head><title>Bug 48668a test case</title></head>
-  <body>
-    <p><tags:echo echo="00-Hello world" />#{foo.bar}</p>
-    <p><tags:echo echo="01-Hello world" />${foo.bar}</p>
-
-    <p>10-<tags:bug48668 expr="Hello ${'foo.bar}" /></p>
-    <p>11-Hello <tags:bug48668 expr="${'foo.bar}" /></p>
-    <p>12-<tags:bug48668 expr="Hello #{'foo.bar}" /></p>
-    <p>13-Hello <tags:bug48668 expr="#{'foo.bar}" /></p>
-
-    <p>14-<tags:bug48668 expr="Hello ${'foo" />}</p>
-    <p>15-Hello <tags:bug48668 expr="${'foo" />}</p>
-    <p>16-<tags:bug48668 expr="Hello #{'foo" />}</p>
-    <p>17-Hello <tags:bug48668 expr="#{'foo" />}</p>
-
-    <p>18-<tags:bug48668 ><jsp:attribute name="expr">Hello ${'foo.bar}</jsp:attribute></tags:bug48668></p>
-    <p>19-Hello <tags:bug48668 ><jsp:attribute name="expr">${'foo.bar}</jsp:attribute></tags:bug48668></p>
-    <p>20-<tags:bug48668 ><jsp:attribute name="expr">Hello #{'foo.bar}</jsp:attribute></tags:bug48668></p>
-    <p>21-Hello <tags:bug48668 ><jsp:attribute name="expr">#{'foo.bar}</jsp:attribute></tags:bug48668></p>
-
-    <p>30-<tags:bug48668 noexpr="Hello ${'foo}"/></p>
-    <p>31-Hello <tags:bug48668 noexpr="${'foo}"/></p>
-    <p>32-<tags:bug48668 noexpr="Hello #{'foo}"/></p>
-    <p>33-Hello <tags:bug48668 noexpr="#{'foo}"/></p>
-    <p>34-<tags:bug48668><jsp:attribute name="noexpr">Hello ${'foo}</jsp:attribute></tags:bug48668></p>
-    <p>35-Hello <tags:bug48668><jsp:attribute name="noexpr">${'foo}</jsp:attribute></tags:bug48668></p>
-    <p>36-<tags:bug48668><jsp:attribute name="noexpr">Hello #{'foo}</jsp:attribute></tags:bug48668></p>
-    <p>37-Hello <tags:bug48668><jsp:attribute name="noexpr">#{'foo}</jsp:attribute></tags:bug48668></p>
-
-    <p>40-<tags:bug48668><jsp:attribute name="fragment">Hello ${'foo}</jsp:attribute></tags:bug48668></p>
-    <p>41-Hello <tags:bug48668><jsp:attribute name="fragment">${'foo}</jsp:attribute></tags:bug48668></p>
-    <p>42-<tags:bug48668><jsp:attribute name="fragment">Hello #{'foo}</jsp:attribute></tags:bug48668></p>
-    <p>43-Hello <tags:bug48668><jsp:attribute name="fragment">#{'foo}</jsp:attribute></tags:bug48668></p>
-
-    <p>50-<tags:bug48668>Hello ${'foo}</tags:bug48668></p>
-    <p>51-Hello <tags:bug48668>${'foo}</tags:bug48668></p>
-    <p>52-<tags:bug48668>Hello #{'foo}</tags:bug48668></p>
-    <p>53-Hello <tags:bug48668>#{'foo}</tags:bug48668></p>
-  </body>
-</html>
-
diff --git a/test/webapp/bug48668b.jsp b/test/webapp/bug48668b.jsp
deleted file mode 100644
index ebdb58b63..000000000
--- a/test/webapp/bug48668b.jsp
+++ /dev/null
@@ -1,26 +0,0 @@
-<%--
- 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.
---%>
-<%@ page deferredSyntaxAllowedAsLiteral="true" %>
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<html>
-  <head><title>Bug 48668b test case</title></head>
-  <body>
-    <p><tags:echo echo="00-Hello world" />#{foo.bar}</p>
-    <p><tags:echo echo="01-Hello world" />#{foo${1 + 1}</p>
-  </body>
-</html>
-
diff --git a/test/webapp/bug48827.jspx b/test/webapp/bug48827.jspx
deleted file mode 100644
index a6c760ea0..000000000
--- a/test/webapp/bug48827.jspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-  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.
--->
-<jsp:root
-  xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"
-  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >
-  <jsp:directive.page isELIgnored="false" />
-<html>
-  <body>
-    <tags:echo>
-      <jsp:attribute name="echo">00-Hello World</jsp:attribute>
-    </tags:echo>
-    <tags:echo echo="01-Hello World"></tags:echo>
-    <tags:echo echo="02-Hello World"> </tags:echo>
-  </body>
-</html>
-</jsp:root>
\ No newline at end of file
diff --git a/test/webapp/el-method.jsp b/test/webapp/el-method.jsp
deleted file mode 100644
index a7c9d62c0..000000000
--- a/test/webapp/el-method.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%@ page import="org.apache.el.TesterBeanA" %>
-<%@ page import="org.apache.el.TesterBeanB" %>
-<%--
- 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>
-  <head><title>EL method test cases</title></head>
-  <body>
-    <%
-    TesterBeanA beanA = new TesterBeanA();
-    TesterBeanB beanB = new TesterBeanB();
-    beanB.setName("Tomcat");
-    beanA.setBean(beanB);
-    pageContext.setAttribute("testBeanA", beanA);
-    pageContext.setAttribute("testBeanB", beanB);
-    %>
-    <tags:echo echo="00-${testBeanA[\"bean\"].sayHello('JUnit')}" />
-    <tags:echo echo="01-${testBeanA.bean.sayHello('JUnit')}" />
-    <tags:echo echo="02-${testBeanB.sayHello('JUnit')}" />
-  </body>
-</html>
\ No newline at end of file
diff --git a/test/webapp/el-misc.jsp b/test/webapp/el-misc.jsp
deleted file mode 100644
index 053252bac..000000000
--- a/test/webapp/el-misc.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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>
-  <head><title>Misc EL test cases</title></head>
-  <body>
-    <p>00-\\\"\${'hello world'}</p>
-    <p>01-\\\"\\${'hello world'}</p>
-    <tags:echo echo="02-\\\"\${'hello world'}" />
-    <tags:echo echo="03-\\\"\\${'hello world'}" />
-    <tags:echo echo="${'2'}az-04" />
-    <tags:echo echo="05-a${'2'}z" />
-    <tags:echo echo="06-az${'2'}" />
-    <tags:echo echo="${\"2\"}az-07" />
-    <tags:echo echo="08-a${\"2\"}z" />
-    <tags:echo echo="09-az${\"2\"}" />
-    <tags:echo echo="10-\${'foo'}${'bar'}" />
-    <tags:echo echo="11-${\"\\\"}\"}" />
-    <tags:echo echo="12-${'foo'}\\${'bar'}\\${'baz'}" />
-    <tags:echo echo="13-${'foo'}\\${\"bar\"}\\${'baz'}" />
-    <tags:echo echo="14-${\"foo\"}\\${'bar'}\\${\"baz\"}" />
-    <tags:echo echo='15-${\'foo\'}\\${"bar"}\\${\'baz\'}' />
-    <tags:echo echo='16-${"foo"}\\${\'bar\'}\\${"baz"}' />
-    <tags:echo echo='17-${"foo"}\\${&apos;bar&apos;}\\${&quot;baz&quot;}' />
-  </body>
-</html>
\ No newline at end of file
diff --git a/test/webapp/script-expr.jsp b/test/webapp/script-expr.jsp
deleted file mode 100644
index ce4f29157..000000000
--- a/test/webapp/script-expr.jsp
+++ /dev/null
@@ -1,34 +0,0 @@
-<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
-<%--
- 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>
-  <head><title>Scripting expression test cases</title></head>
-  <body>
-    <p><%= "00-hello world" %></p>
-    <p><%= "01-hello \"world" %></p>
-    <p><%= "02-hello \\\"world" %></p>
-    <p><%= "03-hello ${world" %></p>
-    <p><%= "04-hello \\${world" %></p>
-    <tags:echo echo="<%= "05-hello world" %>" />
-    <tags:echo echo="<%= "06-hello \\\"world" %>" />
-    <tags:echo echo="<%= "07-hello \\\\\\\"world" %>" />
-    <tags:echo echo="<%= "08-hello ${world" %>" />
-    <tags:echo echo="<%= "09-hello \\\\${world" %>" />
-    <tags:echo echo="10-hello <\% world" />
-    <tags:echo echo="11-hello %\> world" />
-  </body>
-</html>
\ No newline at end of file