Rename webapp-3.0 test webapp to webapp.

Tests that are not explicitly designed for a specific web application version will remain in this new location. Tests that require an specific web application version to be declared in web.xml will be moved back to the (soon to be re-created) webapp-3.0 location git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1480976 13f79535-47bb-0310-9956-ffa450edef68
gocompile · May 10, 2013 · c40e1ee · c40e1ee
1 parent e52ed47
commit c40e1ee
Show file tree

Hide file tree

Showing 185 changed files with 130 additions and 130 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,8 +17,8 @@
 logs
 nbproject
 output
-# Next line commented out, because test/webapp-3.0-virtual-library and
-# test/webapp-3.0-virtual-webapp use it:
+# Next line commented out, because test/webapp-virtual-library and
+# test/webapp-virtual-webapp use it:
 # target
 work
 build.properties

diff --git a/build.xml b/build.xml
@@ -510,8 +510,8 @@
         <exclude name="**/org/apache/tomcat/dbcp/**"/>
         <exclude name="**/tomcat-deps/**"/>
         <!-- Exclude simple test files -->
-        <exclude name="test/webapp-3.0/bug53257/**/*.txt"/>
-        <exclude name="test/webapp-3.0-fragments/WEB-INF/classes/*.txt"/>
+        <exclude name="test/webapp/bug53257/**/*.txt"/>
+        <exclude name="test/webapp-fragments/WEB-INF/classes/*.txt"/>
         <exclude name="test/webresources/**"/>
       </fileset>
       <fileset dir="modules/jdbc-pool" >
@@ -1831,8 +1831,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
             <filename name="**/.project"/>
             <filename name="**/output/**"/>
             <!-- Commented out, because
-                 test/webapp-3.0-virtual-library and
-                 test/webapp-3.0-virtual-webapp use it:
+                 test/webapp-virtual-library and
+                 test/webapp-virtual-webapp use it:
             <filename name="**/target/**"/>
             -->
             <filename name="**/build.properties"/>

diff --git a/res/rat/rat-excludes.txt b/res/rat/rat-excludes.txt
@@ -51,7 +51,7 @@ output/dist/webapps/docs/api/package-list
 output/dist/webapps/docs/elapi/package-list
 output/dist/webapps/docs/jspapi/package-list
 output/dist/webapps/docs/servletapi/package-list
