TCK failures: If a servlet/filter has any mappings in the main web.xml, these overrid...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@930514 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/deploy/WebXml.java b/java/org/apache/catalina/deploy/WebXml.java
index 7f8ce36..7ee63f6 100644 (file)
--- a/java/org/apache/catalina/deploy/WebXml.java
+++ b/java/org/apache/catalina/deploy/WebXml.java
@@ -272,8 +272,10 @@ public class WebXml {
     
     // filter-mapping
     private Set<FilterMap> filterMaps = new LinkedHashSet<FilterMap>();
+    private Set<String> filterMappingNames = new HashSet<String>();
     public void addFilterMapping(FilterMap filterMap) {
         filterMaps.add(filterMap);
+        filterMappingNames.add(filterMap.getFilterName());
     }
     public Set<FilterMap> getFilterMappings() { return filterMaps; }
     
@@ -301,8 +303,10 @@ public class WebXml {
     
     // servlet-mapping
     private Map<String,String> servletMappings = new HashMap<String,String>();
+    private Set<String> servletMappingNames = new HashSet<String>();
     public void addServletMapping(String urlPattern, String servletName) {
         servletMappings.put(urlPattern, servletName);
+        servletMappingNames.add(servletName);
     }
     public Map<String,String> getServletMappings() { return servletMappings; }
     
@@ -1407,9 +1411,22 @@ public class WebXml {
         }
         errorPages.putAll(temp.getErrorPages());
 
+        // As per 'clarification' from the Servlet EG, filter mappings in the
+        // main web.xml override those in fragments and those in fragments
+        // override mappings in annotations
+        for (WebXml fragment : fragments) {
+            Iterator<FilterMap> iterFilterMaps =
+                fragment.getFilterMappings().iterator();
+            while (iterFilterMaps.hasNext()) {
+                FilterMap filterMap = iterFilterMaps.next();
+                if (filterMappingNames.contains(filterMap.getFilterName())) {
+                    iterFilterMaps.remove();
+                }
+            }
+        }
         for (WebXml fragment : fragments) {
             for (FilterMap filterMap : fragment.getFilterMappings()) {
-                // Always additive
+                // Additive
                 addFilterMapping(filterMap);
             }
         }
@@ -1550,10 +1567,23 @@ public class WebXml {
         serviceRefs.putAll(temp.getServiceRefs());
         mergeInjectionFlags.clear();
 
+        // As per 'clarification' from the Servlet EG, servlet mappings in the
+        // main web.xml override those in fragments and those in fragments
+        // override mappings in annotations
+        for (WebXml fragment : fragments) {
+            Iterator<Map.Entry<String,String>> iterServletMaps =
+                fragment.getServletMappings().entrySet().iterator();
+            while (iterServletMaps.hasNext()) {
+                Map.Entry<String,String> servletMap = iterServletMaps.next();
+                if (servletMappingNames.contains(servletMap.getValue())) {
+                    iterServletMaps.remove();
+                }
+            }
+        }
         for (WebXml fragment : fragments) {
             for (Map.Entry<String,String> mapping :
                     fragment.getServletMappings().entrySet()) {
-                // Always additive
+                // Additive
                 addServletMapping(mapping.getKey(), mapping.getValue());
             }
         }

diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index 25faae0..b248c68 100644 (file)
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -32,6 +32,7 @@ import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -1210,7 +1211,7 @@ public class ContextConfig
             // Have to process JARs for fragments
             Map<String,WebXml> fragments = processJarsForWebFragments();
             
-            // Merge the fragments into the main web.xml
+            // Order the fragments
             Set<WebXml> orderedFragments =
                 WebXml.orderWebFragments(webXml, fragments);
 
@@ -1454,8 +1455,13 @@ public class ContextConfig
     protected void processAnnotations(Set<WebXml> fragments) {
         for(WebXml fragment : fragments) {
             if (!fragment.isMetadataComplete()) {
+                WebXml annotations = new WebXml();
                 URL url = fragment.getURL();
-                processAnnotationsUrl(url, fragment);
+                processAnnotationsUrl(url, annotations);
+                Set<WebXml> set = new HashSet<WebXml>();
+                set.add(annotations);
+                // Merge annotations into fragment - fragment takes priority
+                fragment.merge(set);
             }
         }
     }