Author: markt
Date: Sun Mar 7 10:16:38 2010
New Revision: 919961
URL: http://svn.apache.org/viewvc?rev=919961&view=rev
Log:
Rename webapp to allow tetsing with webapps with different servlet spec
versions in web.xml
Added:
tomcat/trunk/test/webapp-3.0/
- copied from r919952, tomcat/trunk/test/webapp/
Removed:
tomcat/trunk/test/webapp/
Modified:
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java
tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=919961&r1=919960&r2=919961&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Sun Mar 7 10:16:38 2010
@@ -33,7 +33,7 @@
public void testBug36923() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp");
+ File appDir = new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -49,7 +49,7 @@
public void testBug42565() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp");
+ File appDir = new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -81,7 +81,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -100,7 +100,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -135,7 +135,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -235,7 +235,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -253,7 +253,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -269,7 +269,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -297,7 +297,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -313,7 +313,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -346,7 +346,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -373,7 +373,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
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=919961&r1=919960&r2=919961&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java Sun Mar 7
10:16:38 2010
@@ -30,7 +30,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -58,7 +58,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// 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=919961&r1=919960&r2=919961&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java Sun
Mar 7 10:16:38 2010
@@ -29,7 +29,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -50,7 +50,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
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=919961&r1=919960&r2=919961&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Sun Mar 7
10:16:38 2010
@@ -29,7 +29,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -49,7 +49,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -94,7 +94,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// 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=919961&r1=919960&r2=919961&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java
Sun Mar 7 10:16:38 2010
@@ -34,7 +34,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -76,7 +76,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -97,7 +97,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
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=919961&r1=919960&r2=919961&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java Sun Mar 7
10:16:38 2010
@@ -29,7 +29,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
- new File("test/webapp");
+ new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
