Author: markt Date: Tue Mar 9 15:44:30 2010 New Revision: 920926 URL: http://svn.apache.org/viewvc?rev=920926&view=rev Log: Re-org some JSPs
Added: tomcat/trunk/test/webapp-3.0/bug45nnn/bug45015a.jsp - copied unchanged from r920892, tomcat/trunk/test/webapp-3.0/bug45015a.jsp tomcat/trunk/test/webapp-3.0/bug45nnn/bug45015b.jsp - copied unchanged from r920892, tomcat/trunk/test/webapp-3.0/bug45015b.jsp tomcat/trunk/test/webapp-3.0/bug45nnn/bug45427.jsp - copied unchanged from r920892, tomcat/trunk/test/webapp-3.0/bug45427.jsp tomcat/trunk/test/webapp-3.0/bug45nnn/bug45451.jspf - copied unchanged from r920892, tomcat/trunk/test/webapp-3.0/bug45451.jspf tomcat/trunk/test/webapp-3.0/bug45nnn/bug45451a.jsp - copied unchanged from r920892, tomcat/trunk/test/webapp-3.0/bug45451a.jsp tomcat/trunk/test/webapp-3.0/bug45nnn/bug45451b.jsp - copied unchanged from r920892, tomcat/trunk/test/webapp-3.0/bug45451b.jsp tomcat/trunk/test/webapp-3.0/bug45nnn/bug45451c.jsp - copied unchanged from r920892, tomcat/trunk/test/webapp-3.0/bug45451c.jsp tomcat/trunk/test/webapp-3.0/bug45nnn/bug45451d.jspx - copied unchanged from r920892, tomcat/trunk/test/webapp-3.0/bug45451d.jspx tomcat/trunk/test/webapp-3.0/bug45nnn/bug45451e.jsp - copied unchanged from r920892, tomcat/trunk/test/webapp-3.0/bug45451e.jsp tomcat/trunk/test/webapp-3.0/bug45nnn/bug45511.jsp - copied unchanged from r920892, tomcat/trunk/test/webapp-3.0/bug45511.jsp Removed: tomcat/trunk/test/webapp-3.0/bug45015a.jsp tomcat/trunk/test/webapp-3.0/bug45015b.jsp tomcat/trunk/test/webapp-3.0/bug45427.jsp tomcat/trunk/test/webapp-3.0/bug45451.jspf tomcat/trunk/test/webapp-3.0/bug45451a.jsp tomcat/trunk/test/webapp-3.0/bug45451b.jsp tomcat/trunk/test/webapp-3.0/bug45451c.jsp tomcat/trunk/test/webapp-3.0/bug45451d.jspx tomcat/trunk/test/webapp-3.0/bug45451e.jsp tomcat/trunk/test/webapp-3.0/bug45511.jsp Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=920926&r1=920925&r2=920926&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original) +++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Tue Mar 9 15:44:30 2010 @@ -107,7 +107,7 @@ public class TestELInJsp extends TomcatB 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 TomcatB 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 TomcatB 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 TomcatB 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 TomcatB 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 TomcatB 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 TomcatB tomcat.start(); ByteChunk res = getUrl("http://localhost:" + getPort() + - "/test/bug45511.jsp"); + "/test/bug45nnn/bug45511.jsp"); String result = res.toString(); assertEcho(result, "00-true"); Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java?rev=920926&r1=920925&r2=920926&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java (original) +++ tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java Tue Mar 9 15:44:30 2010 @@ -37,7 +37,7 @@ public class TestGenerator extends Tomca 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 Tomca Exception e = null; try { - getUrl("http://localhost:" + getPort() + "/test/bug45015b.jsp"); + getUrl("http://localhost:" + getPort() + "/test/bug45nnn/bug45015b.jsp"); } catch (IOException ioe) { e = ioe; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org