This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit dd5cbcf166cb6a65124234df4e5fe7ae8e76b7f0 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Jul 23 22:18:47 2019 +0100 Rename webapp-3.0 to webapp to align with 8.5.x and ease back-ports --- .gitignore | 4 +-- build.xml | 8 ++--- res/rat/rat-excludes.txt | 16 ++++----- test/javax/el/TestCompositeELResolver.java | 2 +- test/javax/servlet/jsp/TestPageContext.java | 2 +- .../servlet/resources/TestSchemaValidation.java | 2 +- .../connector/TestCoyoteAdapterRequestFuzzing.java | 2 +- .../catalina/core/TestApplicationContext.java | 8 ++--- .../catalina/core/TestDefaultInstanceManager.java | 2 +- .../apache/catalina/core/TestStandardContext.java | 8 ++--- .../core/TestStandardContextResources.java | 10 +++--- .../apache/catalina/core/TestStandardWrapper.java | 8 ++--- .../catalina/ha/context/TestReplicatedContext.java | 2 +- .../apache/catalina/loader/TestVirtualContext.java | 36 ++++++++++----------- .../catalina/loader/TestVirtualWebappLoader.java | 4 +-- .../catalina/loader/TestWebappClassLoader.java | 4 +-- .../catalina/servlets/TestDefaultServlet.java | 4 +-- .../apache/catalina/startup/TestContextConfig.java | 14 ++++---- test/org/apache/catalina/startup/TestTomcat.java | 2 +- .../catalina/startup/TestWebappServiceLoader.java | 2 +- .../coyote/ajp/TestAbstractAjpProcessor.java | 2 +- .../coyote/http11/TestAbstractHttp11Processor.java | 14 ++++---- test/org/apache/el/TestELInJsp.java | 36 ++++++++++----------- test/org/apache/jasper/compiler/TestCompiler.java | 26 +++++++-------- .../jasper/compiler/TestELInterpreterFactory.java | 2 +- test/org/apache/jasper/compiler/TestGenerator.java | 16 ++++----- test/org/apache/jasper/compiler/TestJspConfig.java | 2 +- .../jasper/compiler/TestJspDocumentParser.java | 8 ++--- test/org/apache/jasper/compiler/TestJspReader.java | 2 +- .../jasper/compiler/TestNodeIntegration.java | 2 +- test/org/apache/jasper/compiler/TestParser.java | 32 +++++++++--------- .../compiler/TestParserNoStrictWhitespace.java | 10 +++--- .../jasper/compiler/TestScriptingVariabler.java | 6 ++-- .../jasper/compiler/TestTagPluginManager.java | 2 +- test/org/apache/jasper/compiler/TestValidator.java | 4 +-- .../jasper/runtime/TestCustomHttpJspPage.java | 2 +- .../jasper/runtime/TestJspContextWrapper.java | 2 +- .../apache/jasper/runtime/TestJspWriterImpl.java | 4 +-- .../apache/jasper/runtime/TestPageContextImpl.java | 6 ++-- test/org/apache/naming/TestEnvEntry.java | 4 +-- .../naming/resources/TestFileDirContext.java | 2 +- .../apache/naming/resources/TestNamingContext.java | 2 +- .../apache/naming/resources/TestWarDirContext.java | 6 ++-- .../tomcat/util/http/mapper/TestMapperWebapps.java | 6 ++-- .../WEB-INF/lib/resources.jar | Bin .../WEB-INF/web.xml | 0 .../'singlequote2.jsp | 0 .../WEB-INF/classes/#Bug51584.txt | 0 .../classes/META-INF/resources/resourceG.jsp | 0 .../WEB-INF/lib/resources.jar | Bin .../WEB-INF/lib/resources2.jar | Bin .../WEB-INF/web.xml | 0 .../bug51396.jsp | 0 .../folder/resourceC.jsp | 0 .../folder/resourceE.jsp | 0 .../jndi.jsp | 0 .../resourceA.jsp | 0 .../warDirContext.jsp | 0 .../WEB-INF/web.xml | 0 .../WEB-INF/web.xml | 0 .../protected.jsp | 0 .../unprotected.jsp | 0 .../target/classes/META-INF/C.tld | 0 .../META-INF/resources/rsrc/resourceE.properties | 0 .../target/classes/rsrc/resourceC.properties | 0 .../src/main/lib/META-INF/B.tld | 0 .../src/main/lib/rsrc/resourceD.properties | 0 .../src/main/misc/resourceI.properties | 0 .../src/main/webapp/WEB-INF/A.tld | 0 .../WEB-INF/classes/rsrc/resourceA.properties | 0 .../src/main/webapp/WEB-INF/lib/rsrc.jar | Bin .../src/main/webapp/WEB-INF/web.xml | 0 .../main/webapp/classpathGetResourceAsStream.jsp | 0 .../classpathGetResourceUrlThenGetStream.jsp | 0 .../src/main/webapp/classpathGetResources.jsp | 0 .../src/main/webapp/contextGetRealPath.jsp | 0 .../src/main/webapp/contextGetResource.jsp | 0 .../src/main/webapp/contextGetResourcePaths.jsp | 0 .../src/main/webapp/rsrc/resourceF.properties | 0 .../src/main/webapp/testTlds.jsp | 0 .../src/main/webapp2/WEB-INF/D.tld | 0 .../WEB-INF/classes/rsrc/resourceG.properties | 0 .../WEB-INF/classes/rsrc2/resourceK.properties | 0 .../src/main/webapp2/rsrc/resourceF.properties | 2 +- .../src/main/webapp2/rsrc/resourceH.properties | 0 .../src/main/webapp2/rsrc2/resourceJ.properties | 0 .../target/classes/rsrc/resourceB.properties | 0 test/{webapp-3.0 => webapp}/404.html | 0 test/{webapp-3.0 => webapp}/WEB-INF/bug53545.tld | 0 test/{webapp-3.0 => webapp}/WEB-INF/bugs.tld | 0 .../WEB-INF/classes/META-INF/bug55807.tld | 0 .../META-INF/org.apache.jasper/tagPlugins.xml | 0 .../classes/org/apache/tomcat/Bug58096.class | Bin .../classes/org/apache/tomcat/Bug58096.java | 0 .../WEB-INF/jsp/bug53574.jsp | 0 test/{webapp-3.0 => webapp}/WEB-INF/listener.tld | 0 .../WEB-INF/tags/bug42390.tag | 0 .../WEB-INF/tags/bug48668.tagx | 0 .../WEB-INF/tags/bug49297.tag | 0 .../WEB-INF/tags/bug55198.tagx | 0 .../WEB-INF/tags/bug56265.tagx | 0 .../WEB-INF/tags/bug58178.tag | 0 .../WEB-INF/tags/echo-deferred.tag | 0 .../WEB-INF/tags/echo-double.tag | 0 .../WEB-INF/tags/echo-long.tag | 0 .../WEB-INF/tags/echo-noel.tag | 0 test/{webapp-3.0 => webapp}/WEB-INF/tags/echo.tag | 0 .../WEB-INF/tags/implicit.tld | 0 test/{webapp-3.0 => webapp}/WEB-INF/tags11.tld | 0 test/{webapp-3.0 => webapp}/WEB-INF/tags12.tld | 0 test/{webapp-3.0 => webapp}/WEB-INF/tags20.tld | 0 test/{webapp-3.0 => webapp}/WEB-INF/tags21.tld | 0 test/{webapp-3.0 => webapp}/WEB-INF/test.tld | 0 test/{webapp-3.0 => webapp}/WEB-INF/web.xml | 0 test/{webapp-3.0 => webapp}/annotations.jsp | 0 test/{webapp-3.0 => webapp}/bug36923.jsp | 0 test/{webapp-3.0 => webapp}/bug42390.jsp | 0 test/{webapp-3.0 => webapp}/bug42565.jsp | 0 test/{webapp-3.0 => webapp}/bug44994.jsp | 0 test/{webapp-3.0 => webapp}/bug45nnn/bug45015a.jsp | 0 test/{webapp-3.0 => webapp}/bug45nnn/bug45015b.jsp | 0 test/{webapp-3.0 => webapp}/bug45nnn/bug45015c.jsp | 0 test/{webapp-3.0 => webapp}/bug45nnn/bug45427.jsp | 0 test/{webapp-3.0 => webapp}/bug45nnn/bug45451.jspf | 0 test/{webapp-3.0 => webapp}/bug45nnn/bug45451a.jsp | 0 test/{webapp-3.0 => webapp}/bug45nnn/bug45451b.jsp | 0 test/{webapp-3.0 => webapp}/bug45nnn/bug45451c.jsp | 0 .../{webapp-3.0 => webapp}/bug45nnn/bug45451d.jspx | 0 test/{webapp-3.0 => webapp}/bug45nnn/bug45451e.jsp | 0 test/{webapp-3.0 => webapp}/bug45nnn/bug45511.jsp | 0 test/{webapp-3.0 => webapp}/bug46381.jsp | 0 test/{webapp-3.0 => webapp}/bug46596.jsp | 0 test/{webapp-3.0 => webapp}/bug47331.jsp | 0 test/{webapp-3.0 => webapp}/bug47413.jsp | 0 test/{webapp-3.0 => webapp}/bug47977.jspx | 0 test/{webapp-3.0 => webapp}/bug48nnn/bug48112.jsp | 0 test/{webapp-3.0 => webapp}/bug48nnn/bug48616.jsp | 0 test/{webapp-3.0 => webapp}/bug48nnn/bug48616b.jsp | 0 test/{webapp-3.0 => webapp}/bug48nnn/bug48627.jsp | 0 test/{webapp-3.0 => webapp}/bug48nnn/bug48668a.jsp | 0 test/{webapp-3.0 => webapp}/bug48nnn/bug48668b.jsp | 0 .../bug48nnn/bug48701-TVI-NFA.jsp | 0 .../bug48nnn/bug48701-TVI-NG.jsp | 0 .../bug48nnn/bug48701-UseBean.jsp | 0 .../bug48nnn/bug48701-VI.jsp | 0 .../bug48nnn/bug48701-fail.jsp | 0 test/{webapp-3.0 => webapp}/bug48nnn/bug48827.jspx | 0 test/{webapp-3.0 => webapp}/bug49nnn/bug49196.jsp | 0 .../bug49nnn/bug49297DuplicateAttr.jsp | 0 .../bug49nnn/bug49297MultipleImport1.jsp | 0 .../bug49nnn/bug49297MultipleImport2.jsp | 0 .../bug49nnn/bug49297MultiplePageEncoding1.jsp | 0 .../bug49nnn/bug49297MultiplePageEncoding2.jsp | 0 .../bug49nnn/bug49297MultiplePageEncoding3.jsp | 0 .../bug49nnn/bug49297MultiplePageEncoding4.jsp | 0 .../bug49nnn/bug49297NoSpace.jsp | 0 .../bug49nnn/bug49297Tag.jsp | 0 test/{webapp-3.0 => webapp}/bug49nnn/bug49555.jsp | 0 test/{webapp-3.0 => webapp}/bug49nnn/bug49726a.jsp | 0 test/{webapp-3.0 => webapp}/bug49nnn/bug49726b.jsp | 0 test/{webapp-3.0 => webapp}/bug49nnn/bug49799.jsp | 0 test/{webapp-3.0 => webapp}/bug53257/foo bar.jsp | 0 test/{webapp-3.0 => webapp}/bug53257/foo bar.txt | 0 .../bug53257/foo bar/foobar.jsp | 0 .../bug53257/foo bar/foobar.txt | 0 test/{webapp-3.0 => webapp}/bug53257/foo#bar.jsp | 0 test/{webapp-3.0 => webapp}/bug53257/foo#bar.txt | 0 test/{webapp-3.0 => webapp}/bug53257/foo%bar.jsp | 0 test/{webapp-3.0 => webapp}/bug53257/foo%bar.txt | 0 test/{webapp-3.0 => webapp}/bug53257/foo&bar.jsp | 0 test/{webapp-3.0 => webapp}/bug53257/foo&bar.txt | 0 test/{webapp-3.0 => webapp}/bug53257/foo+bar.jsp | 0 test/{webapp-3.0 => webapp}/bug53257/foo+bar.txt | 0 test/{webapp-3.0 => webapp}/bug53257/foo;bar.jsp | 0 test/{webapp-3.0 => webapp}/bug53257/foo;bar.txt | 0 test/{webapp-3.0 => webapp}/bug53257/index.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug50408.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug51544.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug52335.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug53465.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug53467].jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug53545.html | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug53545.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug53986.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug54241a.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug54241b.jsp | 0 .../{webapp-3.0 => webapp}/bug5nnnn/bug54801a.jspx | 0 .../{webapp-3.0 => webapp}/bug5nnnn/bug54801b.jspx | 0 .../{webapp-3.0 => webapp}/bug5nnnn/bug54821a.jspx | 0 .../{webapp-3.0 => webapp}/bug5nnnn/bug54821b.jspx | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug55198.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug55642a.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug55642b.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug55807.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug56029.jspx | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug56147.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug56265.jsp | 0 .../bug5nnnn/bug56334and56561.jspx | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug56529.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug56581.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug56612.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug57601.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug57601.txt | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug58096.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug58178.jsp | 0 test/{webapp-3.0 => webapp}/bug5nnnn/bug58444.jsp | 0 test/{webapp-3.0 => webapp}/bug6nnnn/bug60431.jsp | 0 test/{webapp-3.0 => webapp}/echo-params.jsp | 0 test/{webapp-3.0 => webapp}/el-as-literal.jsp | 0 test/{webapp-3.0 => webapp}/el-method.jsp | 0 .../el-misc-no-quote-attribute-el.jsp | 0 .../el-misc-with-quote-attribute-el.jsp | 0 test/{webapp-3.0 => webapp}/index.html | 0 test/{webapp-3.0 => webapp}/jsp/pageContext1.jsp | 0 test/{webapp-3.0 => webapp}/jsp/pageContext2.jsp | 0 test/{webapp-3.0 => webapp}/script-expr.jsp | 0 test/{webapp-3.0 => webapp}/tld-versions.jsp | 0 .../{webapp-3.0 => webapp}/welcome-files/index.jsp | 0 .../welcome-files/sub/.gitignore | 0 219 files changed, 170 insertions(+), 170 deletions(-) diff --git a/.gitignore b/.gitignore index d4d5202..69822ba 100644 --- 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 index 1e40448..7853fb9 100644 --- a/build.xml +++ b/build.xml @@ -570,8 +570,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 developer specific local files --> <exclude name="build.properties" /> <exclude name="res/maven/mvn.properties" /> @@ -2172,8 +2172,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 index 250a20f..163fac3 100644 --- a/res/rat/rat-excludes.txt +++ b/res/rat/rat-excludes.txt @@ -69,14 +69,14 @@ output/dist/src/test/org/apache/coyote/http11/filters/bug52121-part2 test/org/apache/coyote/http11/filters/bug52121-part1 test/org/apache/coyote/http11/filters/bug52121-part2 -output/dist/src/test/webapp-3.0/404.html -output/dist/src/test/webapp-3.0/bug53257/*.txt -output/dist/src/test/webapp-3.0/bug53257/foo bar/foobar.txt -output/dist/src/test/webapp-3.0-fragments/WEB-INF/classes/*.txt -test/webapp-3.0/404.html -test/webapp-3.0/bug53257/*.txt -test/webapp-3.0/bug53257/foo bar/foobar.txt -test/webapp-3.0-fragments/WEB-INF/classes/*.txt +output/dist/src/test/webapp/404.html +output/dist/src/test/webapp/bug53257/*.txt +output/dist/src/test/webapp/bug53257/foo bar/foobar.txt +output/dist/src/test/webapp-fragments/WEB-INF/classes/*.txt +test/webapp/404.html +test/webapp/bug53257/*.txt +test/webapp/bug53257/foo bar/foobar.txt +test/webapp-fragments/WEB-INF/classes/*.txt build.properties diff --git a/test/javax/el/TestCompositeELResolver.java b/test/javax/el/TestCompositeELResolver.java index a7e38ca..cdd1d20 100644 --- a/test/javax/el/TestCompositeELResolver.java +++ b/test/javax/el/TestCompositeELResolver.java @@ -34,7 +34,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 index 0e280f9..7b15c91 100644 --- a/test/javax/servlet/jsp/TestPageContext.java +++ b/test/javax/servlet/jsp/TestPageContext.java @@ -32,7 +32,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/javax/servlet/resources/TestSchemaValidation.java b/test/javax/servlet/resources/TestSchemaValidation.java index cbfc42d..c7710fc 100644 --- a/test/javax/servlet/resources/TestSchemaValidation.java +++ b/test/javax/servlet/resources/TestSchemaValidation.java @@ -96,7 +96,7 @@ public class TestSchemaValidation { digester.setErrorHandler(handler); digester.push(new WebXml()); WebXml desc = (WebXml) digester.parse( - new File("test/webapp-3.0/WEB-INF/web.xml")); + new File("test/webapp/WEB-INF/web.xml")); Assert.assertEquals("3.0", desc.getVersion()); Assert.assertEquals(0, handler.getErrors().size()); Assert.assertEquals(0, handler.getWarnings().size()); diff --git a/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java b/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java index 0c6f520..453e04a 100644 --- a/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java +++ b/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java @@ -65,7 +65,7 @@ public class TestCoyoteAdapterRequestFuzzing extends TomcatBaseTest { public void doTest() throws Exception { Tomcat tomcat = getTomcatInstance(); - File appDir = new File("test/webapp-3.0"); + File appDir = new File("test/webapp"); Context ctxt = tomcat.addContext("", appDir.getAbsolutePath()); Tomcat.addServlet(ctxt, "default", DefaultServlet.class.getName()); ctxt.addServletMapping("/", "default"); diff --git a/test/org/apache/catalina/core/TestApplicationContext.java b/test/org/apache/catalina/core/TestApplicationContext.java index 81c9c9d..09bbde0 100644 --- a/test/org/apache/catalina/core/TestApplicationContext.java +++ b/test/org/apache/catalina/core/TestApplicationContext.java @@ -46,7 +46,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()); @@ -69,7 +69,7 @@ public class TestApplicationContext extends TomcatBaseTest { 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()); @@ -112,7 +112,7 @@ public class TestApplicationContext extends TomcatBaseTest { public void testGetJspConfigDescriptor() 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 standardContext = (StandardContext) tomcat.addWebapp( null, "/test", appDir.getAbsolutePath()); @@ -130,7 +130,7 @@ public class TestApplicationContext extends TomcatBaseTest { 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 index 9f76303..980fca1 100644 --- a/test/org/apache/catalina/core/TestDefaultInstanceManager.java +++ b/test/org/apache/catalina/core/TestDefaultInstanceManager.java @@ -74,7 +74,7 @@ public class TestDefaultInstanceManager extends TomcatBaseTest { // 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 index 46a3d39..4d27958 100644 --- a/test/org/apache/catalina/core/TestStandardContext.java +++ b/test/org/apache/catalina/core/TestStandardContext.java @@ -190,7 +190,7 @@ public class TestStandardContext extends TomcatBaseTest { ((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 class TestStandardContext extends TomcatBaseTest { ((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 class TestStandardContext extends TomcatBaseTest { // 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(); @@ -790,7 +790,7 @@ public class TestStandardContext extends TomcatBaseTest { // Set up a container Tomcat tomcat = getTomcatInstance(); - File docBase = new File("test/webapp-3.0"); + File docBase = new File("test/webapp"); Context ctx = tomcat.addContext("", docBase.getAbsolutePath()); // Start the context diff --git a/test/org/apache/catalina/core/TestStandardContextResources.java b/test/org/apache/catalina/core/TestStandardContextResources.java index 1c3edc1..eab5797 100644 --- a/test/org/apache/catalina/core/TestStandardContextResources.java +++ b/test/org/apache/catalina/core/TestStandardContextResources.java @@ -67,7 +67,7 @@ public class TestStandardContextResources extends TomcatBaseTest { 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()); @@ -105,7 +105,7 @@ public class TestStandardContextResources extends TomcatBaseTest { 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) @@ -132,7 +132,7 @@ public class TestStandardContextResources extends TomcatBaseTest { 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()); @@ -202,7 +202,7 @@ public class TestStandardContextResources extends TomcatBaseTest { 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()); @@ -231,7 +231,7 @@ public class TestStandardContextResources extends TomcatBaseTest { public void testResourceCaching() 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 index 0da1707..3233929 100644 --- a/test/org/apache/catalina/core/TestStandardWrapper.java +++ b/test/org/apache/catalina/core/TestStandardWrapper.java @@ -98,7 +98,7 @@ public class TestStandardWrapper extends TomcatBaseTest { // 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(); @@ -119,7 +119,7 @@ public class TestStandardWrapper extends TomcatBaseTest { // 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(); @@ -149,7 +149,7 @@ public class TestStandardWrapper extends TomcatBaseTest { // 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(); @@ -168,7 +168,7 @@ public class TestStandardWrapper extends TomcatBaseTest { // 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/ha/context/TestReplicatedContext.java b/test/org/apache/catalina/ha/context/TestReplicatedContext.java index 61aea86..9c1a858 100644 --- a/test/org/apache/catalina/ha/context/TestReplicatedContext.java +++ b/test/org/apache/catalina/ha/context/TestReplicatedContext.java @@ -45,7 +45,7 @@ public class TestReplicatedContext extends TomcatBaseTest { ((StandardHost) host).setContextClass(ReplicatedContext.class.getName()); } - File root = new File("test/webapp-3.0"); + File root = new File("test/webapp"); Context context = tomcat.addWebapp(host, "", root.getAbsolutePath()); Tomcat.addServlet(context, "test", new AccessContextServlet()); diff --git a/test/org/apache/catalina/loader/TestVirtualContext.java b/test/org/apache/catalina/loader/TestVirtualContext.java index e2e3292..5f12011 100644 --- a/test/org/apache/catalina/loader/TestVirtualContext.java +++ b/test/org/apache/catalina/loader/TestVirtualContext.java @@ -58,22 +58,22 @@ public class TestVirtualContext extends TomcatBaseTest { 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()); VirtualWebappLoader loader = new VirtualWebappLoader(ctx.getParentClassLoader()); loader.setVirtualClasspath(// - "test/webapp-3.0-virtual-webapp/target/classes;" + // - "test/webapp-3.0-virtual-library/target/classes;" + // - "test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/classes;" + // - "test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes"); + "test/webapp-virtual-webapp/target/classes;" + // + "test/webapp-virtual-library/target/classes;" + // + "test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes;" + // + "test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes"); ctx.setLoader(loader); - String extraMappings = "/=test/webapp-3.0-virtual-webapp/src/main/webapp2" + // - ",/other=test/webapp-3.0-virtual-webapp/src/main/misc" + // - ",/WEB-INF/classes=test/webapp-3.0-virtual-webapp/target/classes"; + String extraMappings = "/=test/webapp-virtual-webapp/src/main/webapp2" + // + ",/other=test/webapp-virtual-webapp/src/main/misc" + // + ",/WEB-INF/classes=test/webapp-virtual-webapp/target/classes"; VirtualDirContext resources = new VirtualDirContext(); resources.setExtraResourcePaths(extraMappings); ctx.setResources(resources); @@ -129,19 +129,19 @@ public class TestVirtualContext extends TomcatBaseTest { "/test/classpathGetResources.jsp?path=rsrc/").toString(); Assert.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); Assert.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); Assert.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); Assert.assertTrue( allUrls, - allUrls.indexOf("/test/webapp-3.0-virtual-webapp/target/classes/rsrc") > 0); + allUrls.indexOf("/test/webapp-virtual-webapp/target/classes/rsrc") > 0); Assert.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+"); @@ -154,7 +154,7 @@ public class TestVirtualContext extends TomcatBaseTest { "/test/classpathGetResources.jsp?path=rsrc2/").toString(); Assert.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 @@ -166,7 +166,7 @@ public class TestVirtualContext extends TomcatBaseTest { // 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()); @@ -236,7 +236,7 @@ public class TestVirtualContext extends TomcatBaseTest { 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()); @@ -274,8 +274,8 @@ public class TestVirtualContext extends TomcatBaseTest { } VirtualWebappLoader loader = new VirtualWebappLoader(ctx.getParentClassLoader()); - loader.setVirtualClasspath("test/webapp-3.0-virtual-webapp/target/classes;" + // - "test/webapp-3.0-virtual-library/target/classes;" + // + loader.setVirtualClasspath("test/webapp-virtual-webapp/target/classes;" + // + "test/webapp-virtual-library/target/classes;" + // additionWebInfClasses.getAbsolutePath()); ctx.setLoader(loader); diff --git a/test/org/apache/catalina/loader/TestVirtualWebappLoader.java b/test/org/apache/catalina/loader/TestVirtualWebappLoader.java index 53b0f75..e6b59c5 100644 --- a/test/org/apache/catalina/loader/TestVirtualWebappLoader.java +++ b/test/org/apache/catalina/loader/TestVirtualWebappLoader.java @@ -38,7 +38,7 @@ public class TestVirtualWebappLoader extends TomcatBaseTest { @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()); @@ -49,7 +49,7 @@ public class TestVirtualWebappLoader extends TomcatBaseTest { ctx.setLoader(loader); ctx.setResources(new FileDirContext()); ctx.resourcesStart(); - File dir = new File("test/webapp-3.0-fragments/WEB-INF/lib"); + File dir = new File("test/webapp-fragments/WEB-INF/lib"); loader.setVirtualClasspath(dir.getAbsolutePath() + "/*.jar"); loader.start(); String[] repos = loader.getRepositories(); diff --git a/test/org/apache/catalina/loader/TestWebappClassLoader.java b/test/org/apache/catalina/loader/TestWebappClassLoader.java index 813d714..dadc847 100644 --- a/test/org/apache/catalina/loader/TestWebappClassLoader.java +++ b/test/org/apache/catalina/loader/TestWebappClassLoader.java @@ -32,7 +32,7 @@ public class TestWebappClassLoader extends TomcatBaseTest { @Test public void testGetCodePath() 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 tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -45,7 +45,7 @@ public class TestWebappClassLoader extends TomcatBaseTest { Assert.assertEquals(HttpServletResponse.SC_OK, rc); // Build the expected location the same way the webapp base dir is built - File f = new File("test/webapp-3.0/WEB-INF/classes"); + File f = new File("test/webapp/WEB-INF/classes"); Assert.assertEquals(f.toURI().toURL().toString(), out.toString().trim()); } } diff --git a/test/org/apache/catalina/servlets/TestDefaultServlet.java b/test/org/apache/catalina/servlets/TestDefaultServlet.java index 54e97fe..40e5201 100644 --- a/test/org/apache/catalina/servlets/TestDefaultServlet.java +++ b/test/org/apache/catalina/servlets/TestDefaultServlet.java @@ -164,7 +164,7 @@ public class TestDefaultServlet extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); - File appDir = new File("test/webapp-3.0"); + File appDir = new File("test/webapp"); // app dir is relative to server home Context ctxt = tomcat.addContext("", appDir.getAbsolutePath()); @@ -279,7 +279,7 @@ public class TestDefaultServlet extends TomcatBaseTest { public void testBug57601() 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(); diff --git a/test/org/apache/catalina/startup/TestContextConfig.java b/test/org/apache/catalina/startup/TestContextConfig.java index 9632b73..9073100 100644 --- a/test/org/apache/catalina/startup/TestContextConfig.java +++ b/test/org/apache/catalina/startup/TestContextConfig.java @@ -53,7 +53,7 @@ public class TestContextConfig extends TomcatBaseTest { 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 @@ public class TestContextConfig extends TomcatBaseTest { 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 class TestContextConfig extends TomcatBaseTest { 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 class TestContextConfig extends TomcatBaseTest { 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 class TestContextConfig extends TomcatBaseTest { 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 class TestContextConfig extends TomcatBaseTest { 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()); @@ -150,7 +150,7 @@ public class TestContextConfig extends TomcatBaseTest { public void testBug55210() throws Exception { Tomcat tomcat = getTomcatInstance(); - File appDir = new File("test/webapp-3.0-fragments"); + File appDir = new File("test/webapp-fragments"); tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); tomcat.start(); diff --git a/test/org/apache/catalina/startup/TestTomcat.java b/test/org/apache/catalina/startup/TestTomcat.java index 81038ca..c59efcd 100644 --- a/test/org/apache/catalina/startup/TestTomcat.java +++ b/test/org/apache/catalina/startup/TestTomcat.java @@ -603,7 +603,7 @@ public class TestTomcat extends TomcatBaseTest { tomcat.getHost().setConfigClass(CustomContextConfig.class.getName()); - File docBase = new File("test/webapp-3.0"); + File docBase = new File("test/webapp"); tomcat.addWebapp("/test", docBase.getAbsolutePath()); tomcat.start(); diff --git a/test/org/apache/catalina/startup/TestWebappServiceLoader.java b/test/org/apache/catalina/startup/TestWebappServiceLoader.java index 8692f0e..5e30245 100644 --- a/test/org/apache/catalina/startup/TestWebappServiceLoader.java +++ b/test/org/apache/catalina/startup/TestWebappServiceLoader.java @@ -29,7 +29,7 @@ public class TestWebappServiceLoader extends TomcatBaseTest { @Test public void testWebapp() 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"); StandardContext ctxt = (StandardContext) tomcat.addContext(null, "/test", appDir.getAbsolutePath()); ctxt.addLifecycleListener(new ContextConfig()); tomcat.start(); diff --git a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java index 3f01182..93221e7 100644 --- a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java +++ b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java @@ -568,7 +568,7 @@ public class TestAbstractAjpProcessor extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); // Use the normal Tomcat ROOT context - 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/coyote/http11/TestAbstractHttp11Processor.java b/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java index 70f5f7c..5f518f2 100644 --- a/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java +++ b/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java @@ -134,7 +134,7 @@ public class TestAbstractHttp11Processor extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); // Use the normal Tomcat ROOT context - File root = new File("test/webapp-3.0"); + File root = new File("test/webapp"); tomcat.addWebapp("", root.getAbsolutePath()); tomcat.start(); @@ -159,7 +159,7 @@ public class TestAbstractHttp11Processor extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); // Use the normal Tomcat ROOT context - File root = new File("test/webapp-3.0"); + File root = new File("test/webapp"); tomcat.addWebapp("", root.getAbsolutePath()); tomcat.start(); @@ -187,7 +187,7 @@ public class TestAbstractHttp11Processor extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); // Use the normal Tomcat ROOT context - File root = new File("test/webapp-3.0"); + File root = new File("test/webapp"); tomcat.addWebapp("", root.getAbsolutePath()); tomcat.start(); @@ -230,7 +230,7 @@ public class TestAbstractHttp11Processor extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); // Use the normal Tomcat ROOT context - File root = new File("test/webapp-3.0"); + File root = new File("test/webapp"); tomcat.addWebapp("", root.getAbsolutePath()); tomcat.start(); @@ -264,7 +264,7 @@ public class TestAbstractHttp11Processor extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); // Use the normal Tomcat ROOT context - File root = new File("test/webapp-3.0"); + File root = new File("test/webapp"); tomcat.addWebapp("", root.getAbsolutePath()); tomcat.start(); @@ -295,7 +295,7 @@ public class TestAbstractHttp11Processor extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); // Use the normal Tomcat ROOT context - File root = new File("test/webapp-3.0"); + File root = new File("test/webapp"); tomcat.addWebapp("", root.getAbsolutePath()); tomcat.start(); @@ -324,7 +324,7 @@ public class TestAbstractHttp11Processor extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); // Use the normal Tomcat ROOT context - 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/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java index 665572f..70a6ea2 100644 --- a/test/org/apache/el/TestELInJsp.java +++ b/test/org/apache/el/TestELInJsp.java @@ -38,7 +38,7 @@ public class TestELInJsp extends TomcatBaseTest { public void testBug36923() 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()); @@ -55,7 +55,7 @@ public class TestELInJsp extends TomcatBaseTest { public void testBug42565() 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()); @@ -88,7 +88,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -108,7 +108,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -142,7 +142,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -258,7 +258,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -277,7 +277,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -294,7 +294,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -323,7 +323,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -339,7 +339,7 @@ public class TestELInJsp extends TomcatBaseTest { public void testBug49555() 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()); @@ -356,7 +356,7 @@ public class TestELInJsp extends TomcatBaseTest { public void testBug51544() 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()); @@ -384,7 +384,7 @@ public class TestELInJsp extends TomcatBaseTest { // 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()); @@ -431,7 +431,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -459,7 +459,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -480,7 +480,7 @@ public class TestELInJsp extends TomcatBaseTest { public void testBug56029() 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()); @@ -504,7 +504,7 @@ public class TestELInJsp extends TomcatBaseTest { public void testBug56147() 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 ctx = (StandardContext) tomcat.addWebapp( null, "/test", appDir.getAbsolutePath()); @@ -527,7 +527,7 @@ public class TestELInJsp extends TomcatBaseTest { public void testBug56612() 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()); @@ -545,7 +545,7 @@ public class TestELInJsp extends TomcatBaseTest { public void testBug60431() 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/jasper/compiler/TestCompiler.java b/test/org/apache/jasper/compiler/TestCompiler.java index 67dc010..f46f17c 100644 --- a/test/org/apache/jasper/compiler/TestCompiler.java +++ b/test/org/apache/jasper/compiler/TestCompiler.java @@ -37,7 +37,7 @@ public class TestCompiler extends TomcatBaseTest { public void testBug49726a() 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(); @@ -59,7 +59,7 @@ public class TestCompiler extends TomcatBaseTest { public void testBug49726b() 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(); @@ -81,7 +81,7 @@ public class TestCompiler extends TomcatBaseTest { public void testBug53257a() 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(); @@ -98,7 +98,7 @@ public class TestCompiler extends TomcatBaseTest { public void testBug53257b() 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(); @@ -114,7 +114,7 @@ public class TestCompiler extends TomcatBaseTest { public void testBug53257c() 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(); @@ -131,7 +131,7 @@ public class TestCompiler extends TomcatBaseTest { public void testBug53257d() 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(); @@ -148,7 +148,7 @@ public class TestCompiler extends TomcatBaseTest { public void testBug53257e() 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(); @@ -164,7 +164,7 @@ public class TestCompiler extends TomcatBaseTest { public void testBug53257f() 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(); @@ -180,7 +180,7 @@ public class TestCompiler extends TomcatBaseTest { public void testBug53257g() 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(); @@ -196,7 +196,7 @@ public class TestCompiler extends TomcatBaseTest { public void testBug53257z() 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(); @@ -211,7 +211,7 @@ public class TestCompiler extends TomcatBaseTest { public void testBug51584() throws Exception { Tomcat tomcat = getTomcatInstance(); - File appDir = new File("test/webapp-3.0-fragments"); + File appDir = new File("test/webapp-fragments"); tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); tomcat.start(); @@ -224,7 +224,7 @@ public class TestCompiler extends TomcatBaseTest { public void testBug55807() throws Exception { Tomcat tomcat = getTomcatInstance(); - File appDir = new File("test/webapp-3.0"); + File appDir = new File("test/webapp"); Context context = tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); ((StandardJarScanner) context.getJarScanner()).setScanAllDirectories(true); tomcat.start(); @@ -243,7 +243,7 @@ public class TestCompiler extends TomcatBaseTest { Assert.assertTrue(result.contains("<p>DependenciesCount: 1</p>")); // Check the right timestamp was used in the dependency - File tld = new File("test/webapp-3.0/WEB-INF/classes/META-INF/bug55807.tld"); + File tld = new File("test/webapp/WEB-INF/classes/META-INF/bug55807.tld"); String expected = "/WEB-INF/classes/META-INF/bug55807.tld : " + tld.lastModified() + "</p>"; Assert.assertTrue(result.contains(expected)); diff --git a/test/org/apache/jasper/compiler/TestELInterpreterFactory.java b/test/org/apache/jasper/compiler/TestELInterpreterFactory.java index a721302..1b5a8fe 100644 --- a/test/org/apache/jasper/compiler/TestELInterpreterFactory.java +++ b/test/org/apache/jasper/compiler/TestELInterpreterFactory.java @@ -47,7 +47,7 @@ public class TestELInterpreterFactory extends TomcatBaseTest { public void testBug54239() throws Exception { Tomcat tomcat = getTomcatInstance(); - File appDir = new File("test/webapp-3.0"); + File appDir = new File("test/webapp"); Context ctx = tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); tomcat.start(); diff --git a/test/org/apache/jasper/compiler/TestGenerator.java b/test/org/apache/jasper/compiler/TestGenerator.java index 0c57e78..a9b4377 100644 --- a/test/org/apache/jasper/compiler/TestGenerator.java +++ b/test/org/apache/jasper/compiler/TestGenerator.java @@ -47,7 +47,7 @@ public class TestGenerator extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -76,7 +76,7 @@ public class TestGenerator extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -93,7 +93,7 @@ public class TestGenerator extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -110,7 +110,7 @@ public class TestGenerator extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home StandardContext ctxt = (StandardContext) tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -151,7 +151,7 @@ public class TestGenerator extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -225,7 +225,7 @@ public class TestGenerator extends TomcatBaseTest { 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(); @@ -256,7 +256,7 @@ public class TestGenerator extends TomcatBaseTest { public void testBug56529() 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()); @@ -316,7 +316,7 @@ public class TestGenerator extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); diff --git a/test/org/apache/jasper/compiler/TestJspConfig.java b/test/org/apache/jasper/compiler/TestJspConfig.java index 510e5b0..48e3833 100644 --- a/test/org/apache/jasper/compiler/TestJspConfig.java +++ b/test/org/apache/jasper/compiler/TestJspConfig.java @@ -92,7 +92,7 @@ public class TestJspConfig extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); diff --git a/test/org/apache/jasper/compiler/TestJspDocumentParser.java b/test/org/apache/jasper/compiler/TestJspDocumentParser.java index c1a0647..67d46d7 100644 --- a/test/org/apache/jasper/compiler/TestJspDocumentParser.java +++ b/test/org/apache/jasper/compiler/TestJspDocumentParser.java @@ -36,7 +36,7 @@ public class TestJspDocumentParser extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -53,7 +53,7 @@ public class TestJspDocumentParser extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -74,7 +74,7 @@ public class TestJspDocumentParser extends TomcatBaseTest { public void testBug54801() 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()); @@ -95,7 +95,7 @@ public class TestJspDocumentParser extends TomcatBaseTest { public void testBug54821() 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/jasper/compiler/TestJspReader.java b/test/org/apache/jasper/compiler/TestJspReader.java index 673edb9..e275352 100644 --- a/test/org/apache/jasper/compiler/TestJspReader.java +++ b/test/org/apache/jasper/compiler/TestJspReader.java @@ -32,7 +32,7 @@ public class TestJspReader extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); tomcat.addWebapp(null, "", appDir.getAbsolutePath()); tomcat.start(); diff --git a/test/org/apache/jasper/compiler/TestNodeIntegration.java b/test/org/apache/jasper/compiler/TestNodeIntegration.java index fbdd183..bb2dc87 100644 --- a/test/org/apache/jasper/compiler/TestNodeIntegration.java +++ b/test/org/apache/jasper/compiler/TestNodeIntegration.java @@ -32,7 +32,7 @@ public class TestNodeIntegration extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "", appDir.getAbsolutePath()); diff --git a/test/org/apache/jasper/compiler/TestParser.java b/test/org/apache/jasper/compiler/TestParser.java index 717236f..c87b32b 100644 --- a/test/org/apache/jasper/compiler/TestParser.java +++ b/test/org/apache/jasper/compiler/TestParser.java @@ -39,7 +39,7 @@ public class TestParser extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -60,7 +60,7 @@ public class TestParser extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -105,7 +105,7 @@ public class TestParser extends TomcatBaseTest { public void testBug48668b() 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()); @@ -122,7 +122,7 @@ public class TestParser extends TomcatBaseTest { public void testBug49297NoSpaceStrict() 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()); @@ -139,7 +139,7 @@ public class TestParser extends TomcatBaseTest { public void testBug49297DuplicateAttr() 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()); @@ -157,7 +157,7 @@ public class TestParser extends TomcatBaseTest { 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()); @@ -177,7 +177,7 @@ public class TestParser extends TomcatBaseTest { 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()); @@ -197,7 +197,7 @@ public class TestParser extends TomcatBaseTest { 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()); @@ -216,7 +216,7 @@ public class TestParser extends TomcatBaseTest { 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()); @@ -235,7 +235,7 @@ public class TestParser extends TomcatBaseTest { 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()); @@ -254,7 +254,7 @@ public class TestParser extends TomcatBaseTest { 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()); @@ -273,7 +273,7 @@ public class TestParser extends TomcatBaseTest { 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()); @@ -293,7 +293,7 @@ public class TestParser extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -314,7 +314,7 @@ public class TestParser extends TomcatBaseTest { public void testBug55198() 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()); @@ -346,7 +346,7 @@ public class TestParser extends TomcatBaseTest { public void testBug56265() 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()); @@ -376,7 +376,7 @@ public class TestParser extends TomcatBaseTest { public void testBug56334And56561() 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/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java b/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java index 987a107..5f3caa0 100644 --- a/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java +++ b/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java @@ -47,7 +47,7 @@ public class TestParserNoStrictWhitespace extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -68,7 +68,7 @@ public class TestParserNoStrictWhitespace extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -113,7 +113,7 @@ public class TestParserNoStrictWhitespace extends TomcatBaseTest { public void testBug48668b() 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()); @@ -131,7 +131,7 @@ public class TestParserNoStrictWhitespace extends TomcatBaseTest { 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()); @@ -151,7 +151,7 @@ public class TestParserNoStrictWhitespace extends TomcatBaseTest { public void testBug49297DuplicateAttr() 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/jasper/compiler/TestScriptingVariabler.java b/test/org/apache/jasper/compiler/TestScriptingVariabler.java index cd65f1a..0f72fa2 100644 --- a/test/org/apache/jasper/compiler/TestScriptingVariabler.java +++ b/test/org/apache/jasper/compiler/TestScriptingVariabler.java @@ -38,7 +38,7 @@ public class TestScriptingVariabler extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -81,7 +81,7 @@ public class TestScriptingVariabler extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -103,7 +103,7 @@ public class TestScriptingVariabler extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); diff --git a/test/org/apache/jasper/compiler/TestTagPluginManager.java b/test/org/apache/jasper/compiler/TestTagPluginManager.java index bd2ce2d..aee7828 100644 --- a/test/org/apache/jasper/compiler/TestTagPluginManager.java +++ b/test/org/apache/jasper/compiler/TestTagPluginManager.java @@ -41,7 +41,7 @@ public class TestTagPluginManager extends TomcatBaseTest { public void testBug54240() throws Exception { Tomcat tomcat = getTomcatInstance(); - File appDir = new File("test/webapp-3.0"); + File appDir = new File("test/webapp"); Context ctx = tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); tomcat.start(); diff --git a/test/org/apache/jasper/compiler/TestValidator.java b/test/org/apache/jasper/compiler/TestValidator.java index 90a1e2b..15ec1fc 100644 --- a/test/org/apache/jasper/compiler/TestValidator.java +++ b/test/org/apache/jasper/compiler/TestValidator.java @@ -38,7 +38,7 @@ public class TestValidator extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -130,7 +130,7 @@ public class TestValidator extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); diff --git a/test/org/apache/jasper/runtime/TestCustomHttpJspPage.java b/test/org/apache/jasper/runtime/TestCustomHttpJspPage.java index a231618..5590c5f 100644 --- a/test/org/apache/jasper/runtime/TestCustomHttpJspPage.java +++ b/test/org/apache/jasper/runtime/TestCustomHttpJspPage.java @@ -36,7 +36,7 @@ public class TestCustomHttpJspPage extends TomcatBaseTest { public void testCustomBasePageWhenUsingTagFiles() 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(); diff --git a/test/org/apache/jasper/runtime/TestJspContextWrapper.java b/test/org/apache/jasper/runtime/TestJspContextWrapper.java index df09926..f41333c 100644 --- a/test/org/apache/jasper/runtime/TestJspContextWrapper.java +++ b/test/org/apache/jasper/runtime/TestJspContextWrapper.java @@ -34,7 +34,7 @@ public class TestJspContextWrapper extends TomcatBaseTest { public void testELTagFilePageContext() 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/org/apache/jasper/runtime/TestJspWriterImpl.java b/test/org/apache/jasper/runtime/TestJspWriterImpl.java index a9923db..bdda346 100644 --- a/test/org/apache/jasper/runtime/TestJspWriterImpl.java +++ b/test/org/apache/jasper/runtime/TestJspWriterImpl.java @@ -33,7 +33,7 @@ public class TestJspWriterImpl extends TomcatBaseTest { public void bug54241a() 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(); @@ -54,7 +54,7 @@ public class TestJspWriterImpl extends TomcatBaseTest { public void bug54241b() 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(); diff --git a/test/org/apache/jasper/runtime/TestPageContextImpl.java b/test/org/apache/jasper/runtime/TestPageContextImpl.java index 0d5e4a8..901267d 100644 --- a/test/org/apache/jasper/runtime/TestPageContextImpl.java +++ b/test/org/apache/jasper/runtime/TestPageContextImpl.java @@ -42,7 +42,7 @@ public class TestPageContextImpl extends TomcatBaseTest { public void testDoForward() 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(); @@ -63,7 +63,7 @@ public class TestPageContextImpl extends TomcatBaseTest { public void testDefaultBufferSize() 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 Context ctx = tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -83,7 +83,7 @@ public class TestPageContextImpl extends TomcatBaseTest { public void testIncludeThrowsIOException() 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(); diff --git a/test/org/apache/naming/TestEnvEntry.java b/test/org/apache/naming/TestEnvEntry.java index 658e9d2..7efd9c8 100644 --- a/test/org/apache/naming/TestEnvEntry.java +++ b/test/org/apache/naming/TestEnvEntry.java @@ -93,7 +93,7 @@ public class TestEnvEntry extends TomcatBaseTest { private void doTestJndiLookup(String jndiName, String expected) throws Exception { Tomcat tomcat = getTomcatInstance(); - File appDir = new File("test/webapp-3.0-fragments"); + File appDir = new File("test/webapp-fragments"); tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); tomcat.enableNaming(); @@ -114,7 +114,7 @@ public class TestEnvEntry extends TomcatBaseTest { private void doTestJndiInjection(String injectionName, String expected) 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()); Tomcat.addServlet(context, "InjectionServlet", "org.apache.naming.TesterInjectionServlet"); diff --git a/test/org/apache/naming/resources/TestFileDirContext.java b/test/org/apache/naming/resources/TestFileDirContext.java index 76e0a04..f6aeff0 100644 --- a/test/org/apache/naming/resources/TestFileDirContext.java +++ b/test/org/apache/naming/resources/TestFileDirContext.java @@ -33,7 +33,7 @@ public class TestFileDirContext extends TomcatBaseTest { public void testLookupResourceWithTrailingSlash() 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/naming/resources/TestNamingContext.java b/test/org/apache/naming/resources/TestNamingContext.java index e642df0..6d52c04 100644 --- a/test/org/apache/naming/resources/TestNamingContext.java +++ b/test/org/apache/naming/resources/TestNamingContext.java @@ -478,7 +478,7 @@ public class TestNamingContext extends TomcatBaseTest { tomcat.enableNaming(); File appDir = - new File("test/webapp-3.0"); + new File("test/webapp"); // app dir is relative to server home org.apache.catalina.Context ctxt = tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); diff --git a/test/org/apache/naming/resources/TestWarDirContext.java b/test/org/apache/naming/resources/TestWarDirContext.java index be83c5d..dd4def9 100644 --- a/test/org/apache/naming/resources/TestWarDirContext.java +++ b/test/org/apache/naming/resources/TestWarDirContext.java @@ -50,7 +50,7 @@ public class TestWarDirContext extends TomcatBaseTest { public void testLookupException() 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()); @@ -71,7 +71,7 @@ public class TestWarDirContext extends TomcatBaseTest { public void testReservedJNDIFileNamesWithCache() 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 ctxt = (StandardContext) tomcat.addWebapp( null, "/test", appDir.getAbsolutePath()); @@ -101,7 +101,7 @@ public class TestWarDirContext extends TomcatBaseTest { public void testReservedJNDIFileNamesNoCache() 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 ctxt = (StandardContext) tomcat.addWebapp( null, "/test", appDir.getAbsolutePath()); diff --git a/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java b/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java index a7c51e7..1d4f054 100644 --- a/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java +++ b/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java @@ -173,7 +173,7 @@ public class TestMapperWebapps extends TomcatBaseTest{ 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()); @@ -201,7 +201,7 @@ public class TestMapperWebapps extends TomcatBaseTest{ 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()); @@ -231,7 +231,7 @@ public class TestMapperWebapps extends TomcatBaseTest{ Tomcat tomcat = getTomcatInstance(); // Use standard test webapp as ROOT - File rootDir = new File("test/webapp-3.0"); + File rootDir = new File("test/webapp"); org.apache.catalina.Context root = tomcat.addWebapp(null, "", rootDir.getAbsolutePath()); diff --git a/test/webapp-3.0-fragments-empty-absolute-ordering/WEB-INF/lib/resources.jar b/test/webapp-fragments-empty-absolute-ordering/WEB-INF/lib/resources.jar similarity index 100% rename from test/webapp-3.0-fragments-empty-absolute-ordering/WEB-INF/lib/resources.jar rename to test/webapp-fragments-empty-absolute-ordering/WEB-INF/lib/resources.jar diff --git a/test/webapp-3.0-fragments-empty-absolute-ordering/WEB-INF/web.xml b/test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml similarity index 100% rename from test/webapp-3.0-fragments-empty-absolute-ordering/WEB-INF/web.xml rename to test/webapp-fragments-empty-absolute-ordering/WEB-INF/web.xml diff --git a/test/webapp-3.0-fragments/'singlequote2.jsp b/test/webapp-fragments/'singlequote2.jsp similarity index 100% rename from test/webapp-3.0-fragments/'singlequote2.jsp rename to test/webapp-fragments/'singlequote2.jsp diff --git a/test/webapp-3.0-fragments/WEB-INF/classes/#Bug51584.txt b/test/webapp-fragments/WEB-INF/classes/#Bug51584.txt similarity index 100% rename from test/webapp-3.0-fragments/WEB-INF/classes/#Bug51584.txt rename to test/webapp-fragments/WEB-INF/classes/#Bug51584.txt diff --git a/test/webapp-3.0-fragments/WEB-INF/classes/META-INF/resources/resourceG.jsp b/test/webapp-fragments/WEB-INF/classes/META-INF/resources/resourceG.jsp similarity index 100% rename from test/webapp-3.0-fragments/WEB-INF/classes/META-INF/resources/resourceG.jsp rename to test/webapp-fragments/WEB-INF/classes/META-INF/resources/resourceG.jsp diff --git a/test/webapp-3.0-fragments/WEB-INF/lib/resources.jar b/test/webapp-fragments/WEB-INF/lib/resources.jar similarity index 100% rename from test/webapp-3.0-fragments/WEB-INF/lib/resources.jar rename to test/webapp-fragments/WEB-INF/lib/resources.jar diff --git a/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar b/test/webapp-fragments/WEB-INF/lib/resources2.jar similarity index 100% rename from test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar rename to test/webapp-fragments/WEB-INF/lib/resources2.jar diff --git a/test/webapp-3.0-fragments/WEB-INF/web.xml b/test/webapp-fragments/WEB-INF/web.xml similarity index 100% rename from test/webapp-3.0-fragments/WEB-INF/web.xml rename to test/webapp-fragments/WEB-INF/web.xml diff --git a/test/webapp-3.0-fragments/bug51396.jsp b/test/webapp-fragments/bug51396.jsp similarity index 100% rename from test/webapp-3.0-fragments/bug51396.jsp rename to test/webapp-fragments/bug51396.jsp diff --git a/test/webapp-3.0-fragments/folder/resourceC.jsp b/test/webapp-fragments/folder/resourceC.jsp similarity index 100% rename from test/webapp-3.0-fragments/folder/resourceC.jsp rename to test/webapp-fragments/folder/resourceC.jsp diff --git a/test/webapp-3.0-fragments/folder/resourceE.jsp b/test/webapp-fragments/folder/resourceE.jsp similarity index 100% rename from test/webapp-3.0-fragments/folder/resourceE.jsp rename to test/webapp-fragments/folder/resourceE.jsp diff --git a/test/webapp-3.0-fragments/jndi.jsp b/test/webapp-fragments/jndi.jsp similarity index 100% rename from test/webapp-3.0-fragments/jndi.jsp rename to test/webapp-fragments/jndi.jsp diff --git a/test/webapp-3.0-fragments/resourceA.jsp b/test/webapp-fragments/resourceA.jsp similarity index 100% rename from test/webapp-3.0-fragments/resourceA.jsp rename to test/webapp-fragments/resourceA.jsp diff --git a/test/webapp-3.0-fragments/warDirContext.jsp b/test/webapp-fragments/warDirContext.jsp similarity index 100% rename from test/webapp-3.0-fragments/warDirContext.jsp rename to test/webapp-fragments/warDirContext.jsp diff --git a/test/webapp-3.0-servletsecurity/WEB-INF/web.xml b/test/webapp-servletsecurity/WEB-INF/web.xml similarity index 100% rename from test/webapp-3.0-servletsecurity/WEB-INF/web.xml rename to test/webapp-servletsecurity/WEB-INF/web.xml diff --git a/test/webapp-3.0-servletsecurity2/WEB-INF/web.xml b/test/webapp-servletsecurity2/WEB-INF/web.xml similarity index 100% rename from test/webapp-3.0-servletsecurity2/WEB-INF/web.xml rename to test/webapp-servletsecurity2/WEB-INF/web.xml diff --git a/test/webapp-3.0-servletsecurity2/protected.jsp b/test/webapp-servletsecurity2/protected.jsp similarity index 100% rename from test/webapp-3.0-servletsecurity2/protected.jsp rename to test/webapp-servletsecurity2/protected.jsp diff --git a/test/webapp-3.0-servletsecurity2/unprotected.jsp b/test/webapp-servletsecurity2/unprotected.jsp similarity index 100% rename from test/webapp-3.0-servletsecurity2/unprotected.jsp rename to test/webapp-servletsecurity2/unprotected.jsp diff --git a/test/webapp-3.0-virtual-library/target/classes/META-INF/C.tld b/test/webapp-virtual-library/target/classes/META-INF/C.tld similarity index 100% rename from test/webapp-3.0-virtual-library/target/classes/META-INF/C.tld rename to test/webapp-virtual-library/target/classes/META-INF/C.tld diff --git a/test/webapp-3.0-virtual-library/target/classes/META-INF/resources/rsrc/resourceE.properties b/test/webapp-virtual-library/target/classes/META-INF/resources/rsrc/resourceE.properties similarity index 100% rename from test/webapp-3.0-virtual-library/target/classes/META-INF/resources/rsrc/resourceE.properties rename to test/webapp-virtual-library/target/classes/META-INF/resources/rsrc/resourceE.properties diff --git a/test/webapp-3.0-virtual-library/target/classes/rsrc/resourceC.properties b/test/webapp-virtual-library/target/classes/rsrc/resourceC.properties similarity index 100% rename from test/webapp-3.0-virtual-library/target/classes/rsrc/resourceC.properties rename to test/webapp-virtual-library/target/classes/rsrc/resourceC.properties diff --git a/test/webapp-3.0-virtual-webapp/src/main/lib/META-INF/B.tld b/test/webapp-virtual-webapp/src/main/lib/META-INF/B.tld similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/lib/META-INF/B.tld rename to test/webapp-virtual-webapp/src/main/lib/META-INF/B.tld diff --git a/test/webapp-3.0-virtual-webapp/src/main/lib/rsrc/resourceD.properties b/test/webapp-virtual-webapp/src/main/lib/rsrc/resourceD.properties similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/lib/rsrc/resourceD.properties rename to test/webapp-virtual-webapp/src/main/lib/rsrc/resourceD.properties diff --git a/test/webapp-3.0-virtual-webapp/src/main/misc/resourceI.properties b/test/webapp-virtual-webapp/src/main/misc/resourceI.properties similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/misc/resourceI.properties rename to test/webapp-virtual-webapp/src/main/misc/resourceI.properties diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/A.tld b/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/A.tld similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/A.tld rename to test/webapp-virtual-webapp/src/main/webapp/WEB-INF/A.tld diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc/resourceA.properties b/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc/resourceA.properties similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc/resourceA.properties rename to test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc/resourceA.properties diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar b/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar rename to test/webapp-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/web.xml b/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/web.xml rename to test/webapp-virtual-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp/classpathGetResourceAsStream.jsp b/test/webapp-virtual-webapp/src/main/webapp/classpathGetResourceAsStream.jsp similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp/classpathGetResourceAsStream.jsp rename to test/webapp-virtual-webapp/src/main/webapp/classpathGetResourceAsStream.jsp diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp/classpathGetResourceUrlThenGetStream.jsp b/test/webapp-virtual-webapp/src/main/webapp/classpathGetResourceUrlThenGetStream.jsp similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp/classpathGetResourceUrlThenGetStream.jsp rename to test/webapp-virtual-webapp/src/main/webapp/classpathGetResourceUrlThenGetStream.jsp diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp/classpathGetResources.jsp b/test/webapp-virtual-webapp/src/main/webapp/classpathGetResources.jsp similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp/classpathGetResources.jsp rename to test/webapp-virtual-webapp/src/main/webapp/classpathGetResources.jsp diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp/contextGetRealPath.jsp b/test/webapp-virtual-webapp/src/main/webapp/contextGetRealPath.jsp similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp/contextGetRealPath.jsp rename to test/webapp-virtual-webapp/src/main/webapp/contextGetRealPath.jsp diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp/contextGetResource.jsp b/test/webapp-virtual-webapp/src/main/webapp/contextGetResource.jsp similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp/contextGetResource.jsp rename to test/webapp-virtual-webapp/src/main/webapp/contextGetResource.jsp diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp/contextGetResourcePaths.jsp b/test/webapp-virtual-webapp/src/main/webapp/contextGetResourcePaths.jsp similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp/contextGetResourcePaths.jsp rename to test/webapp-virtual-webapp/src/main/webapp/contextGetResourcePaths.jsp diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp/rsrc/resourceF.properties b/test/webapp-virtual-webapp/src/main/webapp/rsrc/resourceF.properties similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp/rsrc/resourceF.properties rename to test/webapp-virtual-webapp/src/main/webapp/rsrc/resourceF.properties diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp/testTlds.jsp b/test/webapp-virtual-webapp/src/main/webapp/testTlds.jsp similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp/testTlds.jsp rename to test/webapp-virtual-webapp/src/main/webapp/testTlds.jsp diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/D.tld b/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/D.tld similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/D.tld rename to test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/D.tld diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc/resourceG.properties b/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc/resourceG.properties similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc/resourceG.properties rename to test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc/resourceG.properties diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc2/resourceK.properties b/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc2/resourceK.properties similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc2/resourceK.properties rename to test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc2/resourceK.properties diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties b/test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties similarity index 92% rename from test/webapp-3.0-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties rename to test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties index a574e17..9e4fa83 100644 --- a/test/webapp-3.0-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties +++ b/test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties @@ -14,4 +14,4 @@ # limitations under the License. This file should not be served, it is masked by -/test/webapp-3.0-virtual-webapp/src/main/webapp/rsrc/resourceF.properties \ No newline at end of file +/test/webapp-virtual-webapp/src/main/webapp/rsrc/resourceF.properties \ No newline at end of file diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp2/rsrc/resourceH.properties b/test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceH.properties similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp2/rsrc/resourceH.properties rename to test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceH.properties diff --git a/test/webapp-3.0-virtual-webapp/src/main/webapp2/rsrc2/resourceJ.properties b/test/webapp-virtual-webapp/src/main/webapp2/rsrc2/resourceJ.properties similarity index 100% rename from test/webapp-3.0-virtual-webapp/src/main/webapp2/rsrc2/resourceJ.properties rename to test/webapp-virtual-webapp/src/main/webapp2/rsrc2/resourceJ.properties diff --git a/test/webapp-3.0-virtual-webapp/target/classes/rsrc/resourceB.properties b/test/webapp-virtual-webapp/target/classes/rsrc/resourceB.properties similarity index 100% rename from test/webapp-3.0-virtual-webapp/target/classes/rsrc/resourceB.properties rename to test/webapp-virtual-webapp/target/classes/rsrc/resourceB.properties diff --git a/test/webapp-3.0/404.html b/test/webapp/404.html similarity index 100% rename from test/webapp-3.0/404.html rename to test/webapp/404.html diff --git a/test/webapp-3.0/WEB-INF/bug53545.tld b/test/webapp/WEB-INF/bug53545.tld similarity index 100% rename from test/webapp-3.0/WEB-INF/bug53545.tld rename to test/webapp/WEB-INF/bug53545.tld diff --git a/test/webapp-3.0/WEB-INF/bugs.tld b/test/webapp/WEB-INF/bugs.tld similarity index 100% rename from test/webapp-3.0/WEB-INF/bugs.tld rename to test/webapp/WEB-INF/bugs.tld diff --git a/test/webapp-3.0/WEB-INF/classes/META-INF/bug55807.tld b/test/webapp/WEB-INF/classes/META-INF/bug55807.tld similarity index 100% rename from test/webapp-3.0/WEB-INF/classes/META-INF/bug55807.tld rename to test/webapp/WEB-INF/classes/META-INF/bug55807.tld diff --git a/test/webapp-3.0/WEB-INF/classes/META-INF/org.apache.jasper/tagPlugins.xml b/test/webapp/WEB-INF/classes/META-INF/org.apache.jasper/tagPlugins.xml similarity index 100% rename from test/webapp-3.0/WEB-INF/classes/META-INF/org.apache.jasper/tagPlugins.xml rename to test/webapp/WEB-INF/classes/META-INF/org.apache.jasper/tagPlugins.xml diff --git a/test/webapp-3.0/WEB-INF/classes/org/apache/tomcat/Bug58096.class b/test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.class similarity index 100% rename from test/webapp-3.0/WEB-INF/classes/org/apache/tomcat/Bug58096.class rename to test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.class diff --git a/test/webapp-3.0/WEB-INF/classes/org/apache/tomcat/Bug58096.java b/test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.java similarity index 100% rename from test/webapp-3.0/WEB-INF/classes/org/apache/tomcat/Bug58096.java rename to test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.java diff --git a/test/webapp-3.0/WEB-INF/jsp/bug53574.jsp b/test/webapp/WEB-INF/jsp/bug53574.jsp similarity index 100% rename from test/webapp-3.0/WEB-INF/jsp/bug53574.jsp rename to test/webapp/WEB-INF/jsp/bug53574.jsp diff --git a/test/webapp-3.0/WEB-INF/listener.tld b/test/webapp/WEB-INF/listener.tld similarity index 100% rename from test/webapp-3.0/WEB-INF/listener.tld rename to test/webapp/WEB-INF/listener.tld diff --git a/test/webapp-3.0/WEB-INF/tags/bug42390.tag b/test/webapp/WEB-INF/tags/bug42390.tag similarity index 100% rename from test/webapp-3.0/WEB-INF/tags/bug42390.tag rename to test/webapp/WEB-INF/tags/bug42390.tag diff --git a/test/webapp-3.0/WEB-INF/tags/bug48668.tagx b/test/webapp/WEB-INF/tags/bug48668.tagx similarity index 100% rename from test/webapp-3.0/WEB-INF/tags/bug48668.tagx rename to test/webapp/WEB-INF/tags/bug48668.tagx diff --git a/test/webapp-3.0/WEB-INF/tags/bug49297.tag b/test/webapp/WEB-INF/tags/bug49297.tag similarity index 100% rename from test/webapp-3.0/WEB-INF/tags/bug49297.tag rename to test/webapp/WEB-INF/tags/bug49297.tag diff --git a/test/webapp-3.0/WEB-INF/tags/bug55198.tagx b/test/webapp/WEB-INF/tags/bug55198.tagx similarity index 100% rename from test/webapp-3.0/WEB-INF/tags/bug55198.tagx rename to test/webapp/WEB-INF/tags/bug55198.tagx diff --git a/test/webapp-3.0/WEB-INF/tags/bug56265.tagx b/test/webapp/WEB-INF/tags/bug56265.tagx similarity index 100% rename from test/webapp-3.0/WEB-INF/tags/bug56265.tagx rename to test/webapp/WEB-INF/tags/bug56265.tagx diff --git a/test/webapp-3.0/WEB-INF/tags/bug58178.tag b/test/webapp/WEB-INF/tags/bug58178.tag similarity index 100% rename from test/webapp-3.0/WEB-INF/tags/bug58178.tag rename to test/webapp/WEB-INF/tags/bug58178.tag diff --git a/test/webapp-3.0/WEB-INF/tags/echo-deferred.tag b/test/webapp/WEB-INF/tags/echo-deferred.tag similarity index 100% rename from test/webapp-3.0/WEB-INF/tags/echo-deferred.tag rename to test/webapp/WEB-INF/tags/echo-deferred.tag diff --git a/test/webapp-3.0/WEB-INF/tags/echo-double.tag b/test/webapp/WEB-INF/tags/echo-double.tag similarity index 100% rename from test/webapp-3.0/WEB-INF/tags/echo-double.tag rename to test/webapp/WEB-INF/tags/echo-double.tag diff --git a/test/webapp-3.0/WEB-INF/tags/echo-long.tag b/test/webapp/WEB-INF/tags/echo-long.tag similarity index 100% rename from test/webapp-3.0/WEB-INF/tags/echo-long.tag rename to test/webapp/WEB-INF/tags/echo-long.tag diff --git a/test/webapp-3.0/WEB-INF/tags/echo-noel.tag b/test/webapp/WEB-INF/tags/echo-noel.tag similarity index 100% rename from test/webapp-3.0/WEB-INF/tags/echo-noel.tag rename to test/webapp/WEB-INF/tags/echo-noel.tag diff --git a/test/webapp-3.0/WEB-INF/tags/echo.tag b/test/webapp/WEB-INF/tags/echo.tag similarity index 100% rename from test/webapp-3.0/WEB-INF/tags/echo.tag rename to test/webapp/WEB-INF/tags/echo.tag diff --git a/test/webapp-3.0/WEB-INF/tags/implicit.tld b/test/webapp/WEB-INF/tags/implicit.tld similarity index 100% rename from test/webapp-3.0/WEB-INF/tags/implicit.tld rename to test/webapp/WEB-INF/tags/implicit.tld diff --git a/test/webapp-3.0/WEB-INF/tags11.tld b/test/webapp/WEB-INF/tags11.tld similarity index 100% rename from test/webapp-3.0/WEB-INF/tags11.tld rename to test/webapp/WEB-INF/tags11.tld diff --git a/test/webapp-3.0/WEB-INF/tags12.tld b/test/webapp/WEB-INF/tags12.tld similarity index 100% rename from test/webapp-3.0/WEB-INF/tags12.tld rename to test/webapp/WEB-INF/tags12.tld diff --git a/test/webapp-3.0/WEB-INF/tags20.tld b/test/webapp/WEB-INF/tags20.tld similarity index 100% rename from test/webapp-3.0/WEB-INF/tags20.tld rename to test/webapp/WEB-INF/tags20.tld diff --git a/test/webapp-3.0/WEB-INF/tags21.tld b/test/webapp/WEB-INF/tags21.tld similarity index 100% rename from test/webapp-3.0/WEB-INF/tags21.tld rename to test/webapp/WEB-INF/tags21.tld diff --git a/test/webapp-3.0/WEB-INF/test.tld b/test/webapp/WEB-INF/test.tld similarity index 100% rename from test/webapp-3.0/WEB-INF/test.tld rename to test/webapp/WEB-INF/test.tld diff --git a/test/webapp-3.0/WEB-INF/web.xml b/test/webapp/WEB-INF/web.xml similarity index 100% rename from test/webapp-3.0/WEB-INF/web.xml rename to test/webapp/WEB-INF/web.xml diff --git a/test/webapp-3.0/annotations.jsp b/test/webapp/annotations.jsp similarity index 100% rename from test/webapp-3.0/annotations.jsp rename to test/webapp/annotations.jsp diff --git a/test/webapp-3.0/bug36923.jsp b/test/webapp/bug36923.jsp similarity index 100% rename from test/webapp-3.0/bug36923.jsp rename to test/webapp/bug36923.jsp diff --git a/test/webapp-3.0/bug42390.jsp b/test/webapp/bug42390.jsp similarity index 100% rename from test/webapp-3.0/bug42390.jsp rename to test/webapp/bug42390.jsp diff --git a/test/webapp-3.0/bug42565.jsp b/test/webapp/bug42565.jsp similarity index 100% rename from test/webapp-3.0/bug42565.jsp rename to test/webapp/bug42565.jsp diff --git a/test/webapp-3.0/bug44994.jsp b/test/webapp/bug44994.jsp similarity index 100% rename from test/webapp-3.0/bug44994.jsp rename to test/webapp/bug44994.jsp diff --git a/test/webapp-3.0/bug45nnn/bug45015a.jsp b/test/webapp/bug45nnn/bug45015a.jsp similarity index 100% rename from test/webapp-3.0/bug45nnn/bug45015a.jsp rename to test/webapp/bug45nnn/bug45015a.jsp diff --git a/test/webapp-3.0/bug45nnn/bug45015b.jsp b/test/webapp/bug45nnn/bug45015b.jsp similarity index 100% rename from test/webapp-3.0/bug45nnn/bug45015b.jsp rename to test/webapp/bug45nnn/bug45015b.jsp diff --git a/test/webapp-3.0/bug45nnn/bug45015c.jsp b/test/webapp/bug45nnn/bug45015c.jsp similarity index 100% rename from test/webapp-3.0/bug45nnn/bug45015c.jsp rename to test/webapp/bug45nnn/bug45015c.jsp diff --git a/test/webapp-3.0/bug45nnn/bug45427.jsp b/test/webapp/bug45nnn/bug45427.jsp similarity index 100% rename from test/webapp-3.0/bug45nnn/bug45427.jsp rename to test/webapp/bug45nnn/bug45427.jsp diff --git a/test/webapp-3.0/bug45nnn/bug45451.jspf b/test/webapp/bug45nnn/bug45451.jspf similarity index 100% rename from test/webapp-3.0/bug45nnn/bug45451.jspf rename to test/webapp/bug45nnn/bug45451.jspf diff --git a/test/webapp-3.0/bug45nnn/bug45451a.jsp b/test/webapp/bug45nnn/bug45451a.jsp similarity index 100% rename from test/webapp-3.0/bug45nnn/bug45451a.jsp rename to test/webapp/bug45nnn/bug45451a.jsp diff --git a/test/webapp-3.0/bug45nnn/bug45451b.jsp b/test/webapp/bug45nnn/bug45451b.jsp similarity index 100% rename from test/webapp-3.0/bug45nnn/bug45451b.jsp rename to test/webapp/bug45nnn/bug45451b.jsp diff --git a/test/webapp-3.0/bug45nnn/bug45451c.jsp b/test/webapp/bug45nnn/bug45451c.jsp similarity index 100% rename from test/webapp-3.0/bug45nnn/bug45451c.jsp rename to test/webapp/bug45nnn/bug45451c.jsp diff --git a/test/webapp-3.0/bug45nnn/bug45451d.jspx b/test/webapp/bug45nnn/bug45451d.jspx similarity index 100% rename from test/webapp-3.0/bug45nnn/bug45451d.jspx rename to test/webapp/bug45nnn/bug45451d.jspx diff --git a/test/webapp-3.0/bug45nnn/bug45451e.jsp b/test/webapp/bug45nnn/bug45451e.jsp similarity index 100% rename from test/webapp-3.0/bug45nnn/bug45451e.jsp rename to test/webapp/bug45nnn/bug45451e.jsp diff --git a/test/webapp-3.0/bug45nnn/bug45511.jsp b/test/webapp/bug45nnn/bug45511.jsp similarity index 100% rename from test/webapp-3.0/bug45nnn/bug45511.jsp rename to test/webapp/bug45nnn/bug45511.jsp diff --git a/test/webapp-3.0/bug46381.jsp b/test/webapp/bug46381.jsp similarity index 100% rename from test/webapp-3.0/bug46381.jsp rename to test/webapp/bug46381.jsp diff --git a/test/webapp-3.0/bug46596.jsp b/test/webapp/bug46596.jsp similarity index 100% rename from test/webapp-3.0/bug46596.jsp rename to test/webapp/bug46596.jsp diff --git a/test/webapp-3.0/bug47331.jsp b/test/webapp/bug47331.jsp similarity index 100% rename from test/webapp-3.0/bug47331.jsp rename to test/webapp/bug47331.jsp diff --git a/test/webapp-3.0/bug47413.jsp b/test/webapp/bug47413.jsp similarity index 100% rename from test/webapp-3.0/bug47413.jsp rename to test/webapp/bug47413.jsp diff --git a/test/webapp-3.0/bug47977.jspx b/test/webapp/bug47977.jspx similarity index 100% rename from test/webapp-3.0/bug47977.jspx rename to test/webapp/bug47977.jspx diff --git a/test/webapp-3.0/bug48nnn/bug48112.jsp b/test/webapp/bug48nnn/bug48112.jsp similarity index 100% rename from test/webapp-3.0/bug48nnn/bug48112.jsp rename to test/webapp/bug48nnn/bug48112.jsp diff --git a/test/webapp-3.0/bug48nnn/bug48616.jsp b/test/webapp/bug48nnn/bug48616.jsp similarity index 100% rename from test/webapp-3.0/bug48nnn/bug48616.jsp rename to test/webapp/bug48nnn/bug48616.jsp diff --git a/test/webapp-3.0/bug48nnn/bug48616b.jsp b/test/webapp/bug48nnn/bug48616b.jsp similarity index 100% rename from test/webapp-3.0/bug48nnn/bug48616b.jsp rename to test/webapp/bug48nnn/bug48616b.jsp diff --git a/test/webapp-3.0/bug48nnn/bug48627.jsp b/test/webapp/bug48nnn/bug48627.jsp similarity index 100% rename from test/webapp-3.0/bug48nnn/bug48627.jsp rename to test/webapp/bug48nnn/bug48627.jsp diff --git a/test/webapp-3.0/bug48nnn/bug48668a.jsp b/test/webapp/bug48nnn/bug48668a.jsp similarity index 100% rename from test/webapp-3.0/bug48nnn/bug48668a.jsp rename to test/webapp/bug48nnn/bug48668a.jsp diff --git a/test/webapp-3.0/bug48nnn/bug48668b.jsp b/test/webapp/bug48nnn/bug48668b.jsp similarity index 100% rename from test/webapp-3.0/bug48nnn/bug48668b.jsp rename to test/webapp/bug48nnn/bug48668b.jsp diff --git a/test/webapp-3.0/bug48nnn/bug48701-TVI-NFA.jsp b/test/webapp/bug48nnn/bug48701-TVI-NFA.jsp similarity index 100% rename from test/webapp-3.0/bug48nnn/bug48701-TVI-NFA.jsp rename to test/webapp/bug48nnn/bug48701-TVI-NFA.jsp diff --git a/test/webapp-3.0/bug48nnn/bug48701-TVI-NG.jsp b/test/webapp/bug48nnn/bug48701-TVI-NG.jsp similarity index 100% rename from test/webapp-3.0/bug48nnn/bug48701-TVI-NG.jsp rename to test/webapp/bug48nnn/bug48701-TVI-NG.jsp diff --git a/test/webapp-3.0/bug48nnn/bug48701-UseBean.jsp b/test/webapp/bug48nnn/bug48701-UseBean.jsp similarity index 100% rename from test/webapp-3.0/bug48nnn/bug48701-UseBean.jsp rename to test/webapp/bug48nnn/bug48701-UseBean.jsp diff --git a/test/webapp-3.0/bug48nnn/bug48701-VI.jsp b/test/webapp/bug48nnn/bug48701-VI.jsp similarity index 100% rename from test/webapp-3.0/bug48nnn/bug48701-VI.jsp rename to test/webapp/bug48nnn/bug48701-VI.jsp diff --git a/test/webapp-3.0/bug48nnn/bug48701-fail.jsp b/test/webapp/bug48nnn/bug48701-fail.jsp similarity index 100% rename from test/webapp-3.0/bug48nnn/bug48701-fail.jsp rename to test/webapp/bug48nnn/bug48701-fail.jsp diff --git a/test/webapp-3.0/bug48nnn/bug48827.jspx b/test/webapp/bug48nnn/bug48827.jspx similarity index 100% rename from test/webapp-3.0/bug48nnn/bug48827.jspx rename to test/webapp/bug48nnn/bug48827.jspx diff --git a/test/webapp-3.0/bug49nnn/bug49196.jsp b/test/webapp/bug49nnn/bug49196.jsp similarity index 100% rename from test/webapp-3.0/bug49nnn/bug49196.jsp rename to test/webapp/bug49nnn/bug49196.jsp diff --git a/test/webapp-3.0/bug49nnn/bug49297DuplicateAttr.jsp b/test/webapp/bug49nnn/bug49297DuplicateAttr.jsp similarity index 100% rename from test/webapp-3.0/bug49nnn/bug49297DuplicateAttr.jsp rename to test/webapp/bug49nnn/bug49297DuplicateAttr.jsp diff --git a/test/webapp-3.0/bug49nnn/bug49297MultipleImport1.jsp b/test/webapp/bug49nnn/bug49297MultipleImport1.jsp similarity index 100% rename from test/webapp-3.0/bug49nnn/bug49297MultipleImport1.jsp rename to test/webapp/bug49nnn/bug49297MultipleImport1.jsp diff --git a/test/webapp-3.0/bug49nnn/bug49297MultipleImport2.jsp b/test/webapp/bug49nnn/bug49297MultipleImport2.jsp similarity index 100% rename from test/webapp-3.0/bug49nnn/bug49297MultipleImport2.jsp rename to test/webapp/bug49nnn/bug49297MultipleImport2.jsp diff --git a/test/webapp-3.0/bug49nnn/bug49297MultiplePageEncoding1.jsp b/test/webapp/bug49nnn/bug49297MultiplePageEncoding1.jsp similarity index 100% rename from test/webapp-3.0/bug49nnn/bug49297MultiplePageEncoding1.jsp rename to test/webapp/bug49nnn/bug49297MultiplePageEncoding1.jsp diff --git a/test/webapp-3.0/bug49nnn/bug49297MultiplePageEncoding2.jsp b/test/webapp/bug49nnn/bug49297MultiplePageEncoding2.jsp similarity index 100% rename from test/webapp-3.0/bug49nnn/bug49297MultiplePageEncoding2.jsp rename to test/webapp/bug49nnn/bug49297MultiplePageEncoding2.jsp diff --git a/test/webapp-3.0/bug49nnn/bug49297MultiplePageEncoding3.jsp b/test/webapp/bug49nnn/bug49297MultiplePageEncoding3.jsp similarity index 100% rename from test/webapp-3.0/bug49nnn/bug49297MultiplePageEncoding3.jsp rename to test/webapp/bug49nnn/bug49297MultiplePageEncoding3.jsp diff --git a/test/webapp-3.0/bug49nnn/bug49297MultiplePageEncoding4.jsp b/test/webapp/bug49nnn/bug49297MultiplePageEncoding4.jsp similarity index 100% rename from test/webapp-3.0/bug49nnn/bug49297MultiplePageEncoding4.jsp rename to test/webapp/bug49nnn/bug49297MultiplePageEncoding4.jsp diff --git a/test/webapp-3.0/bug49nnn/bug49297NoSpace.jsp b/test/webapp/bug49nnn/bug49297NoSpace.jsp similarity index 100% rename from test/webapp-3.0/bug49nnn/bug49297NoSpace.jsp rename to test/webapp/bug49nnn/bug49297NoSpace.jsp diff --git a/test/webapp-3.0/bug49nnn/bug49297Tag.jsp b/test/webapp/bug49nnn/bug49297Tag.jsp similarity index 100% rename from test/webapp-3.0/bug49nnn/bug49297Tag.jsp rename to test/webapp/bug49nnn/bug49297Tag.jsp diff --git a/test/webapp-3.0/bug49nnn/bug49555.jsp b/test/webapp/bug49nnn/bug49555.jsp similarity index 100% rename from test/webapp-3.0/bug49nnn/bug49555.jsp rename to test/webapp/bug49nnn/bug49555.jsp diff --git a/test/webapp-3.0/bug49nnn/bug49726a.jsp b/test/webapp/bug49nnn/bug49726a.jsp similarity index 100% rename from test/webapp-3.0/bug49nnn/bug49726a.jsp rename to test/webapp/bug49nnn/bug49726a.jsp diff --git a/test/webapp-3.0/bug49nnn/bug49726b.jsp b/test/webapp/bug49nnn/bug49726b.jsp similarity index 100% rename from test/webapp-3.0/bug49nnn/bug49726b.jsp rename to test/webapp/bug49nnn/bug49726b.jsp diff --git a/test/webapp-3.0/bug49nnn/bug49799.jsp b/test/webapp/bug49nnn/bug49799.jsp similarity index 100% rename from test/webapp-3.0/bug49nnn/bug49799.jsp rename to test/webapp/bug49nnn/bug49799.jsp diff --git a/test/webapp-3.0/bug53257/foo bar.jsp b/test/webapp/bug53257/foo bar.jsp similarity index 100% rename from test/webapp-3.0/bug53257/foo bar.jsp rename to test/webapp/bug53257/foo bar.jsp diff --git a/test/webapp-3.0/bug53257/foo bar.txt b/test/webapp/bug53257/foo bar.txt similarity index 100% rename from test/webapp-3.0/bug53257/foo bar.txt rename to test/webapp/bug53257/foo bar.txt diff --git a/test/webapp-3.0/bug53257/foo bar/foobar.jsp b/test/webapp/bug53257/foo bar/foobar.jsp similarity index 100% rename from test/webapp-3.0/bug53257/foo bar/foobar.jsp rename to test/webapp/bug53257/foo bar/foobar.jsp diff --git a/test/webapp-3.0/bug53257/foo bar/foobar.txt b/test/webapp/bug53257/foo bar/foobar.txt similarity index 100% rename from test/webapp-3.0/bug53257/foo bar/foobar.txt rename to test/webapp/bug53257/foo bar/foobar.txt diff --git a/test/webapp-3.0/bug53257/foo#bar.jsp b/test/webapp/bug53257/foo#bar.jsp similarity index 100% rename from test/webapp-3.0/bug53257/foo#bar.jsp rename to test/webapp/bug53257/foo#bar.jsp diff --git a/test/webapp-3.0/bug53257/foo#bar.txt b/test/webapp/bug53257/foo#bar.txt similarity index 100% rename from test/webapp-3.0/bug53257/foo#bar.txt rename to test/webapp/bug53257/foo#bar.txt diff --git a/test/webapp-3.0/bug53257/foo%bar.jsp b/test/webapp/bug53257/foo%bar.jsp similarity index 100% rename from test/webapp-3.0/bug53257/foo%bar.jsp rename to test/webapp/bug53257/foo%bar.jsp diff --git a/test/webapp-3.0/bug53257/foo%bar.txt b/test/webapp/bug53257/foo%bar.txt similarity index 100% rename from test/webapp-3.0/bug53257/foo%bar.txt rename to test/webapp/bug53257/foo%bar.txt diff --git a/test/webapp-3.0/bug53257/foo&bar.jsp b/test/webapp/bug53257/foo&bar.jsp similarity index 100% rename from test/webapp-3.0/bug53257/foo&bar.jsp rename to test/webapp/bug53257/foo&bar.jsp diff --git a/test/webapp-3.0/bug53257/foo&bar.txt b/test/webapp/bug53257/foo&bar.txt similarity index 100% rename from test/webapp-3.0/bug53257/foo&bar.txt rename to test/webapp/bug53257/foo&bar.txt diff --git a/test/webapp-3.0/bug53257/foo+bar.jsp b/test/webapp/bug53257/foo+bar.jsp similarity index 100% rename from test/webapp-3.0/bug53257/foo+bar.jsp rename to test/webapp/bug53257/foo+bar.jsp diff --git a/test/webapp-3.0/bug53257/foo+bar.txt b/test/webapp/bug53257/foo+bar.txt similarity index 100% rename from test/webapp-3.0/bug53257/foo+bar.txt rename to test/webapp/bug53257/foo+bar.txt diff --git a/test/webapp-3.0/bug53257/foo;bar.jsp b/test/webapp/bug53257/foo;bar.jsp similarity index 100% rename from test/webapp-3.0/bug53257/foo;bar.jsp rename to test/webapp/bug53257/foo;bar.jsp diff --git a/test/webapp-3.0/bug53257/foo;bar.txt b/test/webapp/bug53257/foo;bar.txt similarity index 100% rename from test/webapp-3.0/bug53257/foo;bar.txt rename to test/webapp/bug53257/foo;bar.txt diff --git a/test/webapp-3.0/bug53257/index.jsp b/test/webapp/bug53257/index.jsp similarity index 100% rename from test/webapp-3.0/bug53257/index.jsp rename to test/webapp/bug53257/index.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug50408.jsp b/test/webapp/bug5nnnn/bug50408.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug50408.jsp rename to test/webapp/bug5nnnn/bug50408.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug51544.jsp b/test/webapp/bug5nnnn/bug51544.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug51544.jsp rename to test/webapp/bug5nnnn/bug51544.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug52335.jsp b/test/webapp/bug5nnnn/bug52335.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug52335.jsp rename to test/webapp/bug5nnnn/bug52335.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug53465.jsp b/test/webapp/bug5nnnn/bug53465.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug53465.jsp rename to test/webapp/bug5nnnn/bug53465.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug53467].jsp b/test/webapp/bug5nnnn/bug53467].jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug53467].jsp rename to test/webapp/bug5nnnn/bug53467].jsp diff --git a/test/webapp-3.0/bug5nnnn/bug53545.html b/test/webapp/bug5nnnn/bug53545.html similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug53545.html rename to test/webapp/bug5nnnn/bug53545.html diff --git a/test/webapp-3.0/bug5nnnn/bug53545.jsp b/test/webapp/bug5nnnn/bug53545.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug53545.jsp rename to test/webapp/bug5nnnn/bug53545.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug53986.jsp b/test/webapp/bug5nnnn/bug53986.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug53986.jsp rename to test/webapp/bug5nnnn/bug53986.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug54241a.jsp b/test/webapp/bug5nnnn/bug54241a.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug54241a.jsp rename to test/webapp/bug5nnnn/bug54241a.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug54241b.jsp b/test/webapp/bug5nnnn/bug54241b.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug54241b.jsp rename to test/webapp/bug5nnnn/bug54241b.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug54801a.jspx b/test/webapp/bug5nnnn/bug54801a.jspx similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug54801a.jspx rename to test/webapp/bug5nnnn/bug54801a.jspx diff --git a/test/webapp-3.0/bug5nnnn/bug54801b.jspx b/test/webapp/bug5nnnn/bug54801b.jspx similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug54801b.jspx rename to test/webapp/bug5nnnn/bug54801b.jspx diff --git a/test/webapp-3.0/bug5nnnn/bug54821a.jspx b/test/webapp/bug5nnnn/bug54821a.jspx similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug54821a.jspx rename to test/webapp/bug5nnnn/bug54821a.jspx diff --git a/test/webapp-3.0/bug5nnnn/bug54821b.jspx b/test/webapp/bug5nnnn/bug54821b.jspx similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug54821b.jspx rename to test/webapp/bug5nnnn/bug54821b.jspx diff --git a/test/webapp-3.0/bug5nnnn/bug55198.jsp b/test/webapp/bug5nnnn/bug55198.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug55198.jsp rename to test/webapp/bug5nnnn/bug55198.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug55642a.jsp b/test/webapp/bug5nnnn/bug55642a.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug55642a.jsp rename to test/webapp/bug5nnnn/bug55642a.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug55642b.jsp b/test/webapp/bug5nnnn/bug55642b.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug55642b.jsp rename to test/webapp/bug5nnnn/bug55642b.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug55807.jsp b/test/webapp/bug5nnnn/bug55807.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug55807.jsp rename to test/webapp/bug5nnnn/bug55807.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug56029.jspx b/test/webapp/bug5nnnn/bug56029.jspx similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug56029.jspx rename to test/webapp/bug5nnnn/bug56029.jspx diff --git a/test/webapp-3.0/bug5nnnn/bug56147.jsp b/test/webapp/bug5nnnn/bug56147.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug56147.jsp rename to test/webapp/bug5nnnn/bug56147.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug56265.jsp b/test/webapp/bug5nnnn/bug56265.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug56265.jsp rename to test/webapp/bug5nnnn/bug56265.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug56334and56561.jspx b/test/webapp/bug5nnnn/bug56334and56561.jspx similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug56334and56561.jspx rename to test/webapp/bug5nnnn/bug56334and56561.jspx diff --git a/test/webapp-3.0/bug5nnnn/bug56529.jsp b/test/webapp/bug5nnnn/bug56529.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug56529.jsp rename to test/webapp/bug5nnnn/bug56529.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug56581.jsp b/test/webapp/bug5nnnn/bug56581.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug56581.jsp rename to test/webapp/bug5nnnn/bug56581.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug56612.jsp b/test/webapp/bug5nnnn/bug56612.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug56612.jsp rename to test/webapp/bug5nnnn/bug56612.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug57601.jsp b/test/webapp/bug5nnnn/bug57601.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug57601.jsp rename to test/webapp/bug5nnnn/bug57601.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug57601.txt b/test/webapp/bug5nnnn/bug57601.txt similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug57601.txt rename to test/webapp/bug5nnnn/bug57601.txt diff --git a/test/webapp-3.0/bug5nnnn/bug58096.jsp b/test/webapp/bug5nnnn/bug58096.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug58096.jsp rename to test/webapp/bug5nnnn/bug58096.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug58178.jsp b/test/webapp/bug5nnnn/bug58178.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug58178.jsp rename to test/webapp/bug5nnnn/bug58178.jsp diff --git a/test/webapp-3.0/bug5nnnn/bug58444.jsp b/test/webapp/bug5nnnn/bug58444.jsp similarity index 100% rename from test/webapp-3.0/bug5nnnn/bug58444.jsp rename to test/webapp/bug5nnnn/bug58444.jsp diff --git a/test/webapp-3.0/bug6nnnn/bug60431.jsp b/test/webapp/bug6nnnn/bug60431.jsp similarity index 100% rename from test/webapp-3.0/bug6nnnn/bug60431.jsp rename to test/webapp/bug6nnnn/bug60431.jsp diff --git a/test/webapp-3.0/echo-params.jsp b/test/webapp/echo-params.jsp similarity index 100% rename from test/webapp-3.0/echo-params.jsp rename to test/webapp/echo-params.jsp diff --git a/test/webapp-3.0/el-as-literal.jsp b/test/webapp/el-as-literal.jsp similarity index 100% rename from test/webapp-3.0/el-as-literal.jsp rename to test/webapp/el-as-literal.jsp diff --git a/test/webapp-3.0/el-method.jsp b/test/webapp/el-method.jsp similarity index 100% rename from test/webapp-3.0/el-method.jsp rename to test/webapp/el-method.jsp diff --git a/test/webapp-3.0/el-misc-no-quote-attribute-el.jsp b/test/webapp/el-misc-no-quote-attribute-el.jsp similarity index 100% rename from test/webapp-3.0/el-misc-no-quote-attribute-el.jsp rename to test/webapp/el-misc-no-quote-attribute-el.jsp diff --git a/test/webapp-3.0/el-misc-with-quote-attribute-el.jsp b/test/webapp/el-misc-with-quote-attribute-el.jsp similarity index 100% rename from test/webapp-3.0/el-misc-with-quote-attribute-el.jsp rename to test/webapp/el-misc-with-quote-attribute-el.jsp diff --git a/test/webapp-3.0/index.html b/test/webapp/index.html similarity index 100% rename from test/webapp-3.0/index.html rename to test/webapp/index.html diff --git a/test/webapp-3.0/jsp/pageContext1.jsp b/test/webapp/jsp/pageContext1.jsp similarity index 100% rename from test/webapp-3.0/jsp/pageContext1.jsp rename to test/webapp/jsp/pageContext1.jsp diff --git a/test/webapp-3.0/jsp/pageContext2.jsp b/test/webapp/jsp/pageContext2.jsp similarity index 100% rename from test/webapp-3.0/jsp/pageContext2.jsp rename to test/webapp/jsp/pageContext2.jsp diff --git a/test/webapp-3.0/script-expr.jsp b/test/webapp/script-expr.jsp similarity index 100% rename from test/webapp-3.0/script-expr.jsp rename to test/webapp/script-expr.jsp diff --git a/test/webapp-3.0/tld-versions.jsp b/test/webapp/tld-versions.jsp similarity index 100% rename from test/webapp-3.0/tld-versions.jsp rename to test/webapp/tld-versions.jsp diff --git a/test/webapp-3.0/welcome-files/index.jsp b/test/webapp/welcome-files/index.jsp similarity index 100% rename from test/webapp-3.0/welcome-files/index.jsp rename to test/webapp/welcome-files/index.jsp diff --git a/test/webapp-3.0/welcome-files/sub/.gitignore b/test/webapp/welcome-files/sub/.gitignore similarity index 100% rename from test/webapp-3.0/welcome-files/sub/.gitignore rename to test/webapp/welcome-files/sub/.gitignore --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org