[jboss-cvs] JBossAS SVN: r59064 - trunk/ejb3/src/main/org/jboss/ejb3/metamodel

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

Author: anil.saldhana at jboss.com
Date: 2006-12-15 16:13:34 -0500 (Fri, 15 Dec 2006)
New Revision: 59064

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
Log:
EJBTHREE-807: bean meta data should include security role references

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java	2006-12-15 18:23:19 UTC (rev 59063)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java	2006-12-15 21:13:34 UTC (rev 59064)
@@ -24,8 +24,7 @@
 import java.io.IOException;
 import java.net.URL;
 
-import javax.management.ObjectName;
-import javax.persistence.PersistenceContextType;
+import javax.management.ObjectName; 
 
 import org.jboss.ejb3.KernelAbstraction;
 import org.jboss.ejb3.KernelAbstractionFactory;
@@ -37,7 +36,8 @@
 import org.jboss.xb.binding.UnmarshallerFactory;
 import org.jboss.xb.binding.UnmarshallingContext;
 import org.xml.sax.Attributes;
-
+ 
+import org.jboss.metadata.SecurityRoleRefMetaData;
 import org.jboss.metamodel.descriptor.DDObjectFactory;
 import org.jboss.metamodel.descriptor.EjbLocalRef;
 import org.jboss.metamodel.descriptor.EjbRef;
@@ -57,6 +57,7 @@
  * chuncks from unmarshaller and assembles them into an EjbJarDD instance.
  *
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @author Anil.Saldhana at jboss.org
  * @version <tt>$Revision$</tt>
  */
 public class EjbJarDDObjectFactory extends DDObjectFactory
@@ -268,8 +269,12 @@
       child = newEjbHasInterceptorsChild(parent, localName);
       if (child != null) return child;
 
-      if (localName.equals("security-identity"))
+      if(localName.equals("security-role-ref"))
       {
+         child = new SecurityRoleRefMetaData(); 
+      }
+      else if (localName.equals("security-identity"))
+      {
          child = new SecurityIdentity();
       }
       else if (localName.equals("remove-method"))
@@ -300,8 +305,12 @@
       child = newEjbChild(parent, localName);
       if (child == null)
       {
-         if (localName.equals("cmp-field"))
+         if(localName.equals("security-role-ref"))
          {
+            child = new SecurityRoleRefMetaData(); 
+         }
+         else if (localName.equals("cmp-field"))
+         {
             child = new CmpField();
          }
          else if (localName.equals("query"))
@@ -747,6 +756,12 @@
       parent.addEnterpriseBean(ejb);
    }
 
+   public void addChild(SessionEnterpriseBean parent, SecurityRoleRefMetaData child,
+         UnmarshallingContext navigator, String namespaceURI, String localName)
+   { 
+      parent.addSecurityRoleReference(child);
+   }
+   
    public void addChild(SessionEnterpriseBean parent, SecurityIdentity si,
                         UnmarshallingContext navigator, String namespaceURI, String localName)
    {
@@ -867,6 +882,12 @@
    {
       parent.addCmpField(field);
    }
+   
+   public void addChild(EntityEnterpriseBean parent, SecurityRoleRefMetaData child,
+         UnmarshallingContext navigator, String namespaceURI, String localName)
+   { 
+      parent.addSecurityRoleReference(child);
+   }
 
    /**
     * Called when parsing character is complete.
@@ -1401,6 +1422,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); 
+      }
+   }
+   
+   /**
     * Called when a child element with simple content is read for DD.
     */
    public void setValue(SecurityIdentity si, UnmarshallingContext navigator,

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java	2006-12-15 18:23:19 UTC (rev 59063)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java	2006-12-15 21:13:34 UTC (rev 59064)
@@ -28,6 +28,7 @@
 import javax.ejb.TransactionManagementType;
 import org.jboss.logging.Logger;
 
+import org.jboss.metadata.SecurityRoleRefMetaData;
 import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
 import org.jboss.metamodel.descriptor.InjectionTarget;
 import org.jboss.metamodel.descriptor.MessageDestinationRef; 
@@ -90,6 +91,10 @@
 
    private PoolConfig poolConfig = null;
    
+   /** The security-role-ref element(s) info */
+   private ArrayList<SecurityRoleRefMetaData> securityRoleReferences = new ArrayList<SecurityRoleRefMetaData>();
+   
+   
    public void addXmlAnnotation(XmlAnnotation annotation)
    {
       xmlAnnotations.add(annotation);
@@ -341,7 +346,22 @@
    {
       this.securityIdentity = securityIdentity;
    }
+   
+   public void addSecurityRoleReference(SecurityRoleRefMetaData srmd)
+   {
+      this.securityRoleReferences.add(srmd);
+   }
 
+   public ArrayList<SecurityRoleRefMetaData> getSecurityRoleReferences()
+   {
+      return securityRoleReferences;
+   }
+
+   public void setSecurityRoleReferences(ArrayList<SecurityRoleRefMetaData> securityRoleReferences)
+   {
+      this.securityRoleReferences = securityRoleReferences;
+   }
+
    public String toString()
    {
       StringBuffer sb = new StringBuffer(100);