TCK failures: If a servlet/filter has any mappings in the main web.xml, these overrid...
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Sat, 3 Apr 2010 12:41:31 +0000 (12:41 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Sat, 3 Apr 2010 12:41:31 +0000 (12:41 +0000)
commitf800271615e0c93f0168d8ab9ec604f1b967d9bc
treeece7a52faa53007f703d68d12d760b668b2f9f43
parent27c58b845a1587efa324b09072dbbd0a0354e0ee
TCK failures: If a servlet/filter has any mappings in the main web.xml, these override rather than replace the mappings defined in the fragments. The same goes for fragments and annotations.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@930514 13f79535-47bb-0310-9956-ffa450edef68
java/org/apache/catalina/deploy/WebXml.java
java/org/apache/catalina/startup/ContextConfig.java