Move the 48nnn bugs

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

diff --git a/test/org/apache/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java
index 8e25d00..27d8034 100644 (file)
--- a/test/org/apache/el/TestELInJsp.java
+++ b/test/org/apache/el/TestELInJsp.java
@@ -304,7 +304,7 @@ public class TestELInJsp extends TomcatBaseTest {
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
-                "/test/bug48112.jsp");
+                "/test/bug48nnn/bug48112.jsp");
         String result = res.toString();
         assertEcho(result, "{OK}");
     }

diff --git a/test/org/apache/jasper/compiler/TestGenerator.java b/test/org/apache/jasper/compiler/TestGenerator.java
index ac0d630..7f090e8 100644 (file)
--- a/test/org/apache/jasper/compiler/TestGenerator.java
+++ b/test/org/apache/jasper/compiler/TestGenerator.java
@@ -100,7 +100,7 @@ public class TestGenerator extends TomcatBaseTest {
 
         Exception e = null;
         try {
-            getUrl("http://localhost:" + getPort() + "/test/bug48701-fail.jsp");
+            getUrl("http://localhost:" + getPort() + "/test/bug48nnn/bug48701-fail.jsp");
         } catch (IOException ioe) {
             e = ioe;
         }
@@ -110,19 +110,19 @@ public class TestGenerator extends TomcatBaseTest {
     }
 
     public void testBug48701UseBean() throws Exception {
-        testBug48701("bug48701-UseBean.jsp");
+        testBug48701("bug48nnn/bug48701-UseBean.jsp");
     }
     
     public void testBug48701VariableInfo() throws Exception {
-        testBug48701("bug48701-VI.jsp");
+        testBug48701("bug48nnn/bug48701-VI.jsp");
     }
     
     public void testBug48701TagVariableInfoNameGiven() throws Exception {
-        testBug48701("bug48701-TVI-NG.jsp");
+        testBug48701("bug48nnn/bug48701-TVI-NG.jsp");
     }
     
     public void testBug48701TagVariableInfoNameFromAttribute() throws Exception {
-        testBug48701("bug48701-TVI-NFA.jsp");
+        testBug48701("bug48nnn/bug48701-TVI-NFA.jsp");
     }
     
     private void testBug48701(String jsp) throws Exception {

diff --git a/test/org/apache/jasper/compiler/TestJspDocumentParser.java b/test/org/apache/jasper/compiler/TestJspDocumentParser.java
index c1c493d..08b636c 100644 (file)
--- a/test/org/apache/jasper/compiler/TestJspDocumentParser.java
+++ b/test/org/apache/jasper/compiler/TestJspDocumentParser.java
@@ -58,7 +58,7 @@ public class TestJspDocumentParser extends TomcatBaseTest {
 
         Exception e = null;
         try {
-            getUrl("http://localhost:" + getPort() + "/test/bug48827.jspx");
+            getUrl("http://localhost:" + getPort() + "/test/bug48nnn/bug48827.jspx");
         } catch (IOException ioe) {
             e = ioe;
         }

diff --git a/test/org/apache/jasper/compiler/TestParser.java b/test/org/apache/jasper/compiler/TestParser.java
index 6c3eebd..4675fe2 100644 (file)
--- a/test/org/apache/jasper/compiler/TestParser.java
+++ b/test/org/apache/jasper/compiler/TestParser.java
@@ -36,7 +36,7 @@ public class TestParser extends TomcatBaseTest {
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
-                "/test/bug48627.jsp");
+                "/test/bug48nnn/bug48627.jsp");
         
         String result = res.toString();
         // Beware of the differences between escaping in JSP attributes and
@@ -56,7 +56,7 @@ public class TestParser extends TomcatBaseTest {
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
-                "/test/bug48668a.jsp");
+                "/test/bug48nnn/bug48668a.jsp");
         String result = res.toString();
         assertEcho(result, "00-Hello world</p>#{foo.bar}");
         assertEcho(result, "01-Hello world</p>${foo.bar}");
@@ -101,7 +101,7 @@ public class TestParser extends TomcatBaseTest {
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
-                "/test/bug48668b.jsp");
+                "/test/bug48nnn/bug48668b.jsp");
         String result = res.toString();
         assertEcho(result, "00-Hello world</p>#{foo.bar}");
         assertEcho(result, "01-Hello world</p>#{foo2");

