Author: olamy
Date: Fri Dec 23 23:19:07 2011
New Revision: 1222885

URL: http://svn.apache.org/viewvc?rev=1222885&view=rev
Log:
fix some paths due to test sources move

Added:
    tomcat/sandbox/trunk-mvn-build/tomcat-tests/webapps/
    tomcat/sandbox/trunk-mvn-build/tomcat-tests/webapps/examples/
    tomcat/sandbox/trunk-mvn-build/tomcat-tests/webapps/examples/WEB-INF/
    tomcat/sandbox/trunk-mvn-build/tomcat-tests/webapps/examples/WEB-INF/lib/
      - copied from r1222868, 
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/webapp/WEB-INF/lib/
Modified:
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/el/TestCompositeELResolver.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/servlet/jsp/TestPageContext.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestDefaultInstanceManager.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardContext.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardContextResources.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardWrapper.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualContext.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualWebappLoader.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestContextConfig.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TomcatBaseTest.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/coyote/http11/TestAbstractHttp11Processor.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/el/TestELInJsp.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestCompiler.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestGenerator.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspConfig.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspDocumentParser.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestParser.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestScriptingVariabler.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestValidator.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/naming/resources/TestWarDirContext.java
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/el/TestCompositeELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/el/TestCompositeELResolver.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/el/TestCompositeELResolver.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/el/TestCompositeELResolver.java
 Fri Dec 23 23:19:07 2011
@@ -35,7 +35,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(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         StandardContext ctxt = (StandardContext) tomcat.addWebapp(null,
                 "/test", appDir.getAbsolutePath());

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/servlet/jsp/TestPageContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/servlet/jsp/TestPageContext.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/servlet/jsp/TestPageContext.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/servlet/jsp/TestPageContext.java
 Fri Dec 23 23:19:07 2011
@@ -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(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestDefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestDefaultInstanceManager.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestDefaultInstanceManager.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestDefaultInstanceManager.java
 Fri Dec 23 23:19:07 2011
@@ -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(getBaseTestResourcesPath()+"/webapp-3.0");
         StandardContext ctxt = (StandardContext) tomcat.addContext(
                 null, "/test", appDir.getAbsolutePath());
 

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardContext.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardContext.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardContext.java
 Fri Dec 23 23:19:07 2011
@@ -150,7 +150,7 @@ public class TestStandardContext extends
         // Set up a container
         Tomcat tomcat = getTomcatInstance();
 
-        File root = new File("test/webapp-3.0");
+        File root = new File(getBaseTestResourcesPath()+"/webapp-3.0");
         tomcat.addWebapp("", root.getAbsolutePath());
 
         tomcat.start();

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardContextResources.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardContextResources.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardContextResources.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardContextResources.java
 Fri Dec 23 23:19:07 2011
@@ -64,7 +64,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(getBaseTestResourcesPath()+"/webapp-3.0-fragments");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -89,7 +89,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(getBaseTestResourcesPath()+"/webapp-3.0-fragments");
 
         // Need to cast to be able to set StandardContext specific attribute
         StandardContext ctxt = (StandardContext)
@@ -116,7 +116,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(getBaseTestResourcesPath()+"/webapp-3.0-fragments");
         // app dir is relative to server home
         StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
                 appDir.getAbsolutePath());
@@ -179,7 +179,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(getBaseTestResourcesPath()+"/webapp-3.0-fragments");
         // app dir is relative to server home
         StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
                 appDir.getAbsolutePath());

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardWrapper.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardWrapper.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardWrapper.java
 Fri Dec 23 23:19:07 2011
@@ -102,7 +102,7 @@ public class TestStandardWrapper extends
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0-fragments");
+        File appDir = new 
File(getBaseTestResourcesPath()+"/webapp-3.0-fragments");
         tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
         tomcat.start();
@@ -123,7 +123,7 @@ public class TestStandardWrapper extends
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File(getBaseTestResourcesPath()+"/webapp-3.0");
         tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
         tomcat.start();
@@ -153,7 +153,7 @@ public class TestStandardWrapper extends
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0-servletsecurity");
+        File appDir = new 
File(getBaseTestResourcesPath()+"/webapp-3.0-servletsecurity");
         tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
         tomcat.start();
