You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2011/12/30 16:48:51 UTC
svn commit: r1225851 - in
/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/servlets:
TestDefaultServlet.java TestWebdavServlet.java
Author: olamy
Date: Fri Dec 30 15:48:51 2011
New Revision: 1225851
URL: http://svn.apache.org/viewvc?rev=1225851&view=rev
Log:
fix examples webapp path in unit test
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/servlets/TestWebdavServlet.java
Modified: tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/servlets/TestDefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1225851&r1=1225850&r2=1225851&view=diff
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/servlets/TestDefaultServlet.java (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/servlets/TestDefaultServlet.java Fri Dec 30 15:48:51 2011
@@ -56,7 +56,7 @@ public class TestDefaultServlet extends
String contextPath = "/examples";
- File appDir = new File(getBuildDirectory(), "webapps" + contextPath);
+ File appDir = new File(getBuildDirectory(), "examples");
// app dir is relative to server home
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
@@ -96,7 +96,7 @@ public class TestDefaultServlet extends
String contextPath = "/examples";
- File appDir = new File(getBuildDirectory(), "webapps" + contextPath);
+ File appDir = new File(getBuildDirectory(), "examples");
// app dir is relative to server home
org.apache.catalina.Context ctx =
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
Modified: tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/servlets/TestWebdavServlet.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/servlets/TestWebdavServlet.java?rev=1225851&r1=1225850&r2=1225851&view=diff
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/servlets/TestWebdavServlet.java (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/servlets/TestWebdavServlet.java Fri Dec 30 15:48:51 2011
@@ -42,7 +42,7 @@ public class TestWebdavServlet extends T
String contextPath = "/examples";
- File appDir = new File(getBuildDirectory(), "webapps" + contextPath);
+ File appDir = new File(getBuildDirectory(), "examples");
// app dir is relative to server home
org.apache.catalina.Context ctx =
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
@@ -86,7 +86,7 @@ public class TestWebdavServlet extends T
String contextPath = "/examples";
- File appDir = new File(getBuildDirectory(), "webapps" + contextPath);
+ File appDir = new File(getBuildDirectory(), "examples");
// app dir is relative to server home
org.apache.catalina.Context ctx =
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org