You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/05/10 12:33:36 UTC
svn commit: r1480976 - in /tomcat/trunk: ./ res/rat/ test/javax/el/
test/javax/servlet/jsp/ test/org/apache/catalina/core/
test/org/apache/catalina/loader/ test/org/apache/catalina/mapper/
test/org/apache/catalina/startup/ test/org/apache/coyote/http11...
Author: markt
Date: Fri May 10 10:33:34 2013
New Revision: 1480976
URL: http://svn.apache.org/r1480976
Log:
Rename webapp-3.0 test webapp to webapp.
Tests that are not explicitly designed for a specific web application version will remain in this new location.
Tests that require an specific web application version to be declared in web.xml will be moved back to the (soon to be re-created) webapp-3.0 location
Added:
tomcat/trunk/test/webapp/
- copied from r1480757, tomcat/trunk/test/webapp-3.0/
tomcat/trunk/test/webapp-fragments/
- copied from r1480757, tomcat/trunk/test/webapp-3.0-fragments/
tomcat/trunk/test/webapp-fragments-empty-absolute-ordering/
- copied from r1480757, tomcat/trunk/test/webapp-3.0-fragments-empty-absolute-ordering/
tomcat/trunk/test/webapp-servletsecurity/
- copied from r1480757, tomcat/trunk/test/webapp-3.0-servletsecurity/
tomcat/trunk/test/webapp-servletsecurity2/
- copied from r1480757, tomcat/trunk/test/webapp-3.0-servletsecurity2/
tomcat/trunk/test/webapp-virtual-library/
- copied from r1480757, tomcat/trunk/test/webapp-3.0-virtual-library/
tomcat/trunk/test/webapp-virtual-webapp/
- copied from r1480757, tomcat/trunk/test/webapp-3.0-virtual-webapp/
Removed:
tomcat/trunk/test/webapp-3.0/
tomcat/trunk/test/webapp-3.0-fragments/
tomcat/trunk/test/webapp-3.0-fragments-empty-absolute-ordering/
tomcat/trunk/test/webapp-3.0-servletsecurity/
tomcat/trunk/test/webapp-3.0-servletsecurity2/
tomcat/trunk/test/webapp-3.0-virtual-library/
tomcat/trunk/test/webapp-3.0-virtual-webapp/
Modified:
tomcat/trunk/.gitignore
tomcat/trunk/build.xml
tomcat/trunk/res/rat/rat-excludes.txt
tomcat/trunk/test/javax/el/TestCompositeELResolver.java
tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java
tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java
tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWelcomeFiles.java
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestJspReader.java
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java
tomcat/trunk/test/org/apache/jasper/compiler/TestTagPluginManager.java
tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java
tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java
tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java
tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java
tomcat/trunk/test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties
Modified: tomcat/trunk/.gitignore
URL: http://svn.apache.org/viewvc/tomcat/trunk/.gitignore?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/.gitignore (original)
+++ tomcat/trunk/.gitignore Fri May 10 10:33:34 2013
@@ -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
Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri May 10 10:33:34 2013
@@ -510,8 +510,8 @@
<exclude name="**/org/apache/tomcat/dbcp/**"/>
<exclude name="**/tomcat-deps/**"/>
<!-- Exclude simple test files -->
- <exclude name="test/webapp-3.0/bug53257/**/*.txt"/>
- <exclude name="test/webapp-3.0-fragments/WEB-INF/classes/*.txt"/>
+ <exclude name="test/webapp/bug53257/**/*.txt"/>
+ <exclude name="test/webapp-fragments/WEB-INF/classes/*.txt"/>
<exclude name="test/webresources/**"/>
</fileset>
<fileset dir="modules/jdbc-pool" >
@@ -1831,8 +1831,8 @@ Apache Tomcat ${version} native binaries
<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"/>
Modified: tomcat/trunk/res/rat/rat-excludes.txt
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/rat/rat-excludes.txt?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/res/rat/rat-excludes.txt (original)
+++ tomcat/trunk/res/rat/rat-excludes.txt Fri May 10 10:33:34 2013
@@ -51,7 +51,7 @@ output/dist/webapps/docs/api/package-lis
output/dist/webapps/docs/elapi/package-list
output/dist/webapps/docs/jspapi/package-list
output/dist/webapps/docs/servletapi/package-list
-output/dist/src/test/webapp-3.0/bug53257/*.txt
-output/dist/src/test/webapp-3.0-fragments/WEB-INF/classes/*.txt
-test/webapp-3.0/bug53257/*.txt
-test/webapp-3.0-fragments/WEB-INF/classes/*.txt
+output/dist/src/test/webapp/bug53257/*.txt
+output/dist/src/test/webapp-fragments/WEB-INF/classes/*.txt
+test/webapp/bug53257/*.txt
+test/webapp-fragments/WEB-INF/classes/*.txt
Modified: tomcat/trunk/test/javax/el/TestCompositeELResolver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestCompositeELResolver.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/javax/el/TestCompositeELResolver.java (original)
+++ tomcat/trunk/test/javax/el/TestCompositeELResolver.java Fri May 10 10:33:34 2013
@@ -37,7 +37,7 @@ public class TestCompositeELResolver ext
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());
Modified: tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java (original)
+++ tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java Fri May 10 10:33:34 2013
@@ -33,7 +33,7 @@ public class TestPageContext extends Tom
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());
Modified: tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java Fri May 10 10:33:34 2013
@@ -36,7 +36,7 @@ public class TestApplicationContext exte
public void testBug53257() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp-3.0");
+ File appDir = new File("test/webapp");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -59,7 +59,7 @@ public class TestApplicationContext exte
public void testBug53467() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp-3.0");
+ File appDir = new File("test/webapp");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -101,7 +101,7 @@ public class TestApplicationContext exte
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());
Modified: tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java Fri May 10 10:33:34 2013
@@ -69,7 +69,7 @@ public class TestDefaultInstanceManager
// 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());
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Fri May 10 10:33:34 2013
@@ -190,7 +190,7 @@ public class TestStandardContext extends
((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
((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
// 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();
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java Fri May 10 10:33:34 2013
@@ -67,7 +67,7 @@ public class TestStandardContextResource
public void testResources() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp-3.0-fragments");
+ File appDir = new File("test/webapp-fragments");
// app dir is relative to server home
Context ctx = tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -104,7 +104,7 @@ public class TestStandardContextResource
Tomcat tomcat = getTomcatInstance();
// app dir is relative to server home
- File appDir = new File("test/webapp-3.0-fragments");
+ File appDir = new File("test/webapp-fragments");
// Need to cast to be able to set StandardContext specific attribute
StandardContext ctxt = (StandardContext)
@@ -131,7 +131,7 @@ public class TestStandardContextResource
public void testResourcesAbsoluteOrdering() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp-3.0-fragments");
+ File appDir = new File("test/webapp-fragments");
// app dir is relative to server home
StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
@@ -201,7 +201,7 @@ public class TestStandardContextResource
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());
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java Fri May 10 10:33:34 2013
@@ -101,7 +101,7 @@ public class TestStandardWrapper extends
// Setup Tomcat instance
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp-3.0-fragments");
+ File appDir = new File("test/webapp-fragments");
tomcat.addWebapp(null, "", appDir.getAbsolutePath());
tomcat.start();
@@ -122,7 +122,7 @@ public class TestStandardWrapper extends
// Setup Tomcat instance
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp-3.0");
+ File appDir = new File("test/webapp");
tomcat.addWebapp(null, "", appDir.getAbsolutePath());
tomcat.start();
@@ -152,7 +152,7 @@ public class TestStandardWrapper extends
// Setup Tomcat instance
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp-3.0-servletsecurity");
+ File appDir = new File("test/webapp-servletsecurity");
tomcat.addWebapp(null, "", appDir.getAbsolutePath());
tomcat.start();
@@ -171,7 +171,7 @@ public class TestStandardWrapper extends
// 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();
Modified: tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java (original)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java Fri May 10 10:33:34 2013
@@ -62,20 +62,20 @@ public class TestVirtualContext extends
public void testVirtualClassLoader() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp-3.0-virtual-webapp/src/main/webapp");
+ File appDir = new File("test/webapp-virtual-webapp/src/main/webapp");
// app dir is relative to server home
StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
ctx.setResources(new StandardRoot(ctx));
- File f1 = new File("test/webapp-3.0-virtual-webapp/target/classes");
- File f2 = new File("test/webapp-3.0-virtual-library/target/classes");
+ File f1 = new File("test/webapp-virtual-webapp/target/classes");
+ File f2 = new File("test/webapp-virtual-library/target/classes");
File f3 = new File(
- "test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/classes");
+ "test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes");
File f4 = new File(
- "test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes");
- File f5 = new File("test/webapp-3.0-virtual-webapp/src/main/misc");
- File f6 = new File("test/webapp-3.0-virtual-webapp/src/main/webapp2");
+ "test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes");
+ File f5 = new File("test/webapp-virtual-webapp/src/main/misc");
+ File f6 = new File("test/webapp-virtual-webapp/src/main/webapp2");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, f1.getAbsolutePath(),
"/WEB-INF/classes", "/");
@@ -147,19 +147,19 @@ public class TestVirtualContext extends
"/test/classpathGetResources.jsp?path=rsrc/").toString();
assertTrue(
allUrls,
- allUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc") > 0);
+ allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc") > 0);
assertTrue(
allUrls,
- allUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc") > 0);
+ allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc") > 0);
assertTrue(
allUrls,
- allUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar!/rsrc") > 0);
+ allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar!/rsrc") > 0);
assertTrue(
allUrls,
- allUrls.indexOf("/test/webapp-3.0-virtual-webapp/target/classes/rsrc") > 0);
+ allUrls.indexOf("/test/webapp-virtual-webapp/target/classes/rsrc") > 0);
assertTrue(
allUrls,
- allUrls.indexOf("/test/webapp-3.0-virtual-library/target/classes/rsrc") > 0);
+ allUrls.indexOf("/test/webapp-virtual-library/target/classes/rsrc") > 0);
// check that there's no duplicate in the URLs
String[] allUrlsArray = allUrls.split("\\s+");
@@ -172,7 +172,7 @@ public class TestVirtualContext extends
"/test/classpathGetResources.jsp?path=rsrc2/").toString();
assertTrue(
allRsrsc2ClasspathUrls,
- allRsrsc2ClasspathUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc2") > 0);
+ allRsrsc2ClasspathUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc2") > 0);
// tests context.getRealPath
@@ -184,7 +184,7 @@ public class TestVirtualContext extends
// Real paths depend on the OS and this test has to work on all
// platforms so use File to convert the path to a platform specific form
File f = new File(
- "test/webapp-3.0-virtual-webapp/src/main/webapp/rsrc/resourceF.properties");
+ "test/webapp-virtual-webapp/src/main/webapp/rsrc/resourceF.properties");
assertPageContains(
"/test/contextGetRealPath.jsp?path=/rsrc/resourceF.properties",
f.getPath());
@@ -254,7 +254,7 @@ public class TestVirtualContext extends
public void testAdditionalWebInfClassesPaths() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp-3.0-virtual-webapp/src/main/webapp");
+ File appDir = new File("test/webapp-virtual-webapp/src/main/webapp");
// app dir is relative to server home
StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
@@ -277,8 +277,8 @@ public class TestVirtualContext extends
annotatedServletClassOutputStream.close();
ctx.setResources(new StandardRoot(ctx));
- File f1 = new File("test/webapp-3.0-virtual-webapp/target/classes");
- File f2 = new File("test/webapp-3.0-virtual-library/target/classes");
+ File f1 = new File("test/webapp-virtual-webapp/target/classes");
+ File f2 = new File("test/webapp-virtual-library/target/classes");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, f1.getAbsolutePath(),
"/WEB-INF/classes", "/");
Modified: tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java (original)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java Fri May 10 10:33:34 2013
@@ -42,7 +42,7 @@ public class TestVirtualWebappLoader ext
@Test
public void testStartInternal() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp-3.0");
+ File appDir = new File("test/webapp");
// Must have a real docBase - just use temp
StandardContext ctx =
(StandardContext)tomcat.addContext("", appDir.getAbsolutePath());
@@ -56,7 +56,7 @@ public class TestVirtualWebappLoader ext
ctx.setResources(new StandardRoot(ctx));
ctx.resourcesStart();
- File f1 = new File("test/webapp-3.0-fragments/WEB-INF/lib");
+ File f1 = new File("test/webapp-fragments/WEB-INF/lib");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, f1.getAbsolutePath(),
"/WEB-INF/lib", "/");
Modified: tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWelcomeFiles.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWelcomeFiles.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWelcomeFiles.java (original)
+++ tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWelcomeFiles.java Fri May 10 10:33:34 2013
@@ -39,7 +39,7 @@ public class TestMapperWelcomeFiles exte
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp-3.0");
+ File appDir = new File("test/webapp");
StandardContext ctxt = (StandardContext) tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
@@ -67,7 +67,7 @@ public class TestMapperWelcomeFiles exte
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());
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java Fri May 10 10:33:34 2013
@@ -53,7 +53,7 @@ public class TestContextConfig extends T
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 T
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 T
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 T
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 T
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 T
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());
Modified: tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java Fri May 10 10:33:34 2013
@@ -48,7 +48,7 @@ public class TestAbstractHttp11Processor
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();
@@ -76,7 +76,7 @@ public class TestAbstractHttp11Processor
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();
@@ -105,7 +105,7 @@ public class TestAbstractHttp11Processor
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();
@@ -136,7 +136,7 @@ public class TestAbstractHttp11Processor
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();
@@ -165,7 +165,7 @@ public class TestAbstractHttp11Processor
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();
Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Fri May 10 10:33:34 2013
@@ -38,7 +38,7 @@ public class TestELInJsp extends TomcatB
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 TomcatB
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 TomcatB
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 TomcatB
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());
@@ -144,7 +144,7 @@ public class TestELInJsp extends TomcatB
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());
@@ -245,7 +245,7 @@ public class TestELInJsp extends TomcatB
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());
@@ -264,7 +264,7 @@ public class TestELInJsp extends TomcatB
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());
@@ -281,7 +281,7 @@ public class TestELInJsp extends TomcatB
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());
@@ -310,7 +310,7 @@ public class TestELInJsp extends TomcatB
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());
@@ -326,7 +326,7 @@ public class TestELInJsp extends TomcatB
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());
@@ -343,7 +343,7 @@ public class TestELInJsp extends TomcatB
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());
@@ -361,7 +361,7 @@ public class TestELInJsp extends TomcatB
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());
@@ -395,7 +395,7 @@ public class TestELInJsp extends TomcatB
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());
@@ -423,7 +423,7 @@ public class TestELInJsp extends TomcatB
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());
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java Fri May 10 10:33:34 2013
@@ -37,7 +37,7 @@ public class TestCompiler extends Tomcat
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 Tomcat
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 Tomcat
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 Tomcat
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 Tomcat
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 Tomcat
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 Tomcat
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 Tomcat
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 Tomcat
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 Tomcat
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 Tomcat
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();
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java Fri May 10 10:33:34 2013
@@ -45,7 +45,7 @@ public class TestELInterpreterFactory ex
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();
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java Fri May 10 10:33:34 2013
@@ -49,7 +49,7 @@ public class TestGenerator extends Tomca
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());
@@ -78,7 +78,7 @@ public class TestGenerator extends Tomca
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());
@@ -95,7 +95,7 @@ public class TestGenerator extends Tomca
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());
@@ -112,7 +112,7 @@ public class TestGenerator extends Tomca
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());
@@ -156,7 +156,7 @@ public class TestGenerator extends Tomca
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());
@@ -230,7 +230,7 @@ public class TestGenerator extends Tomca
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();
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java Fri May 10 10:33:34 2013
@@ -93,7 +93,7 @@ public class TestJspConfig extends Tomca
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());
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java Fri May 10 10:33:34 2013
@@ -36,7 +36,7 @@ public class TestJspDocumentParser exten
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 exten
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 exten
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 exten
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());
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestJspReader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspReader.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspReader.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspReader.java Fri May 10 10:33:34 2013
@@ -32,7 +32,7 @@ public class TestJspReader extends Tomca
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp-3.0");
+ new File("test/webapp");
tomcat.addWebapp(null, "", appDir.getAbsolutePath());
tomcat.start();
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Fri May 10 10:33:34 2013
@@ -41,7 +41,7 @@ public class TestParser extends TomcatBa
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());
@@ -62,7 +62,7 @@ public class TestParser extends TomcatBa
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());
@@ -107,7 +107,7 @@ public class TestParser extends TomcatBa
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());
@@ -124,7 +124,7 @@ public class TestParser extends TomcatBa
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());
@@ -141,7 +141,7 @@ public class TestParser extends TomcatBa
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());
@@ -159,7 +159,7 @@ public class TestParser extends TomcatBa
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());
@@ -179,7 +179,7 @@ public class TestParser extends TomcatBa
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());
@@ -199,7 +199,7 @@ public class TestParser extends TomcatBa
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());
@@ -218,7 +218,7 @@ public class TestParser extends TomcatBa
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());
@@ -237,7 +237,7 @@ public class TestParser extends TomcatBa
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());
@@ -256,7 +256,7 @@ public class TestParser extends TomcatBa
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());
@@ -275,7 +275,7 @@ public class TestParser extends TomcatBa
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());
@@ -295,7 +295,7 @@ public class TestParser extends TomcatBa
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());
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java Fri May 10 10:33:34 2013
@@ -49,7 +49,7 @@ public class TestParserNoStrictWhitespac
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());
@@ -70,7 +70,7 @@ public class TestParserNoStrictWhitespac
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());
@@ -115,7 +115,7 @@ public class TestParserNoStrictWhitespac
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());
@@ -133,7 +133,7 @@ public class TestParserNoStrictWhitespac
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());
@@ -153,7 +153,7 @@ public class TestParserNoStrictWhitespac
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());
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java Fri May 10 10:33:34 2013
@@ -39,7 +39,7 @@ public class TestScriptingVariabler exte
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());
@@ -82,7 +82,7 @@ public class TestScriptingVariabler exte
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());
@@ -104,7 +104,7 @@ public class TestScriptingVariabler exte
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());
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestTagPluginManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestTagPluginManager.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestTagPluginManager.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestTagPluginManager.java Fri May 10 10:33:34 2013
@@ -41,7 +41,7 @@ public class TestTagPluginManager extend
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();
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java Fri May 10 10:33:34 2013
@@ -40,7 +40,7 @@ public class TestValidator extends Tomca
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());
@@ -132,7 +132,7 @@ public class TestValidator extends Tomca
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());
Modified: tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java (original)
+++ tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java Fri May 10 10:33:34 2013
@@ -33,7 +33,7 @@ public class TestJspWriterImpl extends T
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 T
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();
Modified: tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java (original)
+++ tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java Fri May 10 10:33:34 2013
@@ -34,7 +34,7 @@ public class TestPageContextImpl extends
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();
Modified: tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java (original)
+++ tomcat/trunk/test/org/apache/jasper/tagplugins/jstl/core/AbstractTestTag.java Fri May 10 10:33:34 2013
@@ -35,7 +35,7 @@ public abstract class AbstractTestTag ex
super.setUp();
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());
ctx.setResources(new StandardRoot(ctx));
Modified: tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java (original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java Fri May 10 10:33:34 2013
@@ -352,7 +352,7 @@ public class TestNamingContext extends T
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());
Modified: tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java?rev=1480976&r1=1480975&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java (original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java Fri May 10 10:33:34 2013
@@ -51,7 +51,7 @@ public class TestWarDirContext extends T
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());
@@ -72,7 +72,7 @@ public class TestWarDirContext extends T
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());
@@ -102,7 +102,7 @@ public class TestWarDirContext extends T
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());
Modified: tomcat/trunk/test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties?rev=1480976&r1=1480757&r2=1480976&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties (original)
+++ tomcat/trunk/test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties Fri May 10 10:33:34 2013
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org