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/19 18:01:30 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/ldap LDAPRoleManagement.java
jford 2004/05/19 09:01:30
Modified: src/java/org/apache/jetspeed/services/security/ldap
LDAPRoleManagement.java
Log:
Applied the rest of the patch
PR: JS1-468
Submitted by: Ender Hikmet
Revision Changes Path
1.10 +13 -6 jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/ldap/LDAPRoleManagement.java
Index: LDAPRoleManagement.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/ldap/LDAPRoleManagement.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LDAPRoleManagement.java 23 Feb 2004 03:52:33 -0000 1.9
+++ LDAPRoleManagement.java 19 May 2004 16:01:30 -0000 1.10
@@ -17,6 +17,7 @@
package org.apache.jetspeed.services.security.ldap;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.StringTokenizer;
import java.util.Vector;
@@ -25,8 +26,10 @@
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.om.profile.ProfileException;
+import org.apache.jetspeed.om.security.BaseJetspeedGroupRole;
import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.om.security.UserNamePrincipal;
+import org.apache.jetspeed.om.security.ldap.LDAPGroup;
import org.apache.jetspeed.om.security.ldap.LDAPRole;
import org.apache.jetspeed.om.security.ldap.LDAPUser;
import org.apache.jetspeed.services.JetspeedLDAP;
@@ -49,6 +52,7 @@
import org.apache.turbine.services.resources.ResourceService;
import org.apache.turbine.services.rundata.RunDataService;
+
/**
*
* @author <a href="mailto:ender@kilicoglu.nom.tr">Ender KILICOGLU</a>
@@ -109,23 +113,26 @@
throw new RoleException("Failed to Retrieve User: ", e);
}
- Vector roles= new Vector();
+ HashMap roles= new HashMap();
try
{
for (Enumeration enum = user.getGroupRoles().elements(); enum.hasMoreElements();)
{
st = new StringTokenizer((String)enum.nextElement(), ",");
- st.nextToken();
- roles.add(new LDAPRole(st.nextToken(), false));
+ LDAPGroup group = new LDAPGroup(st.nextToken(),false);
+ LDAPRole role = new LDAPRole(st.nextToken(),false);
+ BaseJetspeedGroupRole groupRole = new BaseJetspeedGroupRole();
+ groupRole.setGroup(group);
+ groupRole.setRole(role);
+ roles.put(group.getName() + role.getName(), groupRole);
}
}
catch(Exception e)
{
throw new RoleException("Failed to retrieve groups ", e);
}
- return roles.iterator();
-
+ return roles.values().iterator();
}
/**
* Retrieves all <code>Role</code>s.
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org