Author: markt Date: Wed Jan 2 12:08:23 2013 New Revision: 1427757 URL: http://svn.apache.org/viewvc?rev=1427757&view=rev Log: Put all JSPs for bugs 50000-59999 in a sub-directory. Should be no functional change.
Added: tomcat/trunk/test/webapp-3.0/bug5nnnn/ tomcat/trunk/test/webapp-3.0/bug5nnnn/bug50408.jsp - copied unchanged from r1427746, tomcat/trunk/test/webapp-3.0/bug50408.jsp tomcat/trunk/test/webapp-3.0/bug5nnnn/bug51544.jsp - copied unchanged from r1427746, tomcat/trunk/test/webapp-3.0/bug51544.jsp tomcat/trunk/test/webapp-3.0/bug5nnnn/bug52335.jsp - copied unchanged from r1427746, tomcat/trunk/test/webapp-3.0/bug52335.jsp tomcat/trunk/test/webapp-3.0/bug5nnnn/bug53465.jsp - copied unchanged from r1427746, tomcat/trunk/test/webapp-3.0/bug53465.jsp tomcat/trunk/test/webapp-3.0/bug5nnnn/bug53467].jsp - copied unchanged from r1427746, tomcat/trunk/test/webapp-3.0/bug53467].jsp tomcat/trunk/test/webapp-3.0/bug5nnnn/bug53545.html - copied unchanged from r1427746, tomcat/trunk/test/webapp-3.0/bug53545.html tomcat/trunk/test/webapp-3.0/bug5nnnn/bug53545.jsp - copied unchanged from r1427746, tomcat/trunk/test/webapp-3.0/bug53545.jsp tomcat/trunk/test/webapp-3.0/bug5nnnn/bug53986.jsp - copied unchanged from r1427746, tomcat/trunk/test/webapp-3.0/bug53986.jsp tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54011.jsp - copied unchanged from r1427746, tomcat/trunk/test/webapp-3.0/bug54011.jsp tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54012.jsp - copied unchanged from r1427746, tomcat/trunk/test/webapp-3.0/bug54012.jsp tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54144.jsp - copied unchanged from r1427746, tomcat/trunk/test/webapp-3.0/bug54144.jsp Removed: tomcat/trunk/test/webapp-3.0/bug50408.jsp tomcat/trunk/test/webapp-3.0/bug51544.jsp tomcat/trunk/test/webapp-3.0/bug52335.jsp tomcat/trunk/test/webapp-3.0/bug53465.jsp tomcat/trunk/test/webapp-3.0/bug53467].jsp tomcat/trunk/test/webapp-3.0/bug53545.html tomcat/trunk/test/webapp-3.0/bug53545.jsp tomcat/trunk/test/webapp-3.0/bug53986.jsp tomcat/trunk/test/webapp-3.0/bug54011.jsp tomcat/trunk/test/webapp-3.0/bug54012.jsp tomcat/trunk/test/webapp-3.0/bug54144.jsp Modified: tomcat/trunk/test/javax/el/TestCompositeELResolver.java tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java tomcat/trunk/test/org/apache/el/TestELInJsp.java tomcat/trunk/test/org/apache/jasper/compiler/TestJspReader.java tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml Modified: tomcat/trunk/test/javax/el/TestCompositeELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestCompositeELResolver.java?rev=1427757&r1=1427756&r2=1427757&view=diff ============================================================================== --- tomcat/trunk/test/javax/el/TestCompositeELResolver.java (original) +++ tomcat/trunk/test/javax/el/TestCompositeELResolver.java Wed Jan 2 12:08:23 2013 @@ -52,7 +52,7 @@ public class TestCompositeELResolver ext tomcat.start(); int rc = getUrl("http://localhost:" + getPort() + - "/test/bug50408.jsp", new ByteChunk(), null); + "/test/bug5nnnn/bug50408.jsp", new ByteChunk(), null); assertEquals(HttpServletResponse.SC_OK, rc); } Modified: tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java?rev=1427757&r1=1427756&r2=1427757&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java Wed Jan 2 12:08:23 2013 @@ -64,7 +64,7 @@ public class TestApplicationContext exte ByteChunk res = new ByteChunk(); int rc = getUrl("http://localhost:" + getPort() + - "/test/bug53467].jsp", res, null); + "/test/bug5nnnn/bug53467].jsp", res, null); Assert.assertEquals(HttpServletResponse.SC_OK, rc); Assert.assertTrue(res.toString().contains("<p>OK</p>")); Modified: tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java?rev=1427757&r1=1427756&r2=1427757&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java Wed Jan 2 12:08:23 2013 @@ -44,7 +44,7 @@ public class TestDefaultInstanceManager int count = instanceManager.getAnnotationCacheSize(); // Request a third JSP (again, no tag libraries etc.) - getUrl("http://localhost:" + getPort() + "/test/bug51544.jsp"); + getUrl("http://localhost:" + getPort() + "/test/bug5nnnn/bug51544.jsp"); // Force a GC to clear out unloaded class (first JSP) System.gc(); Modified: tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java?rev=1427757&r1=1427756&r2=1427757&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java Wed Jan 2 12:08:23 2013 @@ -89,7 +89,7 @@ public class TestContextConfig extends T ByteChunk bc = new ByteChunk(); int rc = getUrl("http://localhost:" + getPort() + - "/test/bug51396.jsp", bc, null); + "/test/bug5nnnn/bug51396.jsp", bc, null); assertEquals(HttpServletResponse.SC_OK, rc); assertTrue(bc.toString().contains("<p>OK</p>")); Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=1427757&r1=1427756&r2=1427757&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original) +++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Wed Jan 2 12:08:23 2013 @@ -350,7 +350,7 @@ public class TestELInJsp extends TomcatB tomcat.start(); ByteChunk res = getUrl("http://localhost:" + getPort() + - "/test/bug51544.jsp"); + "/test/bug5nnnn/bug51544.jsp"); String result = res.toString(); assertEcho(result, "Empty list: true"); Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestJspReader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspReader.java?rev=1427757&r1=1427756&r2=1427757&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/jasper/compiler/TestJspReader.java (original) +++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspReader.java Wed Jan 2 12:08:23 2013 @@ -38,7 +38,7 @@ public class TestJspReader extends Tomca tomcat.start(); ByteChunk res = getUrl("http://localhost:" + getPort() + - "/bug53986.jsp"); + "/bug5nnnn/bug53986.jsp"); Assert.assertTrue(res.toString().contains("OK")); } } Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1427757&r1=1427756&r2=1427757&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java (original) +++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Wed Jan 2 12:08:23 2013 @@ -302,7 +302,7 @@ public class TestParser extends TomcatBa tomcat.start(); ByteChunk res = getUrl("http://localhost:" + getPort() + - "/test/bug52335.jsp"); + "/test/bug5nnnn/bug52335.jsp"); String result = res.toString(); // Beware of the differences between escaping in JSP attributes and Modified: tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java?rev=1427757&r1=1427756&r2=1427757&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java (original) +++ tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java Wed Jan 2 12:08:23 2013 @@ -42,7 +42,7 @@ public class TestPageContextImpl extends ByteChunk res = new ByteChunk(); int rc = getUrl("http://localhost:" + getPort() + - "/test/bug53545.jsp", res, null); + "/test/bug5nnnn/bug53545.jsp", res, null); Assert.assertEquals(HttpServletResponse.SC_OK, rc); Modified: tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java?rev=1427757&r1=1427756&r2=1427757&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java (original) +++ tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestOut.java Wed Jan 2 12:08:23 2013 @@ -30,7 +30,7 @@ public class TestOut extends AbstractTes ByteChunk res = new ByteChunk(); int rc = getUrl("http://localhost:" + getPort() + - "/test/bug54011.jsp", res, null); + "/test/bug5nnnn/bug54011.jsp", res, null); Assert.assertEquals(HttpServletResponse.SC_OK, rc); @@ -44,7 +44,7 @@ public class TestOut extends AbstractTes ByteChunk res = new ByteChunk(); int rc = getUrl("http://localhost:" + getPort() + - "/test/bug54144.jsp", res, null); + "/test/bug5nnnn/bug54144.jsp", res, null); Assert.assertEquals(HttpServletResponse.SC_OK, rc); Modified: tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java?rev=1427757&r1=1427756&r2=1427757&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java (original) +++ tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java Wed Jan 2 12:08:23 2013 @@ -30,7 +30,7 @@ public class TestSet extends AbstractTes ByteChunk res = new ByteChunk(); int rc = getUrl("http://localhost:" + getPort() + - "/test/bug54012.jsp", res, null); + "/test/bug5nnnn/bug54012.jsp", res, null); Assert.assertEquals(HttpServletResponse.SC_OK, rc); Modified: tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1427757&r1=1427756&r2=1427757&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java (original) +++ tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java Wed Jan 2 12:08:23 2013 @@ -361,7 +361,7 @@ public class TestNamingContext extends T ByteChunk bc = new ByteChunk(); int rc = getUrl("http://localhost:" + getPort() + - "/test/bug53465.jsp", bc, null); + "/test/bug5nnnn/bug53465.jsp", bc, null); Assert.assertEquals(HttpServletResponse.SC_OK, rc); Assert.assertTrue(bc.toString().contains("<p>10</p>")); Modified: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml?rev=1427757&r1=1427756&r2=1427757&view=diff ============================================================================== --- tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml (original) +++ tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml Wed Jan 2 12:08:23 2013 @@ -46,7 +46,7 @@ <!-- Bug 51396 --> <servlet> <servlet-name>bug51396</servlet-name> - <jsp-file>/bug51396.jsp</jsp-file> + <jsp-file>/bug5nnnn/bug51396.jsp</jsp-file> </servlet> </web-app> \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org