[jboss-cvs] JBossAS SVN: r63862 - in projects/metadata/trunk: src/main/java/org/jboss/ejb3/metamodel and 1 other directory.

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

Author: wolfc
Date: 2007-07-06 06:00:24 -0400 (Fri, 06 Jul 2007)
New Revision: 63862

Modified:
   projects/metadata/trunk/
   projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
   projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EnterpriseBean.java
Log:
EJBTHREE-997: merged from trunk


Property changes on: projects/metadata/trunk
___________________________________________________________________
Name: subclipse:tags
   + 63852,ejb3-trunk,/trunk/ejb3,branch

Modified: projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java	2007-07-06 07:19:22 UTC (rev 63861)
+++ projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java	2007-07-06 10:00:24 UTC (rev 63862)
@@ -25,7 +25,6 @@
 import java.net.URL;
 
 import org.jboss.logging.Logger;
-import org.jboss.metadata.SecurityRoleRefMetaData;
 import org.jboss.metamodel.descriptor.DDObjectFactory;
 import org.jboss.metamodel.descriptor.EjbLocalRef;
 import org.jboss.metamodel.descriptor.EjbRef;
@@ -38,6 +37,7 @@
 import org.jboss.metamodel.descriptor.ResourceRef;
 import org.jboss.metamodel.descriptor.RunAs;
 import org.jboss.metamodel.descriptor.SecurityRole;
+import org.jboss.metamodel.descriptor.SecurityRoleRef;
 import org.jboss.util.xml.JBossEntityResolver;
 import org.jboss.util.StringPropertyReplacer;
 import org.jboss.ws.integration.ServiceRefMetaData;
@@ -257,7 +257,7 @@
 
       if (localName.equals("security-role-ref"))
       {
-         child = new SecurityRoleRefMetaData();
+         child = new SecurityRoleRef();
       }
       else if (localName.equals("security-identity"))
       {
@@ -291,7 +291,7 @@
       {
          if (localName.equals("security-role-ref"))
          {
-            child = new SecurityRoleRefMetaData();
+            child = new SecurityRoleRef();
          }
          else if (localName.equals("cmp-field"))
          {
@@ -698,9 +698,9 @@
       parent.addEnterpriseBean(ejb);
    }
 
-   public void addChild(SessionEnterpriseBean parent, SecurityRoleRefMetaData child, UnmarshallingContext navigator, String namespaceURI, String localName)
+   public void addChild(SessionEnterpriseBean parent, SecurityRoleRef roleRef, UnmarshallingContext navigator, String namespaceURI, String localName)
    {
-      parent.addSecurityRoleReference(child);
+      parent.addSecurityRoleRef(roleRef);
    }
 
    public void addChild(SessionEnterpriseBean parent, SecurityIdentity si, UnmarshallingContext navigator, String namespaceURI, String localName)
@@ -811,11 +811,6 @@
       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.
     */
@@ -1313,15 +1308,15 @@
    /**
     * <!ELEMENT security-role-ref (rolename,role-link))>
     */
-   public void setValue(SecurityRoleRefMetaData parent, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   public void setValue(SecurityRoleRef parent, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
    {
       if (localName.equals("role-name"))
       {
-         parent.setName(value);
+         parent.setRoleName(value);
       }
       else if (localName.equals("role-link"))
       {
-         parent.setLink(value);
+         parent.setRoleLink(value);
       }
    }
 

Modified: projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EnterpriseBean.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EnterpriseBean.java	2007-07-06 07:19:22 UTC (rev 63861)
+++ projects/metadata/trunk/src/main/java/org/jboss/ejb3/metamodel/EnterpriseBean.java	2007-07-06 10:00:24 UTC (rev 63862)
@@ -29,12 +29,12 @@
 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;
 import org.jboss.metamodel.descriptor.ResourceEnvRef;
 import org.jboss.metamodel.descriptor.ResourceRef;
+import org.jboss.metamodel.descriptor.SecurityRoleRef;
 
 /**
  * Represents an EJB element of the ejb-jar.xml deployment descriptor for the
@@ -97,7 +97,7 @@
    private Ejb3PortComponent portComponent;
    
    /** The security-role-ref element(s) info */
-   private ArrayList<SecurityRoleRefMetaData> securityRoleReferences = new ArrayList<SecurityRoleRefMetaData>();
+   private Collection<SecurityRoleRef> securityRoleRefs = new HashSet<SecurityRoleRef>();
    
    
    public void addXmlAnnotation(XmlAnnotation annotation)
@@ -372,21 +372,16 @@
       this.securityIdentity = securityIdentity;
    }
    
-   public void addSecurityRoleReference(SecurityRoleRefMetaData srmd)
+   public void addSecurityRoleRef(SecurityRoleRef roleRef)
    {
-      this.securityRoleReferences.add(srmd);
+      this.securityRoleRefs.add(roleRef);
    }
 
-   public ArrayList<SecurityRoleRefMetaData> getSecurityRoleReferences()
+   public Collection<SecurityRoleRef> getSecurityRoleRefs()
    {
-      return securityRoleReferences;
+      return securityRoleRefs;
    }
 
-   public void setSecurityRoleReferences(ArrayList<SecurityRoleRefMetaData> securityRoleReferences)
-   {
-      this.securityRoleReferences = securityRoleReferences;
-   }
-
    public Ejb3PortComponent getPortComponent()
    {
       return portComponent;