Author: markt
Date: Thu Oct 10 21:37:40 2013
New Revision: 1531120
URL: http://svn.apache.org/r1531120
Log:
Fix TestVirtualContext after changes in r1530937
Added:
tomcat/trunk/test/webapp-virtual-library/target/WEB-INF/ (with props)
tomcat/trunk/test/webapp-virtual-library/target/WEB-INF/C.tld
- copied unchanged from r1531109,
tomcat/trunk/test/webapp-virtual-library/target/classes/META-INF/C.tld
tomcat/trunk/test/webapp-virtual-library/target/WEB-INF/classes/
- copied from r1531109,
tomcat/trunk/test/webapp-virtual-library/target/classes/
Removed:
tomcat/trunk/test/webapp-virtual-library/target/WEB-INF/classes/META-INF/C.tld
tomcat/trunk/test/webapp-virtual-library/target/classes/
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
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=1531120&r1=1531119&r2=1531120&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java Thu
Oct 10 21:37:40 2013
@@ -69,7 +69,7 @@ public class TestVirtualContext extends
ctx.setResources(new StandardRoot(ctx));
File f1 = new File("test/webapp-virtual-webapp/target/classes");
- File f2 = new File("test/webapp-virtual-library/target/classes");
+ File f2 = new File("test/webapp-virtual-library/target/WEB-INF");
File f3 = new File(
"test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes");
File f4 = new File(
@@ -80,7 +80,7 @@ public class TestVirtualContext extends
WebResourceRoot.ResourceSetType.POST, "/WEB-INF/classes",
f1.getAbsolutePath(), null, "/");
ctx.getResources().createWebResourceSet(
- WebResourceRoot.ResourceSetType.POST, "/WEB-INF/classes",
+ WebResourceRoot.ResourceSetType.POST, "/WEB-INF",
f2.getAbsolutePath(), null, "/");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, "/WEB-INF/classes",
@@ -159,7 +159,7 @@ public class TestVirtualContext extends
allUrls.indexOf("/test/webapp-virtual-webapp/target/classes/rsrc")
> 0);
assertTrue(
allUrls,
-
allUrls.indexOf("/test/webapp-virtual-library/target/classes/rsrc") > 0);
+
allUrls.indexOf("/test/webapp-virtual-library/target/WEB-INF/classes/rsrc") >
0);
// check that there's no duplicate in the URLs
String[] allUrlsArray = allUrls.split("\\s+");
Propchange: tomcat/trunk/test/webapp-virtual-library/target/WEB-INF/
------------------------------------------------------------------------------
bugtraq:append = false
Propchange: tomcat/trunk/test/webapp-virtual-library/target/WEB-INF/
------------------------------------------------------------------------------
bugtraq:label = Bugzilla ID (optional)
Propchange: tomcat/trunk/test/webapp-virtual-library/target/WEB-INF/
------------------------------------------------------------------------------
--- bugtraq:message (added)
+++ bugtraq:message Thu Oct 10 21:37:40 2013
@@ -0,0 +1 @@
+Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: tomcat/trunk/test/webapp-virtual-library/target/WEB-INF/
------------------------------------------------------------------------------
bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
