Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51278
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Thu, 2 Jun 2011 15:54:26 +0000 (15:54 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Thu, 2 Jun 2011 15:54:26 +0000 (15:54 +0000)
commit347dc956f206c3c5402d2f3d10188d8a08ba7c9d
tree6ea4b6d87c754cdebe5f2bd91df3653d21fad426
parentcbe9dc1564079698616edc8e0f822a497c42462b
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51278
Allow ServletContainerInitializers to override settings in the global default web.xml and the host web.xml.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1130618 13f79535-47bb-0310-9956-ffa450edef68
java/org/apache/catalina/Wrapper.java
java/org/apache/catalina/core/ApplicationContext.java
java/org/apache/catalina/core/ApplicationServletRegistration.java
java/org/apache/catalina/core/StandardWrapper.java
java/org/apache/catalina/deploy/ServletDef.java
java/org/apache/catalina/deploy/WebXml.java
java/org/apache/catalina/startup/ContextConfig.java
test/org/apache/catalina/startup/TestContextConfig.java [new file with mode: 0644]
test/webapp-3.0/index.html [new file with mode: 0644]
webapps/docs/changelog.xml