[jboss-cvs] JBossAS SVN: r69632 - projects/security/security-spi/trunk/spi/src/main/org/jboss/security.

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

Author: anil.saldhana at jboss.com
Date: 2008-02-05 16:58:28 -0500 (Tue, 05 Feb 2008)
New Revision: 69632

Modified:
   projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SecurityContextUtil.java
   projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SubjectInfo.java
Log:
SECURITY-108: replace roles in sec ctx data map with rolegroup in subject info

Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SecurityContextUtil.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SecurityContextUtil.java	2008-02-05 21:57:36 UTC (rev 69631)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SecurityContextUtil.java	2008-02-05 21:58:28 UTC (rev 69632)
@@ -25,6 +25,8 @@
 
 import javax.security.auth.Subject;
 
+import org.jboss.security.identity.RoleGroup;
+
 //$Id$
 
 /**
@@ -86,14 +88,14 @@
     * @param <T>
     * @return
     */
-   public abstract <T>  T getRoles();
+   public abstract RoleGroup getRoles();
    
    /**
     * Set the roles for the user for the current security context
     * @param <T>
     * @param roles
     */
-   public abstract <T>  void setRoles(T roles);
+   public abstract void setRoles(RoleGroup roles);
    
    /**
     * Create SubjectInfo and set it in the current security context

Modified: projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SubjectInfo.java
===================================================================
--- projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SubjectInfo.java	2008-02-05 21:57:36 UTC (rev 69631)
+++ projects/security/security-spi/trunk/spi/src/main/org/jboss/security/SubjectInfo.java	2008-02-05 21:58:28 UTC (rev 69632)
@@ -26,6 +26,8 @@
 
 import javax.security.auth.Subject;
 
+import org.jboss.security.identity.RoleGroup;
+
 //$Id$
 
 /**
@@ -41,6 +43,8 @@
    private Object authenticationCredential;
    private Subject authenticatedSubject;
    
+   private RoleGroup roles;
+   
    SubjectInfo(Principal principal, Object credential,Subject subject)
    {
       this.authenticationPrincipal = principal;
@@ -76,5 +80,15 @@
    public void setAuthenticatedSubject(Subject authenticatedSubject)
    {
       this.authenticatedSubject = authenticatedSubject;
+   }
+
+   public RoleGroup getRoles()
+   {
+      return roles;
+   }
+
+   public void setRoles(RoleGroup roles)
+   {
+      this.roles = roles;
    } 
 }