@@ -172,7 +172,7 @@ public class TestStandardWrapper extends
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0-servletsecurity2");
+        File appDir = new 
File(getBaseTestResourcesPath()+"/webapp-3.0-servletsecurity2");
         tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
         tomcat.start();

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualContext.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualContext.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualContext.java
 Fri Dec 23 23:19:07 2011
@@ -61,7 +61,7 @@ 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(getBaseTestResourcesPath()+"/webapp-3.0-virtual-webapp/src/main/webapp");
         // app dir is relative to server home
         StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
             appDir.getAbsolutePath());
@@ -239,7 +239,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(getBaseTestResourcesPath()+"/webapp-3.0-virtual-webapp/src/main/webapp");
         // app dir is relative to server home
         StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
             appDir.getAbsolutePath());

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualWebappLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualWebappLoader.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualWebappLoader.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualWebappLoader.java
 Fri Dec 23 23:19:07 2011
@@ -41,7 +41,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(getBaseTestResourcesPath()+"/webapp-3.0");
         // Must have a real docBase - just use temp
         StandardContext ctx =
             (StandardContext)tomcat.addContext("",  appDir.getAbsolutePath());
@@ -52,7 +52,7 @@ public class TestVirtualWebappLoader ext
         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(getBaseTestResourcesPath()+"/webapp-3.0-fragments/WEB-INF/lib");
         loader.setVirtualClasspath(dir.getAbsolutePath() + "/*.jar");
         loader.start();
         String[] repos = loader.getRepositories();

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestContextConfig.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestContextConfig.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestContextConfig.java
 Fri Dec 23 23:19:07 2011
@@ -54,7 +54,7 @@ public class TestContextConfig extends T
 
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File(getBaseTestResourcesPath()+"/webapp-3.0");
         StandardContext ctxt = (StandardContext) tomcat.addContext(null,
                 "/test", appDir.getAbsolutePath());
         ctxt.setDefaultWebXml(new File("conf/web.xml").getAbsolutePath());
@@ -80,7 +80,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(getBaseTestResourcesPath()+"/webapp-3.0-fragments");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TomcatBaseTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TomcatBaseTest.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TomcatBaseTest.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TomcatBaseTest.java
 Fri Dec 23 23:19:07 2011
@@ -357,4 +357,8 @@ public abstract class TomcatBaseTest ext
             super.start();
         }
     }
+    
+    protected String getBaseTestResourcesPath(){
+        return "src/test/resources";
+    }
 }

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/coyote/http11/TestAbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/coyote/http11/TestAbstractHttp11Processor.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/coyote/http11/TestAbstractHttp11Processor.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/coyote/http11/TestAbstractHttp11Processor.java
 Fri Dec 23 23:19:07 2011
@@ -38,7 +38,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(getBaseTestResourcesPath()+"/webapp-3.0");
         tomcat.addWebapp("", root.getAbsolutePath());
 
         tomcat.start();
@@ -66,7 +66,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(getBaseTestResourcesPath()+"/webapp-3.0");
         tomcat.addWebapp("", root.getAbsolutePath());
 
         tomcat.start();
@@ -95,7 +95,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(getBaseTestResourcesPath()+"/webapp-3.0");
         tomcat.addWebapp("", root.getAbsolutePath());
 
         tomcat.start();
@@ -126,7 +126,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(getBaseTestResourcesPath()+"/webapp-3.0");
         tomcat.addWebapp("", root.getAbsolutePath());
 
         tomcat.start();
@@ -155,7 +155,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(getBaseTestResourcesPath()+"/webapp-3.0");
         tomcat.addWebapp("", root.getAbsolutePath());
 
         tomcat.start();

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/el/TestELInJsp.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/el/TestELInJsp.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/el/TestELInJsp.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/el/TestELInJsp.java
 Fri Dec 23 23:19:07 2011
@@ -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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestCompiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestCompiler.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestCompiler.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestCompiler.java
 Fri Dec 23 23:19:07 2011
@@ -36,7 +36,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(getBaseTestResourcesPath()+"/webapp-3.0");
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
         tomcat.start();
 
@@ -58,7 +58,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(getBaseTestResourcesPath()+"/webapp-3.0");
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
         tomcat.start();
 

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestGenerator.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestGenerator.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestGenerator.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestGenerator.java
 Fri Dec 23 23:19:07 2011
@@ -47,7 +47,7 @@ public class TestGenerator extends Tomca
         Tomcat tomcat = getTomcatInstance();
 
         File appDir =
