[jboss-cvs] JBossAS SVN: r58846 - trunk/server/src/main/org/jboss/deployment

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

Author: anil.saldhana at jboss.com
Date: 2006-12-05 11:22:57 -0500 (Tue, 05 Dec 2006)
New Revision: 58846

Modified:
   trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
Log:
handle security role-ref in ejb-jar.xml

Modified: trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2006-12-05 16:22:16 UTC (rev 58845)
+++ trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2006-12-05 16:22:57 UTC (rev 58846)
@@ -37,6 +37,7 @@
 import org.jboss.metadata.RelationshipRoleMetaData;
 import org.jboss.metadata.SecurityIdentityMetaData;
 import org.jboss.metadata.SecurityRoleMetaData;
+import org.jboss.metadata.SecurityRoleRefMetaData;
 import org.jboss.metadata.SessionMetaData;
 import org.jboss.metadata.BeanMetaData;
 import org.jboss.metadata.ActivationConfigPropertyMetaData;
@@ -184,6 +185,8 @@
       {
          return child;
       }
+      else if(localName.equals("security-role-ref"))
+         child = new SecurityRoleRefMetaData();
       else if (localName.equals("security-identity"))
       {
          child = new SecurityIdentityMetaData();
@@ -234,6 +237,8 @@
          return child;
       else if (localName.equals("security-identity"))
          child = new SecurityIdentityMetaData();
+      else if(localName.equals("security-role-ref"))
+         child = new SecurityRoleRefMetaData();
       else if(log.isTraceEnabled())
       {
          log.trace("Ignoring child of session: " + localName);
@@ -344,7 +349,7 @@
          parent.setUseCallerIdentity(true);
       }
       return null;
-   }
+   } 
 
    public Object newChild(MethodPermission parent, UnmarshallingContext navigator,
          String namespaceURI, String localName, Attributes attrs)
@@ -405,6 +410,12 @@
    {
       parent.setSecurityIdentityMetaData(child);
    }
+   
+   public void addChild(EntityMetaData parent, SecurityRoleRefMetaData child,
+         UnmarshallingContext navigator, String namespaceURI, String localName)
+   { 
+      parent.addSecurityRoleReference(child);
+   }
 
    public void addChild(EntityMetaData parent, CMPFieldMetaData field,
          UnmarshallingContext navigator, String namespaceURI, String localName)
@@ -465,6 +476,12 @@
    {
       parent.setSecurityIdentityMetaData(child);
    }
+   
+   public void addChild(SessionMetaData parent, SecurityRoleRefMetaData child,
+         UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addSecurityRoleReference(child);
+   }
 
    public void addChild(SessionMetaData parent, EjbLocalRefMetaData child,
          UnmarshallingContext navigator, String namespaceURI, String localName)
@@ -1012,6 +1029,23 @@
       }
    }
    
+   /**
+    * <!ELEMENT security-role-ref (rolename,role-link))>
+    */
+   public void setValue(SecurityRoleRefMetaData parent,
+         UnmarshallingContext navigator, String namespaceURI, String localName,
+         String value)
+   {
+      if(localName.equals("role-name"))
+      {
+         parent.setName(value); 
+      }
+      else if(localName.equals("role-link"))
+      {
+         parent.setLink(value); 
+      }
+   }
+   
    public void setValue(MessageDestinationMetaData mdmd,
          UnmarshallingContext navigator, String namespaceURI, String localName,
          String value)