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

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

Author: anil.saldhana at jboss.com
Date: 2006-12-18 18:13:44 -0500 (Mon, 18 Dec 2006)
New Revision: 59100

Modified:
   trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java
Log:
fill up the security role refs at the meta data level

Modified: trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java	2006-12-18 23:09:24 UTC (rev 59099)
+++ trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java	2006-12-18 23:13:44 UTC (rev 59100)
@@ -21,6 +21,9 @@
  */
 package org.jboss.metadata.web;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.jboss.logging.Logger;
 import org.jboss.metadata.DDObjectFactory;
 import org.jboss.metadata.EjbLocalRefMetaData;
@@ -45,6 +48,7 @@
  * An ObjectModelFactory implementation for parsing web.xml descriptors.
  * 
  * @author Scott.Stark at jboss.org
+ * @author Anil.Saldhana at jboss.org
  * @version $Revision:$
  */
 public class WebMetaDataObjectFactory extends DDObjectFactory
@@ -305,6 +309,13 @@
          UnmarshallingContext navigator, String namespaceURI, String localName)
    {
       parent.addServlet(servlet);
+      //Roll up the security role-refs
+      Collection securityRR = servlet.getSecurityRoleRefs();
+      if(securityRR != null && securityRR.size() > 0)
+      {
+         ArrayList srr = new ArrayList(securityRR);
+         parent.addSecurityRoleReference(servlet.getName(), srr);
+      } 
    }
 
    public void addChild(WebMetaData parent, ServletMapping mapping,
@@ -407,7 +418,7 @@
    public void addChild(Servlet parent, SecurityRoleRefMetaData ref,
          UnmarshallingContext navigator, String namespaceURI, String localName)
    {
-      parent.addSecurityRoleRef(ref);
+      parent.addSecurityRoleRef(ref); 
    }
 
    public void addChild(WebSecurityMetaData parent,