-output/dist/src/test/webapp-3.0/bug53257/*.txt
-output/dist/src/test/webapp-3.0-fragments/WEB-INF/classes/*.txt
-test/webapp-3.0/bug53257/*.txt
-test/webapp-3.0-fragments/WEB-INF/classes/*.txt
+output/dist/src/test/webapp/bug53257/*.txt
+output/dist/src/test/webapp-fragments/WEB-INF/classes/*.txt
+test/webapp/bug53257/*.txt
+test/webapp-fragments/WEB-INF/classes/*.txt
diff --git a/test/javax/el/TestCompositeELResolver.java b/test/javax/el/TestCompositeELResolver.java
@@ -37,7 +37,7 @@ public class TestCompositeELResolver extends TomcatBaseTest {
     public void testBug50408() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir =  new File("test/webapp-3.0");
+        File appDir =  new File("test/webapp");
         // app dir is relative to server home
         StandardContext ctxt = (StandardContext) tomcat.addWebapp(null,
                 "/test", appDir.getAbsolutePath());

diff --git a/test/javax/servlet/jsp/TestPageContext.java b/test/javax/servlet/jsp/TestPageContext.java
@@ -33,7 +33,7 @@ public class TestPageContext extends TomcatBaseTest {
     public void testBug49196() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File("test/webapp");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 

diff --git a/test/org/apache/catalina/core/TestApplicationContext.java b/test/org/apache/catalina/core/TestApplicationContext.java
@@ -36,7 +36,7 @@ public class TestApplicationContext extends TomcatBaseTest {
     public void testBug53257() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File("test/webapp");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -59,7 +59,7 @@ public void testBug53257() throws Exception {
     public void testBug53467() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File("test/webapp");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -101,7 +101,7 @@ public void testAddServletWithServletNameEmptyString() {
     private ServletContext getServletContext() {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File("test/webapp");
         // app dir is relative to server home
         StandardContext standardContext = (StandardContext) tomcat.addWebapp(
                 null, "/test", appDir.getAbsolutePath());

diff --git a/test/org/apache/catalina/core/TestDefaultInstanceManager.java b/test/org/apache/catalina/core/TestDefaultInstanceManager.java
@@ -69,7 +69,7 @@ private DefaultInstanceManager doClassUnloadingPrep() throws Exception {
 
         // Create the context (don't use addWebapp as we want to modify the
         // JSP Servlet settings).
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File("test/webapp");
         StandardContext ctxt = (StandardContext) tomcat.addContext(
                 null, "/test", appDir.getAbsolutePath());
 

diff --git a/test/org/apache/catalina/core/TestStandardContext.java b/test/org/apache/catalina/core/TestStandardContext.java
@@ -190,7 +190,7 @@ public void testWebappLoaderStartFail() throws Exception {
         ((ContainerBase) tomcat.getHost()).setStartChildren(false);
 
         FailingWebappLoader loader = new FailingWebappLoader();
-        File root = new File("test/webapp-3.0");
+        File root = new File("test/webapp");
         Context context = tomcat.addWebapp("", root.getAbsolutePath());
         context.setLoader(loader);
 
@@ -226,7 +226,7 @@ public void testWebappListenerConfigureFail() throws Exception {
         ((ContainerBase) tomcat.getHost()).setStartChildren(false);
 
         FailingLifecycleListener listener = new FailingLifecycleListener();
-        File root = new File("test/webapp-3.0");
+        File root = new File("test/webapp");
         Context context = tomcat.addWebapp("", root.getAbsolutePath());
         context.addLifecycleListener(listener);
 
@@ -286,7 +286,7 @@ public void testBug49922() throws Exception {
         // Set up a container
         Tomcat tomcat = getTomcatInstance();
 
-        File root = new File("test/webapp-3.0");
+        File root = new File("test/webapp");
         tomcat.addWebapp("", root.getAbsolutePath());
 
         tomcat.start();

diff --git a/test/org/apache/catalina/core/TestStandardContextResources.java b/test/org/apache/catalina/core/TestStandardContextResources.java
@@ -67,7 +67,7 @@ public void setUp() throws Exception {
     public void testResources() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0-fragments");
+        File appDir = new File("test/webapp-fragments");
         // app dir is relative to server home
         Context ctx = tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -104,7 +104,7 @@ public void testResourcesWebInfClasses() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
         // app dir is relative to server home
-        File appDir = new File("test/webapp-3.0-fragments");
+        File appDir = new File("test/webapp-fragments");
 
         // Need to cast to be able to set StandardContext specific attribute
         StandardContext ctxt = (StandardContext)
@@ -131,7 +131,7 @@ public void testResourcesWebInfClasses() throws Exception {
     public void testResourcesAbsoluteOrdering() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0-fragments");
+        File appDir = new File("test/webapp-fragments");
         // app dir is relative to server home
         StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
                 appDir.getAbsolutePath());
@@ -201,7 +201,7 @@ protected WebXml createWebXml() {
     public void testResources2() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0-fragments");
+        File appDir = new File("test/webapp-fragments");
         // app dir is relative to server home
         StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
                 appDir.getAbsolutePath());

diff --git a/test/org/apache/catalina/core/TestStandardWrapper.java b/test/org/apache/catalina/core/TestStandardWrapper.java
@@ -101,7 +101,7 @@ public void testSecurityAnnotationsWebXmlPriority() throws Exception {
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0-fragments");
+        File appDir = new File("test/webapp-fragments");
         tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
         tomcat.start();
@@ -122,7 +122,7 @@ public void testSecurityAnnotationsMetaDataPriority() throws Exception {
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File("test/webapp");
         tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
         tomcat.start();
@@ -152,7 +152,7 @@ public void testSecurityAnnotationsNoWebXmlConstraints() throws Exception {
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0-servletsecurity");
+        File appDir = new File("test/webapp-servletsecurity");
         tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
         tomcat.start();
@@ -171,7 +171,7 @@ public void testSecurityAnnotationsNoWebXmlLoginConfig() throws Exception {
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0-servletsecurity2");
+        File appDir = new File("test/webapp-servletsecurity2");
         tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
         tomcat.start();

diff --git a/test/org/apache/catalina/loader/TestVirtualContext.java b/test/org/apache/catalina/loader/TestVirtualContext.java
@@ -62,20 +62,20 @@ public void setUp() throws Exception {
     public void testVirtualClassLoader() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0-virtual-webapp/src/main/webapp");
+        File appDir = new File("test/webapp-virtual-webapp/src/main/webapp");
         // app dir is relative to server home
         StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
             appDir.getAbsolutePath());
 
         ctx.setResources(new StandardRoot(ctx));
-        File f1 = new File("test/webapp-3.0-virtual-webapp/target/classes");
-        File f2 = new File("test/webapp-3.0-virtual-library/target/classes");
+        File f1 = new File("test/webapp-virtual-webapp/target/classes");
+        File f2 = new File("test/webapp-virtual-library/target/classes");
         File f3 = new File(
-                "test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/classes");
+                "test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes");
         File f4 = new File(
-                "test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes");
-        File f5 = new File("test/webapp-3.0-virtual-webapp/src/main/misc");
-        File f6 = new File("test/webapp-3.0-virtual-webapp/src/main/webapp2");
+                "test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes");
+        File f5 = new File("test/webapp-virtual-webapp/src/main/misc");
+        File f6 = new File("test/webapp-virtual-webapp/src/main/webapp2");
         ctx.getResources().createWebResourceSet(
                 WebResourceRoot.ResourceSetType.POST, f1.getAbsolutePath(),
                 "/WEB-INF/classes", "/");
@@ -147,19 +147,19 @@ public void testVirtualClassLoader() throws Exception {
                     "/test/classpathGetResources.jsp?path=rsrc/").toString();
         assertTrue(
             allUrls,
-            allUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc") > 0);
+            allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc") > 0);
         assertTrue(
             allUrls,
-            allUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc") > 0);
+            allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc") > 0);
         assertTrue(
             allUrls,
-            allUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar!/rsrc") > 0);
+            allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar!/rsrc") > 0);
         assertTrue(
             allUrls,
-            allUrls.indexOf("/test/webapp-3.0-virtual-webapp/target/classes/rsrc") > 0);
+            allUrls.indexOf("/test/webapp-virtual-webapp/target/classes/rsrc") > 0);
         assertTrue(
             allUrls,
-            allUrls.indexOf("/test/webapp-3.0-virtual-library/target/classes/rsrc") > 0);
+            allUrls.indexOf("/test/webapp-virtual-library/target/classes/rsrc") > 0);
 
         // check that there's no duplicate in the URLs
         String[] allUrlsArray = allUrls.split("\\s+");
@@ -172,7 +172,7 @@ public void testVirtualClassLoader() throws Exception {
                     "/test/classpathGetResources.jsp?path=rsrc2/").toString();
         assertTrue(
             allRsrsc2ClasspathUrls,
-            allRsrsc2ClasspathUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc2") > 0);
+            allRsrsc2ClasspathUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc2") > 0);
 
         // tests context.getRealPath
 
@@ -184,7 +184,7 @@ public void testVirtualClassLoader() throws Exception {
         // Real paths depend on the OS and this test has to work on all
         // platforms so use File to convert the path to a platform specific form
         File f = new File(
-            "test/webapp-3.0-virtual-webapp/src/main/webapp/rsrc/resourceF.properties");
+            "test/webapp-virtual-webapp/src/main/webapp/rsrc/resourceF.properties");
         assertPageContains(
             "/test/contextGetRealPath.jsp?path=/rsrc/resourceF.properties",
             f.getPath());
@@ -254,7 +254,7 @@ public void testVirtualClassLoader() throws Exception {
     public void testAdditionalWebInfClassesPaths() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0-virtual-webapp/src/main/webapp");
+        File appDir = new File("test/webapp-virtual-webapp/src/main/webapp");
         // app dir is relative to server home
         StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
             appDir.getAbsolutePath());
@@ -277,8 +277,8 @@ public void testAdditionalWebInfClassesPaths() throws Exception {
         annotatedServletClassOutputStream.close();
 
         ctx.setResources(new StandardRoot(ctx));
-        File f1 = new File("test/webapp-3.0-virtual-webapp/target/classes");
-        File f2 = new File("test/webapp-3.0-virtual-library/target/classes");
+        File f1 = new File("test/webapp-virtual-webapp/target/classes");
+        File f2 = new File("test/webapp-virtual-library/target/classes");
         ctx.getResources().createWebResourceSet(
                 WebResourceRoot.ResourceSetType.POST, f1.getAbsolutePath(),
                 "/WEB-INF/classes", "/");

diff --git a/test/org/apache/catalina/loader/TestVirtualWebappLoader.java b/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
@@ -42,7 +42,7 @@ public void testModified() throws Exception {
     @Test
     public void testStartInternal() throws Exception {
         Tomcat tomcat = getTomcatInstance();
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File("test/webapp");
         // Must have a real docBase - just use temp
         StandardContext ctx =
             (StandardContext)tomcat.addContext("",  appDir.getAbsolutePath());
@@ -56,7 +56,7 @@ public void testStartInternal() throws Exception {
         ctx.setResources(new StandardRoot(ctx));
         ctx.resourcesStart();
 
-        File f1 = new File("test/webapp-3.0-fragments/WEB-INF/lib");
+        File f1 = new File("test/webapp-fragments/WEB-INF/lib");
         ctx.getResources().createWebResourceSet(
                 WebResourceRoot.ResourceSetType.POST, f1.getAbsolutePath(),
                 "/WEB-INF/lib", "/");

diff --git a/test/org/apache/catalina/mapper/TestMapperWelcomeFiles.java b/test/org/apache/catalina/mapper/TestMapperWelcomeFiles.java
@@ -39,7 +39,7 @@ public void testWelcomeFileNotStrict() throws Exception {
 
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File("test/webapp");
 
         StandardContext ctxt = (StandardContext) tomcat.addWebapp(null, "/test",
                 appDir.getAbsolutePath());
@@ -67,7 +67,7 @@ public void testWelcomeFileStrict() throws Exception {
 
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File("test/webapp");
 
         StandardContext ctxt = (StandardContext) tomcat.addWebapp(null, "/test",
                 appDir.getAbsolutePath());

diff --git a/test/org/apache/catalina/startup/TestContextConfig.java b/test/org/apache/catalina/startup/TestContextConfig.java
@@ -53,7 +53,7 @@ private void doTestOverrideDefaultServletWithSCI(String servletName)
 
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File("test/webapp");
         StandardContext ctxt = (StandardContext) tomcat.addContext(null,
                 "/test", appDir.getAbsolutePath());
         ctxt.setDefaultWebXml(new File("conf/web.xml").getAbsolutePath());
@@ -71,7 +71,7 @@ private void doTestOverrideDefaultServletWithSCI(String servletName)
     public void testBug51396() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir =  new File("test/webapp-3.0-fragments");
+        File appDir =  new File("test/webapp-fragments");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -84,7 +84,7 @@ public void testBug51396() throws Exception {
     public void testBug53574() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File("test/webapp");
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
         tomcat.start();
@@ -96,7 +96,7 @@ public void testBug53574() throws Exception {
     public void testBug54262() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0-fragments-empty-absolute-ordering");
+        File appDir = new File("test/webapp-fragments-empty-absolute-ordering");
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
         tomcat.start();
@@ -111,7 +111,7 @@ public void testBug54262() throws Exception {
     public void testBug54379() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0-fragments");
+        File appDir = new File("test/webapp-fragments");
         Context context =
                 tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -130,7 +130,7 @@ public void testBug54379() throws Exception {
     public void testBug54448and54450() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0-fragments");
+        File appDir = new File("test/webapp-fragments");
         Context context = tomcat.addWebapp(null, "/test",
                 appDir.getAbsolutePath());