Re-org some JSPs

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

diff --git a/test/org/apache/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java
index 5d704fb..8e25d00 100644 (file)
--- a/test/org/apache/el/TestELInJsp.java
+++ b/test/org/apache/el/TestELInJsp.java
@@ -107,7 +107,7 @@ public class TestELInJsp extends TomcatBaseTest {
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
-                "/test/bug45427.jsp");
+                "/test/bug45nnn/bug45427.jsp");
         
         String result = res.toString();
         // Warning: JSP attribute escaping != Java String escaping
@@ -142,7 +142,7 @@ public class TestELInJsp extends TomcatBaseTest {
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
-                "/test/bug45451a.jsp");
+                "/test/bug45nnn/bug45451a.jsp");
         
         String result = res.toString();
         // Warning: JSP attribute escaping != Java String escaping
@@ -151,7 +151,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "02-\\'hello world\\'");
         assertEcho(result, "03-\\'hello world\\'");
         
-        res = getUrl("http://localhost:" + getPort() + "/test/bug45451b.jsp");
+        res = getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45451b.jsp");
         result = res.toString();
         // Warning: JSP attribute escaping != Java String escaping
         // Warning: Attributes are always unescaped before passing to the EL
@@ -171,7 +171,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "12-\\#{1+1}");
         assertEcho(result, "13-\\\\2"); 
         
-        res = getUrl("http://localhost:" + getPort() + "/test/bug45451c.jsp");
+        res = getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45451c.jsp");
         result = res.toString();
         // Warning: JSP attribute escaping != Java String escaping
         // TODO - Currently we allow a single unescaped \ in attribute values
@@ -191,7 +191,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "12-\\\\#{1+1}");
         assertEcho(result, "13-\\\\#{1+1}");
 
-        res = getUrl("http://localhost:" + getPort() + "/test/bug45451d.jspx");
+        res = getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45451d.jspx");
         result = res.toString();
         // Warning: JSP attribute escaping != Java String escaping
         // \\ Is *not* an escape sequence in XML attributes
@@ -210,7 +210,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "12-\\\\#{1+1}");
         assertEcho(result, "13-\\\\\\#{1+1}");
         
-        res = getUrl("http://localhost:" + getPort() + "/test/bug45451e.jsp");
+        res = getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45451e.jsp");
         result = res.toString();
         // Warning: JSP attribute escaping != Java String escaping
         // Warning: Attributes are always unescaped before passing to the EL
@@ -242,7 +242,7 @@ public class TestELInJsp extends TomcatBaseTest {
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
-                "/test/bug45511.jsp");
+                "/test/bug45nnn/bug45511.jsp");
         
         String result = res.toString();
         assertEcho(result, "00-true");

diff --git a/test/org/apache/jasper/compiler/TestGenerator.java b/test/org/apache/jasper/compiler/TestGenerator.java
index 78c5856..d8c6070 100644 (file)
--- a/test/org/apache/jasper/compiler/TestGenerator.java
+++ b/test/org/apache/jasper/compiler/TestGenerator.java
@@ -37,7 +37,7 @@ public class TestGenerator extends TomcatBaseTest {
         tomcat.start();
 
         ByteChunk res = getUrl("http://localhost:" + getPort() +
-                "/test/bug45015a.jsp");
+                "/test/bug45nnn/bug45015a.jsp");
         
         String result = res.toString();
         // Beware of the differences between escaping in JSP attributes and
