[jboss-cvs] JBossAS SVN: r66967 - trunk/ejb3/src/main/org/jboss/ejb3/security.

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

Author: anil.saldhana at jboss.com
Date: 2007-11-12 12:20:56 -0500 (Mon, 12 Nov 2007)
New Revision: 66967

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java
Log:
fix extra roles for RunAsIdentity

Modified: trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java	2007-11-12 17:02:37 UTC (rev 66966)
+++ trunk/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java	2007-11-12 17:20:56 UTC (rev 66967)
@@ -39,6 +39,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
 import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
 import org.jboss.security.AuthenticationManager;
 import org.jboss.security.RealmMapping;
 import org.jboss.security.RunAsIdentity;
@@ -66,10 +67,13 @@
       if (rap != null) 
          runAsPrincipal = rap.value();
       
-      Set<SecurityRoleMetaData> extraRoles = new HashSet<SecurityRoleMetaData>();  
+      Set<String> extraRoles = new HashSet<String>();
+      
       JBossAssemblyDescriptorMetaData ad = container.getAssemblyDescriptor();
       if(ad != null)
-         extraRoles.addAll(ad.getSecurityRolesByPrincipal(runAsPrincipal));
+      {
+         extraRoles.addAll(ad.getSecurityRoleNamesByPrincipal(runAsPrincipal));
+      }
       
       return new RunAsIdentity(runAs.value(), runAsPrincipal, extraRoles);
    }