[jboss-cvs] JBossAS SVN: r58336 - in trunk/server/src/main/org/jboss: deployment metadata

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

Author: alex.loubyansky at jboss.com
Date: 2006-11-14 08:49:55 -0500 (Tue, 14 Nov 2006)
New Revision: 58336

Modified:
   trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
   trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
   trunk/server/src/main/org/jboss/metadata/BeanMetaData.java
Log:
proper security-identity parsing, consistent getter/setter for security identity metadata

Modified: trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2006-11-14 12:53:42 UTC (rev 58335)
+++ trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2006-11-14 13:49:55 UTC (rev 58336)
@@ -305,6 +305,20 @@
       return null;
    }
 
+   public Object newChild(SecurityIdentityMetaData parent, UnmarshallingContext navigator,
+         String namespaceURI, String localName, Attributes attrs)
+   {
+      if(localName.equals("run-as"))
+      {
+         return parent;
+      }
+      else if(localName.equals("use-caller-identity"))
+      {
+         parent.setUseCallerIdentity(true);
+      }
+      return null;
+   }
+
    public void addChild(ApplicationMetaData parent, EntityMetaData entity,
          UnmarshallingContext navigator, String namespaceURI, String localName)
    {
@@ -332,7 +346,7 @@
    public void addChild(EntityMetaData parent, SecurityIdentityMetaData child,
          UnmarshallingContext navigator, String namespaceURI, String localName)
    {
-      parent.setSecurityIdentity(child);
+      parent.setSecurityIdentityMetaData(child);
    }
 
    public void addChild(EntityMetaData parent, CMPFieldMetaData field,
@@ -392,7 +406,7 @@
    public void addChild(SessionMetaData parent, SecurityIdentityMetaData child,
          UnmarshallingContext navigator, String namespaceURI, String localName)
    {
-      parent.setSecurityIdentity(child);
+      parent.setSecurityIdentityMetaData(child);
    }
 
    public void addChild(SessionMetaData parent, EjbLocalRefMetaData child,
@@ -494,7 +508,7 @@
    public void addChild(MessageDrivenMetaData parent, SecurityIdentityMetaData child,
          UnmarshallingContext navigator, String namespaceURI, String localName)
    {
-      parent.setSecurityIdentity(child);
+      parent.setSecurityIdentityMetaData(child);
    }
 
    public void addChild(MessageDrivenMetaData mdb, ActivationConfigPropertyMetaData child,
@@ -908,12 +922,8 @@
          UnmarshallingContext navigator, String namespaceURI, String localName,
          String value)
    {
-      if(localName.equals("use-caller-identity"))
+      if(localName.equals("role-name"))
       {
-         parent.setUseCallerIdentity(Boolean.parseBoolean(value));
-      }
-      else if(localName.equals("run-as") || localName.equals("role-name"))
-      {
          parent.setRunAsRoleName(value);
       }
    }

Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java	2006-11-14 12:53:42 UTC (rev 58335)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java	2006-11-14 13:49:55 UTC (rev 58336)
@@ -200,7 +200,7 @@
       }
       else if(localName.equals("security-identity"))
       {
-         child = bean.metaData.getSecurityIdentity();
+         child = bean.metaData.getSecurityIdentityMetaData();
          if(child == null)
          {
             throw new IllegalStateException("security-identity in jboss.xml has no match in ejb-jar.xml for " + bean.metaData.getEjbName());

Modified: trunk/server/src/main/org/jboss/metadata/BeanMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/BeanMetaData.java	2006-11-14 12:53:42 UTC (rev 58335)
+++ trunk/server/src/main/org/jboss/metadata/BeanMetaData.java	2006-11-14 13:49:55 UTC (rev 58336)
@@ -488,6 +488,12 @@
    {
       return securityIdentity;
    }
+
+   public void setSecurityIdentityMetaData(SecurityIdentityMetaData securityIdentity)
+   {
+      this.securityIdentity = securityIdentity;
+   }
+
    public SecurityIdentityMetaData getEjbTimeoutIdentity()
    {
       return ejbTimeoutIdentity;
@@ -933,16 +939,6 @@
       this.remoteClass = remoteClass;
    }
 
-   public SecurityIdentityMetaData getSecurityIdentity()
-   {
-      return securityIdentity;
-   }
-
-   public void setSecurityIdentity(SecurityIdentityMetaData securityIdentity)
-   {
-      this.securityIdentity = securityIdentity;
-   }
-
    public String getServiceEndpointClass()
    {
       return serviceEndpointClass;