-            new File("test/webapp-3.0");
+            new File(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -76,7 +76,7 @@ public class TestGenerator extends Tomca
         Tomcat tomcat = getTomcatInstance();
 
         File appDir =
-            new File("test/webapp-3.0");
+            new File(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -93,7 +93,7 @@ public class TestGenerator extends Tomca
         Tomcat tomcat = getTomcatInstance();
 
         File appDir =
-            new File("test/webapp-3.0");
+            new File(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -110,7 +110,7 @@ public class TestGenerator extends Tomca
         Tomcat tomcat = getTomcatInstance();
 
         File appDir =
-            new File("test/webapp-3.0");
+            new File(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         StandardContext ctxt = (StandardContext) tomcat.addWebapp(null,
                 "/test", appDir.getAbsolutePath());
@@ -151,7 +151,7 @@ public class TestGenerator extends Tomca
         Tomcat tomcat = getTomcatInstance();
 
         File appDir =
-            new File("test/webapp-3.0");
+            new File(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -225,7 +225,7 @@ public class TestGenerator extends Tomca
 
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File(getBaseTestResourcesPath()+"/webapp-3.0");
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
         tomcat.start();
 

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspConfig.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspConfig.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspConfig.java
 Fri Dec 23 23:19:07 2011
@@ -93,7 +93,7 @@ public class TestJspConfig extends Tomca
         Tomcat tomcat = getTomcatInstance();
 
         File appDir =
-            new File("test/webapp-3.0");
+            new File(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspDocumentParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspDocumentParser.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspDocumentParser.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspDocumentParser.java
 Fri Dec 23 23:19:07 2011
@@ -38,7 +38,7 @@ public class TestJspDocumentParser exten
         Tomcat tomcat = getTomcatInstance();
 
         File appDir =
-            new File("test/webapp-3.0");
+            new File(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -55,7 +55,7 @@ public class TestJspDocumentParser exten
         Tomcat tomcat = getTomcatInstance();
 
         File appDir =
-            new File("test/webapp-3.0");
+            new File(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestParser.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestParser.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestParser.java
 Fri Dec 23 23:19:07 2011
@@ -41,7 +41,7 @@ public class TestParser extends TomcatBa
         Tomcat tomcat = getTomcatInstance();
 
         File appDir =
-            new File("test/webapp-3.0");
+            new File(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
 Fri Dec 23 23:19:07 2011
@@ -49,7 +49,7 @@ public class TestParserNoStrictWhitespac
         Tomcat tomcat = getTomcatInstance();
 
         File appDir =
-            new File("test/webapp-3.0");
+            new File(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestScriptingVariabler.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestScriptingVariabler.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestScriptingVariabler.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestScriptingVariabler.java
 Fri Dec 23 23:19:07 2011
@@ -39,7 +39,7 @@ public class TestScriptingVariabler exte
         Tomcat tomcat = getTomcatInstance();
 
         File appDir =
-            new File("test/webapp-3.0");
+            new File(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestValidator.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestValidator.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestValidator.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestValidator.java
 Fri Dec 23 23:19:07 2011
@@ -40,7 +40,7 @@ public class TestValidator extends Tomca
         Tomcat tomcat = getTomcatInstance();
 
         File appDir =
-            new File("test/webapp-3.0");
+            new File(getBaseTestResourcesPath()+"/webapp-3.0");
         // 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(getBaseTestResourcesPath()+"/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/naming/resources/TestWarDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/naming/resources/TestWarDirContext.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/naming/resources/TestWarDirContext.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/naming/resources/TestWarDirContext.java
 Fri Dec 23 23:19:07 2011
@@ -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(getBaseTestResourcesPath()+"/webapp-3.0-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(getBaseTestResourcesPath()+"/webapp-3.0-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(getBaseTestResourcesPath()+"/webapp-3.0-fragments");
         // app dir is relative to server home
         StandardContext ctxt = (StandardContext) tomcat.addWebapp(
                 null, "/test", appDir.getAbsolutePath());

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
 Fri Dec 23 23:19:07 2011
@@ -39,7 +39,7 @@ public class TestMapperWelcomeFiles exte
 
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-3.0");
+        File appDir = new File(getBaseTestResourcesPath()+"/webapp-3.0");
 
         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(getBaseTestResourcesPath()+"/webapp-3.0");
 
         StandardContext ctxt = (StandardContext) 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

Reply via email to