You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by jf...@apache.org on 2004/05/18 16:18:38 UTC

cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/nosecurity NoRoleManagement.java

jford       2004/05/18 07:18:38

  Modified:    src/java/org/apache/jetspeed/services/security/nosecurity
                        NoRoleManagement.java
  Log:
  getRoles() now returns an iterator of GroupRole objects
  
  PR: JS1-458
  
  Revision  Changes    Path
  1.4       +16 -4     jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/nosecurity/NoRoleManagement.java
  
  Index: NoRoleManagement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/nosecurity/NoRoleManagement.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NoRoleManagement.java	23 Feb 2004 03:53:24 -0000	1.3
  +++ NoRoleManagement.java	18 May 2004 14:18:38 -0000	1.4
  @@ -22,6 +22,8 @@
   // Jetspeed Security
   import org.apache.jetspeed.services.security.RoleManagement;
   
  +import org.apache.jetspeed.om.security.BaseJetspeedGroup;
  +import org.apache.jetspeed.om.security.BaseJetspeedGroupRole;
   import org.apache.jetspeed.om.security.Role;
   
   import org.apache.jetspeed.services.JetspeedSecurity;
  @@ -47,7 +49,7 @@
      implements RoleManagement
   {
       /**
  -     * Retrieves all <code>Role</code>s for a given username principal.
  +     * Retrieves all <code>GroupRole</code>s for a given username principal.
        *
        * The security service may optionally check the current user context
        * to determine if the requestor has permission to perform this action.
  @@ -62,11 +64,21 @@
       {
           // give everyone the "user" role
           Vector v = new Vector(1);
  -        BaseJetspeedRole r = new BaseJetspeedRole();
  +        BaseJetspeedGroupRole gr = new BaseJetspeedGroupRole();
           //r.setNew(false);
  +        
  +        BaseJetspeedRole r = new BaseJetspeedRole();
           r.setName(JetspeedSecurity.JETSPEED_ROLE_USER);
           r.setId(JetspeedSecurity.JETSPEED_ROLE_USER);
  -        v.add(r);
  +        
  +        BaseJetspeedGroup g = new BaseJetspeedGroup();
  +        g.setId(JetspeedSecurity.JETSPEED_GROUP_ID);
  +        g.setName(JetspeedSecurity.JETSPEED_GROUP);
  +        
  +        gr.setGroup(g);
  +        gr.setRole(r);
  +        
  +        v.add(gr);
           return v.iterator();
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org