[jboss-cvs] JBossAS SVN: r60013 - trunk/server/src/main/org/jboss/metadata.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2007-01-25 21:49:06 -0500 (Thu, 25 Jan 2007)
New Revision: 60013

Modified:
   trunk/server/src/main/org/jboss/metadata/WebMetaData.java
Log:
- Fix data structure used for servlet and filter mappings.

Modified: trunk/server/src/main/org/jboss/metadata/WebMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2007-01-26 02:34:22 UTC (rev 60012)
+++ trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2007-01-26 02:49:06 UTC (rev 60013)
@@ -82,7 +82,7 @@
    
    private HashMap<String, Servlet> servlets = new HashMap<String, Servlet>();
    /** The web.xml servlet-mapping <String, String> */
-   private HashMap<String, ServletMapping> servletMappings = new HashMap<String, ServletMapping>();
+   private List<ServletMapping> servletMappings = new ArrayList<ServletMapping>();
    /** The web.xml resource-refs */
    private HashMap<String, ResourceRefMetaData> resourceReferences =
       new HashMap<String, ResourceRefMetaData>();
@@ -98,8 +98,8 @@
    /** web-app/filter */
    protected HashMap<String, Filter> filters = new HashMap<String, Filter>();
    /** web-app/filter-mapping */
-   protected HashMap<String, FilterMapping> filterMappings =
-      new HashMap<String, FilterMapping>();
+   protected List<FilterMapping> filterMappings =
+      new ArrayList<FilterMapping>();
    protected HashMap listeners = new HashMap();
    protected List<SessionConfig> sessionConfigs = new ArrayList<SessionConfig>();
    /** web.xml security-constraint */
@@ -292,12 +292,12 @@
    
    public Collection<FilterMapping> getFilterMappings()
    {
-      return filterMappings.values();
+      return filterMappings;
    }
 
    public void addFilterMapping(FilterMapping mapping)
    {
-      filterMappings.put(mapping.getFilterName(), mapping);
+      filterMappings.add(mapping);
    }
    
    public Collection getListeners()
@@ -336,12 +336,12 @@
    
    public Collection getServletMappings()
    {
-      return servletMappings.values();
+      return servletMappings;
    }
 
    public void addServletMapping(ServletMapping mapping)
    {
-      servletMappings.put(mapping.getName(), mapping);
+      servletMappings.add(mapping);
    }
    
    public Collection getSessionConfigs()
@@ -983,7 +983,7 @@
     */
    public Set getServletNames()
    {
-      return new HashSet(servletMappings.keySet());
+      return new HashSet(servlets.keySet());
    }
 
    /**