From dcfa21c70357af1caca706be199202a2f7a95317 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 9 Mar 2010 15:44:30 +0000 Subject: [PATCH] Re-org some JSPs git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@920926 13f79535-47bb-0310-9956-ffa450edef68 --- test/org/apache/el/TestELInJsp.java | 14 +++++++------- test/org/apache/jasper/compiler/TestGenerator.java | 4 ++-- test/webapp-3.0/{ => bug45nnn}/bug45015a.jsp | 0 test/webapp-3.0/{ => bug45nnn}/bug45015b.jsp | 0 test/webapp-3.0/{ => bug45nnn}/bug45427.jsp | 0 test/webapp-3.0/{ => bug45nnn}/bug45451.jspf | 0 test/webapp-3.0/{ => bug45nnn}/bug45451a.jsp | 0 test/webapp-3.0/{ => bug45nnn}/bug45451b.jsp | 0 test/webapp-3.0/{ => bug45nnn}/bug45451c.jsp | 0 test/webapp-3.0/{ => bug45nnn}/bug45451d.jspx | 0 test/webapp-3.0/{ => bug45nnn}/bug45451e.jsp | 0 test/webapp-3.0/{ => bug45nnn}/bug45511.jsp | 0 12 files changed, 9 insertions(+), 9 deletions(-) rename test/webapp-3.0/{ => bug45nnn}/bug45015a.jsp (100%) rename test/webapp-3.0/{ => bug45nnn}/bug45015b.jsp (100%) rename test/webapp-3.0/{ => bug45nnn}/bug45427.jsp (100%) rename test/webapp-3.0/{ => bug45nnn}/bug45451.jspf (100%) rename test/webapp-3.0/{ => bug45nnn}/bug45451a.jsp (100%) rename test/webapp-3.0/{ => bug45nnn}/bug45451b.jsp (100%) rename test/webapp-3.0/{ => bug45nnn}/bug45451c.jsp (100%) rename test/webapp-3.0/{ => bug45nnn}/bug45451d.jspx (100%) rename test/webapp-3.0/{ => bug45nnn}/bug45451e.jsp (100%) rename test/webapp-3.0/{ => bug45nnn}/bug45511.jsp (100%) diff --git a/test/org/apache/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java index 5d704fb7e..8e25d0072 100644 --- 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 78c5856c3..d8c6070a6 100644 --- 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/bug45nnn/bug45015a.jsp similarity index 100% rename from test/webapp-3.0/bug45015a.jsp rename to test/webapp-3.0/bug45nnn/bug45015a.jsp diff --git a/test/webapp-3.0/bug45015b.jsp b/test/webapp-3.0/bug45nnn/bug45015b.jsp similarity index 100% rename from test/webapp-3.0/bug45015b.jsp rename to test/webapp-3.0/bug45nnn/bug45015b.jsp diff --git a/test/webapp-3.0/bug45427.jsp b/test/webapp-3.0/bug45nnn/bug45427.jsp similarity index 100% rename from test/webapp-3.0/bug45427.jsp rename to test/webapp-3.0/bug45nnn/bug45427.jsp diff --git a/test/webapp-3.0/bug45451.jspf b/test/webapp-3.0/bug45nnn/bug45451.jspf similarity index 100% rename from test/webapp-3.0/bug45451.jspf rename to test/webapp-3.0/bug45nnn/bug45451.jspf diff --git a/test/webapp-3.0/bug45451a.jsp b/test/webapp-3.0/bug45nnn/bug45451a.jsp similarity index 100% rename from test/webapp-3.0/bug45451a.jsp rename to test/webapp-3.0/bug45nnn/bug45451a.jsp diff --git a/test/webapp-3.0/bug45451b.jsp b/test/webapp-3.0/bug45nnn/bug45451b.jsp similarity index 100% rename from test/webapp-3.0/bug45451b.jsp rename to test/webapp-3.0/bug45nnn/bug45451b.jsp diff --git a/test/webapp-3.0/bug45451c.jsp b/test/webapp-3.0/bug45nnn/bug45451c.jsp similarity index 100% rename from test/webapp-3.0/bug45451c.jsp rename to test/webapp-3.0/bug45nnn/bug45451c.jsp diff --git a/test/webapp-3.0/bug45451d.jspx b/test/webapp-3.0/bug45nnn/bug45451d.jspx similarity index 100% rename from test/webapp-3.0/bug45451d.jspx rename to test/webapp-3.0/bug45nnn/bug45451d.jspx diff --git a/test/webapp-3.0/bug45451e.jsp b/test/webapp-3.0/bug45nnn/bug45451e.jsp similarity index 100% rename from test/webapp-3.0/bug45451e.jsp rename to test/webapp-3.0/bug45nnn/bug45451e.jsp diff --git a/test/webapp-3.0/bug45511.jsp b/test/webapp-3.0/bug45nnn/bug45511.jsp similarity index 100% rename from test/webapp-3.0/bug45511.jsp rename to test/webapp-3.0/bug45nnn/bug45511.jsp -- 2.11.0