tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1427805 - in /tomcat/tc7.0.x/trunk: ./ test/javax/el/ test/org/apache/catalina/core/ test/org/apache/el/ test/org/apache/jasper/compiler/ test/org/apache/jasper/runtime/ test/org/apache/naming/resources/ test/webapp-3.0-fragments/WEB-INF/ ...
Date Wed, 02 Jan 2013 14:54:16 GMT
Author: markt
Date: Wed Jan  2 14:54:16 2013
New Revision: 1427805

URL: http://svn.apache.org/viewvc?rev=1427805&view=rev
Log:
Put all JSPs for bugs 50000-59999 in a sub-directory. Should be no functional change.

Added:
    tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/
      - copied from r1427757, tomcat/trunk/test/webapp-3.0/bug5nnnn/
Removed:
    tomcat/tc7.0.x/trunk/test/webapp-3.0/bug50408.jsp
    tomcat/tc7.0.x/trunk/test/webapp-3.0/bug51544.jsp
    tomcat/tc7.0.x/trunk/test/webapp-3.0/bug52335.jsp
    tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53465.jsp
    tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53467].jsp
    tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53545.html
    tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53545.jsp
    tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53986.jsp
Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/test/javax/el/TestCompositeELResolver.java
    tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
    tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
    tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java
    tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspReader.java
    tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java
    tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java
    tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
    tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1427757,1427784

Modified: tomcat/tc7.0.x/trunk/test/javax/el/TestCompositeELResolver.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/javax/el/TestCompositeELResolver.java?rev=1427805&r1=1427804&r2=1427805&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/javax/el/TestCompositeELResolver.java (original)
+++ tomcat/tc7.0.x/trunk/test/javax/el/TestCompositeELResolver.java Wed Jan  2 14:54:16 2013
@@ -47,7 +47,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/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java?rev=1427805&r1=1427804&r2=1427805&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java Wed Jan
 2 14:54:16 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/tc7.0.x/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java?rev=1427805&r1=1427804&r2=1427805&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java Wed
Jan  2 14:54:16 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/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java?rev=1427805&r1=1427804&r2=1427805&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java Wed Jan  2 14:54:16 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/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspReader.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspReader.java?rev=1427805&r1=1427804&r2=1427805&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspReader.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspReader.java Wed Jan  2 14:54:16
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/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1427805&r1=1427804&r2=1427805&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java Wed Jan  2 14:54:16
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/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java?rev=1427805&r1=1427804&r2=1427805&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java Wed Jan 
2 14:54:16 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/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1427805&r1=1427804&r2=1427805&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java Wed Jan 
2 14:54:16 2013
@@ -496,7 +496,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/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml?rev=1427805&r1=1427804&r2=1427805&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml Wed Jan  2 14:54:16 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message