Fix TCK failure exposed by the fix for https://issues.apache.org/bugzilla/show_bug...
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Fri, 3 Jun 2011 18:07:24 +0000 (18:07 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Fri, 3 Jun 2011 18:07:24 +0000 (18:07 +0000)
commitd48ee4f3f7889907fcc3c7d85950dce1eb075bf8
tree4d437be1a463f8a44adbda263e218bb60a03496a
parent8243ed4d4d3c01c1310d280c54cef392d5bf934b
Fix TCK failure exposed by the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=51278
A previous change to ensure web.xml had precedence over fragments and annotations was not complete. It handled filter definitions and servlet definitions but not servlet mappings.

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