Author: violetagg
Date: Mon Jul 8 12:20:08 2013
New Revision: 1500687
URL: http://svn.apache.org/r1500687
Log:
Merged revision 1500663 from tomcat/trunk:
Provide test case for
META-INF/services/javax.servlet.ServletContainerInitializer that contains
multiple SCIs and comments.
Added:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TesterServletContainerInitializer1.java
- copied unchanged from r1500663,
tomcat/trunk/test/org/apache/catalina/startup/TesterServletContainerInitializer1.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TesterServletContainerInitializer2.java
- copied unchanged from r1500663,
tomcat/trunk/test/org/apache/catalina/startup/TesterServletContainerInitializer2.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources.jar
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1500663
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java?rev=1500687&r1=1500686&r2=1500687&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
Mon Jul 8 12:20:08 2013
@@ -146,6 +146,19 @@ public class TestContextConfig extends T
"envEntry1: 1 envEntry2: 2 envEntry3: 33 envEntry4: 4");
}
+ @Test
+ public void testBug55210() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir = new File("test/webapp-3.0-fragments");
+ tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+ tomcat.start();
+
+ assertPageContains("/test/TesterServlet1", "OK");
+ assertPageContains("/test/TesterServlet2", "OK");
+ }
+
private static class CustomDefaultServletSCI
implements ServletContainerInitializer {
Modified:
tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources.jar
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources.jar?rev=1500687&r1=1500686&r2=1500687&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
