You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/04/11 15:15:34 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap LDAPSecurityService.java
henning 2003/04/11 06:15:34
Modified: src/java/org/apache/turbine/util SecurityCheck.java
src/java/org/apache/turbine/services/security/ldap
LDAPSecurityService.java
Log:
Don't use deprecated methods.
Revision Changes Path
1.6 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/util/SecurityCheck.java
Index: SecurityCheck.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/SecurityCheck.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SecurityCheck.java 25 Mar 2003 17:15:30 -0000 1.5
+++ SecurityCheck.java 11 Apr 2003 13:15:34 -0000 1.6
@@ -129,7 +129,7 @@
public boolean hasRole(String role)
throws Exception
{
- return hasRole(TurbineSecurity.getRole(role));
+ return hasRole(TurbineSecurity.getRoleByName(role));
}
/**
@@ -166,7 +166,7 @@
public boolean hasPermission(String permission)
throws Exception
{
- return hasPermission(TurbineSecurity.getPermission(permission));
+ return hasPermission(TurbineSecurity.getPermissionByName(permission));
}
/**
1.16 +7 -6 jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap/LDAPSecurityService.java
Index: LDAPSecurityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap/LDAPSecurityService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- LDAPSecurityService.java 11 Apr 2003 11:39:10 -0000 1.15
+++ LDAPSecurityService.java 11 Apr 2003 13:15:34 -0000 1.16
@@ -1199,14 +1199,15 @@
public void revokeAll(Group group)
throws DataBackendException, UnknownEntityException
{
- User[] users = getUsers(new Criteria());
- for (int i = 0; i < users.length; i++)
+ for (Iterator it = getUserList(new Criteria()).iterator();
+ it.hasNext();)
{
- Iterator rolesIterator = getRoles(users[i], group).iterator();
- while (rolesIterator.hasNext())
+ User user = (User) it.next();
+ for (Iterator rolesIterator = getRoles(user, group).iterator();
+ rolesIterator.hasNext();)
{
Role role = (Role) rolesIterator.next();
- revoke(users[i], group, role);
+ revoke(user, group, role);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org