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

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

Author: thomas.diesler at jboss.com
Date: 2006-11-02 10:14:46 -0500 (Thu, 02 Nov 2006)
New Revision: 58009

Modified:
   trunk/server/src/main/org/jboss/metadata/WebMetaData.java
Log:
Remove redundant servletClassMap

Modified: trunk/server/src/main/org/jboss/metadata/WebMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2006-11-02 14:14:58 UTC (rev 58008)
+++ trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2006-11-02 15:14:46 UTC (rev 58009)
@@ -44,11 +44,11 @@
 import org.jboss.metadata.web.Servlet;
 import org.jboss.metadata.web.ServletMapping;
 import org.jboss.metadata.web.SessionConfig;
-import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
 import org.jboss.mx.loading.LoaderRepositoryFactory;
 import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
 import org.jboss.mx.util.ObjectNameFactory;
 import org.jboss.security.RunAsIdentity;
+import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
 import org.w3c.dom.Element;
 
 /** A representation of the web.xml and jboss-web.xml deployment
@@ -74,8 +74,6 @@
    /** web-app/init-param */
    private List<ParamValue> initParams = new ArrayList<ParamValue>();
    
-   /** The web.xml servlet to class mapping */
-   private HashMap<String, String> servletClassNames = new HashMap<String, String>();
    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>();
@@ -307,9 +305,6 @@
    {
       String servletName = servlet.getName();
       servlets.put(servletName, servlet);
-      // Need to see where this mapping is used
-      String servletClass = servlet.getServletClass();
-      this.servletClassNames.put(servletName, servletClass);
    }
    
    public void updateServlet(Servlet updatedServlet)
@@ -849,15 +844,6 @@
    }
 
    /**
-    * Get the servlet-name/servlet-class mapping from the web.xml descriptor
-    * @return Map<String, String> of the servlet-name/servlet-class mapping from web.xml
-    */
-   public Map getServletClassMap()
-   {
-      return new HashMap(servletClassNames);
-   }
-
-   /**
     * Merge the security role/principal mapping defined in jboss-web.xml
     * with the one defined at jboss-app.xml.
     */