Author: markt
Date: Wed Sep 22 22:59:55 2010
New Revision: 1000269
URL: http://svn.apache.org/viewvc?rev=1000269&view=rev
Log:
Correctly define the ROOT context in unit tests
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java
tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Wed Sep 22
22:59:55 2010
@@ -193,7 +193,7 @@ public class Tomcat {
*
* TODO: add the rest
*
- * @param contextPath "/" for root context.
+ * @param contextPath "" for root context.
* @param baseDir base dir for the context, for static files. Must exist,
* relative to the server home
*/
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java Wed
Sep 22 22:59:55 2010
@@ -77,7 +77,7 @@ public class TestCoyoteAdapter extends T
fail("Unable to create foo directory in docBase");
}
- Context ctx = tomcat.addContext("/", docBase.getAbsolutePath());
+ Context ctx = tomcat.addContext("", docBase.getAbsolutePath());
Tomcat.addServlet(ctx, "servlet", new PathParamServlet());
ctx.addServletMapping("/", "servlet");
@@ -99,7 +99,7 @@ public class TestCoyoteAdapter extends T
// Must have a real docBase - just use temp
Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
Tomcat.addServlet(ctx, "servlet", new PathParamServlet());
ctx.addServletMapping("/", "servlet");
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java Wed Sep 22
22:59:55 2010
@@ -211,7 +211,7 @@ public class TestRequest extends TomcatB
// Must have a real docBase - just use temp
Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
// Add the Servlet
Tomcat.addServlet(ctx, "servlet", new EchoQueryStringServlet());
@@ -255,7 +255,7 @@ public class TestRequest extends TomcatB
// Must have a real docBase - just use temp
Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
LoginConfig config = new LoginConfig();
config.setAuthMethod("BASIC");
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java Wed Sep
22 22:59:55 2010
@@ -45,7 +45,7 @@ public class TestResponse extends Tomcat
// Must have a real docBase - just use temp
File docBase = new File(System.getProperty("java.io.tmpdir"));
- Context ctx = tomcat.addContext("/", docBase.getAbsolutePath());
+ Context ctx = tomcat.addContext("", docBase.getAbsolutePath());
Tomcat.addServlet(ctx, "servlet", new Bug49598Servlet());
ctx.addServletMapping("/", "servlet");
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Wed
Sep 22 22:59:55 2010
@@ -42,7 +42,7 @@ public class TestAsyncContextImpl extend
// Must have a real docBase - just use temp
Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
Bug49528Servlet servlet = new Bug49528Servlet();
@@ -72,7 +72,7 @@ public class TestAsyncContextImpl extend
// Must have a real docBase - just use temp
Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
Bug49567Servlet servlet = new Bug49567Servlet();
@@ -106,7 +106,7 @@ public class TestAsyncContextImpl extend
// Must have a real docBase - just use temp
Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
AsyncStartNoCompleteServlet servlet =
new AsyncStartNoCompleteServlet();
@@ -134,7 +134,7 @@ public class TestAsyncContextImpl extend
// Must have a real docBase - just use temp
Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
AsyncStartWithCompleteServlet servlet =
new AsyncStartWithCompleteServlet();
@@ -324,7 +324,7 @@ public class TestAsyncContextImpl extend
fail("Unable to create async directory in docBase");
}
- Context ctx = tomcat.addContext("/", docBase.getAbsolutePath());
+ Context ctx = tomcat.addContext("", docBase.getAbsolutePath());
TimeoutServlet timeout = new TimeoutServlet();
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java
Wed Sep 22 22:59:55 2010
@@ -40,7 +40,7 @@ public class TestNamingContextListener e
// Must have a real docBase - just use temp
org.apache.catalina.Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
// Enable JNDI - it is disabled by default
tomcat.enableNaming();
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
Wed Sep 22 22:59:55 2010
@@ -39,7 +39,7 @@ public class TestStandardContextAliases
// Must have a real docBase - just use temp
StandardContext ctx = (StandardContext)
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
File lib = new File("webapps/examples/WEB-INF/lib");
ctx.setAliases("/WEB-INF/lib=" + lib.getCanonicalPath());
Modified:
tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java Wed
Sep 22 22:59:55 2010
@@ -81,7 +81,7 @@ public class TestAddCharSetFilter extend
// Must have a real docBase - just use temp
Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
// Add the Servlet
CharsetServlet servlet = new CharsetServlet(mode);
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=1000269&r1=1000268&r2=1000269&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
Wed Sep 22 22:59:55 2010
@@ -36,7 +36,7 @@ public class TestVirtualWebappLoader ext
File appDir = new File("test/webapp-3.0");
// Must have a real docBase - just use temp
StandardContext ctx =
- (StandardContext)tomcat.addContext("/", appDir.getAbsolutePath());
+ (StandardContext)tomcat.addContext("", appDir.getAbsolutePath());
VirtualWebappLoader loader = new VirtualWebappLoader();
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
Wed Sep 22 22:59:55 2010
@@ -37,7 +37,7 @@ public class TestWebappClassLoaderMemory
// Must have a real docBase - just use temp
Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
if (ctx instanceof StandardContext) {
((StandardContext) ctx).setClearReferencesStopTimerThreads(true);
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Wed Sep 22
22:59:55 2010
@@ -183,7 +183,7 @@ public class TestTomcat extends TomcatBa
// Must have a real docBase - just use temp
org.apache.catalina.Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
// You can customize the context by calling
// its API
@@ -242,7 +242,7 @@ public class TestTomcat extends TomcatBa
// Must have a real docBase - just use temp
org.apache.catalina.Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
// You can customise the context by calling its API
@@ -272,7 +272,7 @@ public class TestTomcat extends TomcatBa
// Must have a real docBase - just use temp
org.apache.catalina.Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
// You can customise the context by calling its API
Modified: tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java
(original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestProxyDirContext.java Wed
Sep 22 22:59:55 2010
@@ -37,7 +37,7 @@ public class TestProxyDirContext extends
// Must have a real docBase - just use temp
StandardContext ctx = (StandardContext)
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
ctx.setCacheTTL(500);
tomcat.start();
Modified: tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java Wed Sep
22 22:59:55 2010
@@ -69,7 +69,7 @@ public abstract class CookiesBaseTest ex
public static void addServlets(Tomcat tomcat) {
// Must have a real docBase - just use temp
Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
Tomcat.addServlet(ctx, "invalid", new CookieServlet("na;me", "value"));
ctx.addServletMapping("/invalid", "invalid");
Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java?rev=1000269&r1=1000268&r2=1000269&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java Wed Sep 22
22:59:55 2010
@@ -57,7 +57,7 @@ public class TestBug49158 extends Cookie
public static void addServlets(Tomcat tomcat) {
// Must have a real docBase - just use temp
Context ctx =
- tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+ tomcat.addContext("", System.getProperty("java.io.tmpdir"));
Tomcat.addServlet(ctx, path, new TestBug49158Servlet());
ctx.addServletMapping("/"+path, path);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