@@ -66,7 +66,7 @@ public class TestGenerator extends TomcatBaseTest {
 
         Exception e = null;
         try {
-            getUrl("http://localhost:" + getPort() + "/test/bug45015b.jsp");
+            getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45015b.jsp");
         } catch (IOException ioe) {
             e = ioe;
         }

diff --git a/test/webapp-3.0/bug45015a.jsp b/test/webapp-3.0/bug45015a.jsp
deleted file mode 100644 (file)
index 3d85ba4..0000000
--- a/test/webapp-3.0/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-3.0/bug45015b.jsp b/test/webapp-3.0/bug45015b.jsp
deleted file mode 100644 (file)
index a032a11..0000000
--- a/test/webapp-3.0/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-3.0/bug45427.jsp b/test/webapp-3.0/bug45427.jsp
deleted file mode 100644 (file)
index 41cd19b..0000000
--- a/test/webapp-3.0/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-3.0/bug45451.jspf b/test/webapp-3.0/bug45451.jspf
deleted file mode 100644 (file)
index e4483e3..0000000
--- a/test/webapp-3.0/bug45451.jspf
+++ /dev/null
@@ -1,35 +0,0 @@
-<%--\r
- Licensed to the Apache Software Foundation (ASF) under one or more\r
-  contributor license agreements.  See the NOTICE file distributed with\r
-  this work for additional information regarding copyright ownership.\r
-  The ASF licenses this file to You under the Apache License, Version 2.0\r
-  (the "License"); you may not use this file except in compliance with\r
-  the License.  You may obtain a copy of the License at\r
-\r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
---%>\r
-<p>00-${1+1}</p>\r
-<p>01-\${1+1}</p>\r
-<p>02-\\${1+1}</p>\r
-<p>03-\\\${1+1}</p>\r
-<tags:echo echo="04-${1+1}" />\r
-<tags:echo echo="05-\${1+1}" />\r
-<tags:echo echo="06-\\${1+1}" />\r
-<tags:echo echo="07-\\\${1+1}" />\r
-<tags:echo echo="08-\\\\${1+1}" />\r
-<tags:echo echo="04-${1+1}" />\r
-<tags:echo echo="05-\${1+1}" />\r
-<tags:echo echo="06-\\${1+1}" />\r
-<tags:echo echo="07-\\\${1+1}" />\r
-<tags:echo echo="08-\\\\${1+1}" />\r
-<tags:echo-deferred echo="09-#{1+1}" />\r
-<tags:echo-deferred echo="10-\#{1+1}" />\r
-<tags:echo-deferred echo="11-\\#{1+1}" />\r
-<tags:echo-deferred echo="12-\\\#{1+1}" />\r
-<tags:echo-deferred echo="13-\\\\#{1+1}" />\r

diff --git a/test/webapp-3.0/bug45451a.jsp b/test/webapp-3.0/bug45451a.jsp
deleted file mode 100644 (file)
index f3a67f4..0000000
--- a/test/webapp-3.0/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-3.0/bug45451b.jsp b/test/webapp-3.0/bug45451b.jsp
deleted file mode 100644 (file)
index 3f3e166..0000000
--- a/test/webapp-3.0/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-3.0/bug45451c.jsp b/test/webapp-3.0/bug45451c.jsp
deleted file mode 100644 (file)
index 38324a3..0000000
--- a/test/webapp-3.0/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-3.0/bug45451d.jspx b/test/webapp-3.0/bug45451d.jspx
deleted file mode 100644 (file)
index 5a0039f..0000000
--- a/test/webapp-3.0/bug45451d.jspx
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--\r
-  Licensed to the Apache Software Foundation (ASF) under one or more\r
-  contributor license agreements.  See the NOTICE file distributed with\r
-  this work for additional information regarding copyright ownership.\r
-  The ASF licenses this file to You under the Apache License, Version 2.0\r
-  (the "License"); you may not use this file except in compliance with\r
-  the License.  You may obtain a copy of the License at\r
-\r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
--->\r
-<jsp:root\r
-  xmlns:bug45451="urn:jsptagdir:/WEB-INF/tags/bug45451"\r
-  xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"\r
-  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >\r
-  <jsp:directive.page isELIgnored="false" />\r
-<html>\r
-  <body>\r
-    <p>00-${1+1}</p>\r
-    <p>01-\${1+1}</p>\r
-    <p>02-\\${1+1}</p>\r
-    <p>03-\\\${1+1}</p>\r
-    <tags:echo echo="04-${1+1}" />\r
-    <tags:echo echo="05-\${1+1}" />\r
-    <tags:echo echo="06-\\${1+1}" />\r
-    <tags:echo echo="07-\\\${1+1}" />\r
-    <tags:echo echo="08-\\\\${1+1}" />\r
-    <tags:echo-deferred echo="09-#{1+1}" />\r
-    <tags:echo-deferred echo="10-\#{1+1}" />\r
-    <tags:echo-deferred echo="11-\\#{1+1}" />\r
-    <tags:echo-deferred echo="12-\\\#{1+1}" />\r
-    <tags:echo-deferred echo="13-\\\\#{1+1}" />\r
-  </body>\r
-</html>\r
-</jsp:root>
\ No newline at end of file

diff --git a/test/webapp-3.0/bug45451e.jsp b/test/webapp-3.0/bug45451e.jsp
deleted file mode 100644 (file)
index b181d13..0000000
--- a/test/webapp-3.0/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-3.0/bug45511.jsp b/test/webapp-3.0/bug45511.jsp
deleted file mode 100644 (file)
index 6279eba..0000000
--- a/test/webapp-3.0/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-3.0/bug45nnn/bug45015a.jsp b/test/webapp-3.0/bug45nnn/bug45015a.jsp
new file mode 100644 (file)
index 0000000..3d85ba4
--- /dev/null
+++ b/test/webapp-3.0/bug45nnn/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/bug45nnn/bug45015b.jsp b/test/webapp-3.0/bug45nnn/bug45015b.jsp
new file mode 100644 (file)
index 0000000..a032a11
--- /dev/null
+++ b/test/webapp-3.0/bug45nnn/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/bug45nnn/bug45427.jsp b/test/webapp-3.0/bug45nnn/bug45427.jsp
new file mode 100644 (file)
index 0000000..41cd19b
--- /dev/null
+++ b/test/webapp-3.0/bug45nnn/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/bug45nnn/bug45451.jspf b/test/webapp-3.0/bug45nnn/bug45451.jspf
new file mode 100644 (file)
index 0000000..e4483e3
--- /dev/null
+++ b/test/webapp-3.0/bug45nnn/bug45451.jspf
@@ -0,0 +1,35 @@
+<%--\r
+ Licensed to the Apache Software Foundation (ASF) under one or more\r
+  contributor license agreements.  See the NOTICE file distributed with\r
+  this work for additional information regarding copyright ownership.\r
+  The ASF licenses this file to You under the Apache License, Version 2.0\r
+  (the "License"); you may not use this file except in compliance with\r
+  the License.  You may obtain a copy of the License at\r
+\r
+      http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+  Unless required by applicable law or agreed to in writing, software\r
+  distributed under the License is distributed on an "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+  See the License for the specific language governing permissions and\r
+  limitations under the License.\r
+--%>\r
+<p>00-${1+1}</p>\r
+<p>01-\${1+1}</p>\r
+<p>02-\\${1+1}</p>\r
+<p>03-\\\${1+1}</p>\r
+<tags:echo echo="04-${1+1}" />\r
+<tags:echo echo="05-\${1+1}" />\r
+<tags:echo echo="06-\\${1+1}" />\r
+<tags:echo echo="07-\\\${1+1}" />\r
+<tags:echo echo="08-\\\\${1+1}" />\r
+<tags:echo echo="04-${1+1}" />\r
+<tags:echo echo="05-\${1+1}" />\r
+<tags:echo echo="06-\\${1+1}" />\r
+<tags:echo echo="07-\\\${1+1}" />\r
+<tags:echo echo="08-\\\\${1+1}" />\r
+<tags:echo-deferred echo="09-#{1+1}" />\r
+<tags:echo-deferred echo="10-\#{1+1}" />\r
+<tags:echo-deferred echo="11-\\#{1+1}" />\r
+<tags:echo-deferred echo="12-\\\#{1+1}" />\r
+<tags:echo-deferred echo="13-\\\\#{1+1}" />\r

diff --git a/test/webapp-3.0/bug45nnn/bug45451a.jsp b/test/webapp-3.0/bug45nnn/bug45451a.jsp
new file mode 100644 (file)
index 0000000..f3a67f4
--- /dev/null
+++ b/test/webapp-3.0/bug45nnn/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/bug45nnn/bug45451b.jsp b/test/webapp-3.0/bug45nnn/bug45451b.jsp
new file mode 100644 (file)
index 0000000..3f3e166
--- /dev/null
+++ b/test/webapp-3.0/bug45nnn/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/bug45nnn/bug45451c.jsp b/test/webapp-3.0/bug45nnn/bug45451c.jsp
new file mode 100644 (file)
index 0000000..38324a3
--- /dev/null
+++ b/test/webapp-3.0/bug45nnn/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/bug45nnn/bug45451d.jspx b/test/webapp-3.0/bug45nnn/bug45451d.jspx
new file mode 100644 (file)
index 0000000..5a0039f
--- /dev/null
+++ b/test/webapp-3.0/bug45nnn/bug45451d.jspx
@@ -0,0 +1,40 @@
+<!--\r
+  Licensed to the Apache Software Foundation (ASF) under one or more\r
+  contributor license agreements.  See the NOTICE file distributed with\r
+  this work for additional information regarding copyright ownership.\r
+  The ASF licenses this file to You under the Apache License, Version 2.0\r
+  (the "License"); you may not use this file except in compliance with\r
+  the License.  You may obtain a copy of the License at\r
+\r
+      http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+  Unless required by applicable law or agreed to in writing, software\r
+  distributed under the License is distributed on an "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+  See the License for the specific language governing permissions and\r
+  limitations under the License.\r
+-->\r
+<jsp:root\r
+  xmlns:bug45451="urn:jsptagdir:/WEB-INF/tags/bug45451"\r
+  xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"\r
+  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >\r
+  <jsp:directive.page isELIgnored="false" />\r
+<html>\r
+  <body>\r
+    <p>00-${1+1}</p>\r
+    <p>01-\${1+1}</p>\r
+    <p>02-\\${1+1}</p>\r
+    <p>03-\\\${1+1}</p>\r
+    <tags:echo echo="04-${1+1}" />\r
+    <tags:echo echo="05-\${1+1}" />\r
+    <tags:echo echo="06-\\${1+1}" />\r
+    <tags:echo echo="07-\\\${1+1}" />\r
+    <tags:echo echo="08-\\\\${1+1}" />\r
+    <tags:echo-deferred echo="09-#{1+1}" />\r
+    <tags:echo-deferred echo="10-\#{1+1}" />\r
+    <tags:echo-deferred echo="11-\\#{1+1}" />\r
+    <tags:echo-deferred echo="12-\\\#{1+1}" />\r
+    <tags:echo-deferred echo="13-\\\\#{1+1}" />\r
+  </body>\r
+</html>\r
+</jsp:root>
\ No newline at end of file

diff --git a/test/webapp-3.0/bug45nnn/bug45451e.jsp b/test/webapp-3.0/bug45nnn/bug45451e.jsp
new file mode 100644 (file)
index 0000000..b181d13
--- /dev/null
+++ b/test/webapp-3.0/bug45nnn/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/bug45nnn/bug45511.jsp b/test/webapp-3.0/bug45nnn/bug45511.jsp
new file mode 100644 (file)
index 0000000..6279eba
--- /dev/null
+++ b/test/webapp-3.0/bug45nnn/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