diff --git a/test/org/apache/jasper/compiler/TestScriptingVariabler.java b/test/org/apache/jasper/compiler/TestScriptingVariabler.java
index 8b372c3..c031d8d 100644 (file)
--- a/test/org/apache/jasper/compiler/TestScriptingVariabler.java
+++ b/test/org/apache/jasper/compiler/TestScriptingVariabler.java
@@ -84,7 +84,7 @@ public class TestScriptingVariabler extends TomcatBaseTest {
 
         Exception e = null;
         try {
-            getUrl("http://localhost:" + getPort() + "/test/bug48616.jsp");
+            getUrl("http://localhost:" + getPort() + "/test/bug48nnn/bug48616.jsp");
         } catch (IOException ioe) {
             e = ioe;
         }
@@ -105,7 +105,7 @@ public class TestScriptingVariabler extends TomcatBaseTest {
 
         Exception e = null;
         try {
-            getUrl("http://localhost:" + getPort() + "/test/bug48616b.jsp");
+            getUrl("http://localhost:" + getPort() + "/test/bug48nnn/bug48616b.jsp");
         } catch (IOException ioe) {
             e = ioe;
         }

diff --git a/test/webapp-3.0/bug48112.jsp b/test/webapp-3.0/bug48112.jsp
deleted file mode 100644 (file)
index 356e680..0000000
--- a/test/webapp-3.0/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-3.0/bug48616.jsp b/test/webapp-3.0/bug48616.jsp
deleted file mode 100644 (file)
index efc77cb..0000000
--- a/test/webapp-3.0/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-3.0/bug48616b.jsp b/test/webapp-3.0/bug48616b.jsp
deleted file mode 100644 (file)
index 31476ce..0000000
--- a/test/webapp-3.0/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-3.0/bug48627.jsp b/test/webapp-3.0/bug48627.jsp
deleted file mode 100644 (file)
index 54a79fa..0000000
--- a/test/webapp-3.0/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-3.0/bug48668a.jsp b/test/webapp-3.0/bug48668a.jsp
deleted file mode 100644 (file)
index dd8bb7c..0000000
--- a/test/webapp-3.0/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-3.0/bug48668b.jsp b/test/webapp-3.0/bug48668b.jsp
deleted file mode 100644 (file)
index ebdb58b..0000000
--- a/test/webapp-3.0/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-3.0/bug48701-TVI-NFA.jsp b/test/webapp-3.0/bug48701-TVI-NFA.jsp
deleted file mode 100644 (file)
index dd00f57..0000000
--- a/test/webapp-3.0/bug48701-TVI-NFA.jsp
+++ /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.
---%>
-<%@ taglib uri="http://tomcat.apache.org/bugs" prefix="bugs" %>
-<bugs:Bug48701c beanName="now" />
-<jsp:getProperty name="now" property="time" />
-<p>00-PASS</p>

diff --git a/test/webapp-3.0/bug48701-TVI-NG.jsp b/test/webapp-3.0/bug48701-TVI-NG.jsp
deleted file mode 100644 (file)
index 2b40962..0000000
--- a/test/webapp-3.0/bug48701-TVI-NG.jsp
+++ /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.
---%>
-<%@ taglib uri="http://tomcat.apache.org/bugs" prefix="bugs" %>
-<bugs:Bug48701b/>
-<jsp:getProperty name="now" property="time" />
-<p>00-PASS</p>

diff --git a/test/webapp-3.0/bug48701-UseBean.jsp b/test/webapp-3.0/bug48701-UseBean.jsp
deleted file mode 100644 (file)
index a64214e..0000000
--- a/test/webapp-3.0/bug48701-UseBean.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.
---%>
-<jsp:useBean id="now" class="java.util.Date" />
-<jsp:getProperty name="now" property="time" />
-<p>00-PASS</p>
\ No newline at end of file

diff --git a/test/webapp-3.0/bug48701-VI.jsp b/test/webapp-3.0/bug48701-VI.jsp
deleted file mode 100644 (file)
index 7f042ca..0000000
--- a/test/webapp-3.0/bug48701-VI.jsp
+++ /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.
---%>
-<%@ taglib uri="http://tomcat.apache.org/bugs" prefix="bugs" %>
-<bugs:Bug48701a/>
-<jsp:getProperty name="now" property="time" />
-<p>00-PASS</p>

diff --git a/test/webapp-3.0/bug48701-fail.jsp b/test/webapp-3.0/bug48701-fail.jsp
deleted file mode 100644 (file)
index 5b04d4a..0000000
--- a/test/webapp-3.0/bug48701-fail.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.
---%>
-<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<c:set var="now" value='<%= new java.util.Date() %>' />
-<jsp:getProperty name="now" property="time" />

diff --git a/test/webapp-3.0/bug48827.jspx b/test/webapp-3.0/bug48827.jspx
deleted file mode 100644 (file)
index a6c760e..0000000
--- a/test/webapp-3.0/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-3.0/bug48nnn/bug48112.jsp b/test/webapp-3.0/bug48nnn/bug48112.jsp
new file mode 100644 (file)
index 0000000..356e680
--- /dev/null
+++ b/test/webapp-3.0/bug48nnn/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/bug48nnn/bug48616.jsp b/test/webapp-3.0/bug48nnn/bug48616.jsp
new file mode 100644 (file)
index 0000000..efc77cb
--- /dev/null
+++ b/test/webapp-3.0/bug48nnn/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/bug48nnn/bug48616b.jsp b/test/webapp-3.0/bug48nnn/bug48616b.jsp
new file mode 100644 (file)
index 0000000..31476ce
--- /dev/null
+++ b/test/webapp-3.0/bug48nnn/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/bug48nnn/bug48627.jsp b/test/webapp-3.0/bug48nnn/bug48627.jsp
new file mode 100644 (file)
index 0000000..54a79fa
--- /dev/null
+++ b/test/webapp-3.0/bug48nnn/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/bug48nnn/bug48668a.jsp b/test/webapp-3.0/bug48nnn/bug48668a.jsp
new file mode 100644 (file)
index 0000000..dd8bb7c
--- /dev/null
+++ b/test/webapp-3.0/bug48nnn/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/bug48nnn/bug48668b.jsp b/test/webapp-3.0/bug48nnn/bug48668b.jsp
new file mode 100644 (file)
index 0000000..ebdb58b
--- /dev/null
+++ b/test/webapp-3.0/bug48nnn/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/bug48nnn/bug48701-TVI-NFA.jsp b/test/webapp-3.0/bug48nnn/bug48701-TVI-NFA.jsp
new file mode 100644 (file)
index 0000000..dd00f57
--- /dev/null
+++ b/test/webapp-3.0/bug48nnn/bug48701-TVI-NFA.jsp
@@ -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.
+--%>
+<%@ taglib uri="http://tomcat.apache.org/bugs" prefix="bugs" %>
+<bugs:Bug48701c beanName="now" />
+<jsp:getProperty name="now" property="time" />
+<p>00-PASS</p>

diff --git a/test/webapp-3.0/bug48nnn/bug48701-TVI-NG.jsp b/test/webapp-3.0/bug48nnn/bug48701-TVI-NG.jsp
new file mode 100644 (file)
index 0000000..2b40962
--- /dev/null
+++ b/test/webapp-3.0/bug48nnn/bug48701-TVI-NG.jsp
@@ -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.
+--%>
+<%@ taglib uri="http://tomcat.apache.org/bugs" prefix="bugs" %>
+<bugs:Bug48701b/>
+<jsp:getProperty name="now" property="time" />
+<p>00-PASS</p>

diff --git a/test/webapp-3.0/bug48nnn/bug48701-UseBean.jsp b/test/webapp-3.0/bug48nnn/bug48701-UseBean.jsp
new file mode 100644 (file)
index 0000000..a64214e
--- /dev/null
+++ b/test/webapp-3.0/bug48nnn/bug48701-UseBean.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.
+--%>
+<jsp:useBean id="now" class="java.util.Date" />
+<jsp:getProperty name="now" property="time" />
+<p>00-PASS</p>
\ No newline at end of file

diff --git a/test/webapp-3.0/bug48nnn/bug48701-VI.jsp b/test/webapp-3.0/bug48nnn/bug48701-VI.jsp
new file mode 100644 (file)
index 0000000..7f042ca
--- /dev/null
+++ b/test/webapp-3.0/bug48nnn/bug48701-VI.jsp
@@ -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.
+--%>
+<%@ taglib uri="http://tomcat.apache.org/bugs" prefix="bugs" %>
+<bugs:Bug48701a/>
+<jsp:getProperty name="now" property="time" />
+<p>00-PASS</p>

diff --git a/test/webapp-3.0/bug48nnn/bug48701-fail.jsp b/test/webapp-3.0/bug48nnn/bug48701-fail.jsp
new file mode 100644 (file)
index 0000000..5b04d4a
--- /dev/null
+++ b/test/webapp-3.0/bug48nnn/bug48701-fail.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.
+--%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<c:set var="now" value='<%= new java.util.Date() %>' />
+<jsp:getProperty name="now" property="time" />

diff --git a/test/webapp-3.0/bug48nnn/bug48827.jspx b/test/webapp-3.0/bug48nnn/bug48827.jspx
new file mode 100644 (file)
index 0000000..a6c760e
--- /dev/null
+++ b/test/webapp-3.0/bug48nnn/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