Author: tv
Date: Tue Aug 14 15:21:20 2012
New Revision: 1372920
URL: http://svn.apache.org/viewvc?rev=1372920&view=rev
Log:
Adjust to changes of the API
Modified:
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryGroupManagerImpl.java
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryHelper.java
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryUserManagerImpl.java
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/basic/MemoryModelManagerImpl.java
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerImpl.java
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java
Modified:
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryGroupManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryGroupManagerImpl.java?rev=1372920&r1=1372919&r2=1372920&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryGroupManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryGroupManagerImpl.java
Tue Aug 14 15:21:20 2012
@@ -39,7 +39,7 @@ public class MemoryGroupManagerImpl
extends AbstractGroupManager
implements GroupManager
{
- private static List groups = new ArrayList();
+ private static List<Group> groups = new ArrayList<Group>();
/** Our Unique ID counter */
// private static int uniqueId = 0;
Modified:
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryHelper.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryHelper.java?rev=1372920&r1=1372919&r2=1372920&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryHelper.java
(original)
+++
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryHelper.java
Tue Aug 14 15:21:20 2012
@@ -18,7 +18,6 @@ package org.apache.fulcrum.security.memo
* under the License.
*/
-import java.util.Iterator;
import java.util.List;
import org.apache.fulcrum.security.entity.SecurityEntity;
@@ -43,11 +42,11 @@ public class MemoryHelper
return new Integer(++uniqueId);
}
- public static boolean checkExists(List securityEntities, String name){
+ public static boolean checkExists(List<? extends SecurityEntity>
securityEntities, String name)
+ {
boolean exists = false;
- for (Iterator i = securityEntities.iterator(); i.hasNext();)
+ for (SecurityEntity securityEntity : securityEntities)
{
- SecurityEntity securityEntity = (SecurityEntity) i.next();
if (securityEntity.getName().equalsIgnoreCase(name))
{
exists = true;
Modified:
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java?rev=1372920&r1=1372919&r2=1372920&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java
Tue Aug 14 15:21:20 2012
@@ -36,7 +36,7 @@ import org.apache.fulcrum.security.util.
*/
public class MemoryPermissionManagerImpl extends AbstractPermissionManager
{
- private static List permissions = new ArrayList();
+ private static List<Permission> permissions = new ArrayList<Permission>();
/** Our Unique ID counter */
// private static int uniqueId = 0;
Modified:
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java?rev=1372920&r1=1372919&r2=1372920&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java
Tue Aug 14 15:21:20 2012
@@ -38,7 +38,7 @@ import org.apache.fulcrum.security.util.
public class MemoryRoleManagerImpl extends AbstractRoleManager
{
/** List to store all our roles in */
- private static List roles = new ArrayList();
+ private static List<Role> roles = new ArrayList<Role>();
/** Our Unique ID counter */
// private static int uniqueId = 0;
Modified:
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryUserManagerImpl.java?rev=1372920&r1=1372919&r2=1372920&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryUserManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryUserManagerImpl.java
Tue Aug 14 15:21:20 2012
@@ -38,7 +38,7 @@ import org.apache.fulcrum.security.util.
public class MemoryUserManagerImpl
extends AbstractUserManager
{
- private static List users = new ArrayList();
+ private static List<User> users = new ArrayList<User>();
/** Our Unique ID counter */
// private static int uniqueId = 0;
Modified:
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/basic/MemoryModelManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/basic/MemoryModelManagerImpl.java?rev=1372920&r1=1372919&r2=1372920&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/basic/MemoryModelManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/basic/MemoryModelManagerImpl.java
Tue Aug 14 15:21:20 2012
@@ -17,8 +17,6 @@ package org.apache.fulcrum.security.memo
* specific language governing permissions and limitations
* under the License.
*/
-import java.util.Iterator;
-
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.model.basic.BasicModelManager;
@@ -134,10 +132,9 @@ public class MemoryModelManagerImpl
userExists = getUserManager().checkExists(user);
if (userExists)
{
- for (Iterator i = ((BasicUser) user).getGroups().iterator();
i.hasNext();)
+ for (Group group : ((BasicUser) user).getGroups())
{
- BasicGroup group = (BasicGroup) i.next();
- group.removeUser(user);
+ ((BasicGroup)group).removeUser(user);
}
((BasicUser) user).setGroups(new GroupSet());
return;
Modified:
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerImpl.java?rev=1372920&r1=1372919&r2=1372920&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerImpl.java
Tue Aug 14 15:21:20 2012
@@ -18,8 +18,6 @@ package org.apache.fulcrum.security.memo
* specific language governing permissions and limitations
* under the License.
*/
-import java.util.Iterator;
-
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.entity.Role;
@@ -158,13 +156,19 @@ public class MemoryTurbineModelManagerIm
roleExists = getRoleManager().checkExists(role);
userExists = getUserManager().checkExists(user);
groupExists = getGroupManager().checkExists(group);
- if (roleExists && groupExists && userExists) {
+ if (roleExists && groupExists && userExists)
+ {
boolean ugrFound = false;
- TurbineUserGroupRole ugr = null;
- for(Iterator i = ((TurbineUser)
user).getUserGroupRoleSet().iterator();i.hasNext();){
- ugr = (TurbineUserGroupRole)i.next();
- if(ugr.getUser().equals(user)&&
ugr.getGroup().equals(group) && ugr.getRole().equals(role)){
+ for(TurbineUserGroupRole ugr : ((TurbineUser)
user).getUserGroupRoleSet())
+ {
+ if(ugr.getUser().equals(user)&&
ugr.getGroup().equals(group) && ugr.getRole().equals(role))
+ {
ugrFound=true;
+
+ ((TurbineUser) user).removeUserGroupRole(ugr);
+ ((TurbineGroup) group).removeUserGroupRole(ugr);
+ ((TurbineRole) role).removeUserGroupRole(ugr);
+
break;
}
}
@@ -172,9 +176,6 @@ public class MemoryTurbineModelManagerIm
throw new UnknownEntityException("Could not find
User/Group/Role");
}
- ((TurbineUser) user).removeUserGroupRole(ugr);
- ((TurbineGroup) group).removeUserGroupRole(ugr);
- ((TurbineRole) role).removeUserGroupRole(ugr);
return;
}
} catch (Exception e) {
Modified:
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java?rev=1372920&r1=1372919&r2=1372920&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java
(original)
+++
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java
Tue Aug 14 15:21:20 2012
@@ -101,8 +101,8 @@ public class AccessControlListTest exten
PermissionSet permissionSet = new PermissionSet();
roleSet.add(role);
permissionSet.add(permission);
- Map roleSets = new HashMap();
- Map permissionSets = new HashMap();
+ Map<Group, RoleSet> roleSets = new HashMap<Group, RoleSet>();
+ Map<Role, PermissionSet> permissionSets = new HashMap<Role,
PermissionSet>();
roleSets.put(group, roleSet);
permissionSets.put(role, permissionSet);
AccessControlList acl = userManager.getACL(user);
@@ -120,8 +120,8 @@ public class AccessControlListTest exten
Role role3 = getRole();
modelManager.grant(group, role);
modelManager.grant(group, role2);
- Map roleSets = new HashMap();
- Map permissionSets = new HashMap();
+ Map<Group, RoleSet> roleSets = new HashMap<Group, RoleSet>();
+ Map<Role, PermissionSet> permissionSets = new HashMap<Role,
PermissionSet>();
roleSets.put(group, ((DynamicGroup) group).getRoles());
acl = new DynamicAccessControlListImpl(roleSets, permissionSets);
RoleSet resultRoleSet = acl.getRoles(group);
@@ -143,8 +143,8 @@ public class AccessControlListTest exten
modelManager.grant(group, role2);
modelManager.grant(group2, role2);
modelManager.grant(group2, role3);
- Map roleSets = new HashMap();
- Map permissionSets = new HashMap();
+ Map<Group, RoleSet> roleSets = new HashMap<Group, RoleSet>();
+ Map<Role, PermissionSet> permissionSets = new HashMap<Role,
PermissionSet>();
roleSets.put(group, ((DynamicGroup) group).getRoles());
roleSets.put(group2, ((DynamicGroup) group2).getRoles());
acl = new DynamicAccessControlListImpl(roleSets, permissionSets);
@@ -175,8 +175,8 @@ public class AccessControlListTest exten
modelManager.grant(role, permission3);
modelManager.grant(role2, permission2);
modelManager.grant(role2, permission3);
- Map roleSets = new HashMap();
- Map permissionSets = new HashMap();
+ Map<Group, RoleSet> roleSets = new HashMap<Group, RoleSet>();
+ Map<Role, PermissionSet> permissionSets = new HashMap<Role,
PermissionSet>();
roleSets.put(group, ((DynamicGroup) group).getRoles());
permissionSets.put(role, ((DynamicRole) role).getPermissions());
acl = new DynamicAccessControlListImpl(roleSets, permissionSets);
@@ -209,8 +209,8 @@ public class AccessControlListTest exten
modelManager.grant(role, permission3);
modelManager.grant(role2, permission2);
modelManager.grant(role2, permission3);
- Map roleSets = new HashMap();
- Map permissionSets = new HashMap();
+ Map<Group, RoleSet> roleSets = new HashMap<Group, RoleSet>();
+ Map<Role, PermissionSet> permissionSets = new HashMap<Role,
PermissionSet>();
roleSets.put(group, ((DynamicGroup) group).getRoles());
roleSets.put(group2, ((DynamicGroup) group2).getRoles());
permissionSets.put(role, ((DynamicRole) role).getPermissions());
@@ -234,8 +234,8 @@ public class AccessControlListTest exten
modelManager.grant(group, role2);
modelManager.grant(group2, role);
modelManager.grant(group2, role3);
- Map roleSets = new HashMap();
- Map permissionSets = new HashMap();
+ Map<Group, RoleSet> roleSets = new HashMap<Group, RoleSet>();
+ Map<Role, PermissionSet> permissionSets = new HashMap<Role,
PermissionSet>();
roleSets.put(group, ((DynamicGroup) group).getRoles());
roleSets.put(group2, ((DynamicGroup) group2).getRoles());
acl = new DynamicAccessControlListImpl(roleSets, permissionSets);
@@ -261,8 +261,8 @@ public class AccessControlListTest exten
modelManager.grant(group, role2);
modelManager.grant(group2, role);
modelManager.grant(group2, role3);
- Map roleSets = new HashMap();
- Map permissionSets = new HashMap();
+ Map<Group, RoleSet> roleSets = new HashMap<Group, RoleSet>();
+ Map<Role, PermissionSet> permissionSets = new HashMap<Role,
PermissionSet>();
roleSets.put(group, ((DynamicGroup) group).getRoles());
roleSets.put(group2, ((DynamicGroup) group2).getRoles());
acl = new DynamicAccessControlListImpl(roleSets, permissionSets);
@@ -291,8 +291,8 @@ public class AccessControlListTest exten
modelManager.grant(group, role2);
modelManager.grant(group2, role);
modelManager.grant(group2, role3);
- Map roleSets = new HashMap();
- Map permissionSets = new HashMap();
+ Map<Group, RoleSet> roleSets = new HashMap<Group, RoleSet>();
+ Map<Role, PermissionSet> permissionSets = new HashMap<Role,
PermissionSet>();
roleSets.put(group, ((DynamicGroup) group).getRoles());
roleSets.put(group2, ((DynamicGroup) group2).getRoles());
acl = new DynamicAccessControlListImpl(roleSets, permissionSets);
@@ -327,8 +327,8 @@ public class AccessControlListTest exten
modelManager.grant(role2, permission2);
modelManager.grant(role2, permission3);
modelManager.grant(role3, permission4);
- Map roleSets = new HashMap();
- Map permissionSets = new HashMap();
+ Map<Group, RoleSet> roleSets = new HashMap<Group, RoleSet>();
+ Map<Role, PermissionSet> permissionSets = new HashMap<Role,
PermissionSet>();
roleSets.put(group, ((DynamicGroup) group).getRoles());
roleSets.put(group2, ((DynamicGroup) group2).getRoles());
permissionSets.put(role, ((DynamicRole) role).getPermissions());
@@ -370,8 +370,8 @@ public class AccessControlListTest exten
modelManager.grant(role2, permission3);
modelManager.grant(role3, permission4);
modelManager.grant(role4, permission5);
- Map roleSets = new HashMap();
- Map permissionSets = new HashMap();
+ Map<Group, RoleSet> roleSets = new HashMap<Group, RoleSet>();
+ Map<Role, PermissionSet> permissionSets = new HashMap<Role,
PermissionSet>();
roleSets.put(group, ((DynamicGroup) group).getRoles());
roleSets.put(group2, ((DynamicGroup) group2).getRoles());
roleSets.put(group3, ((DynamicGroup) group3).getRoles());
@@ -416,8 +416,8 @@ public class AccessControlListTest exten
modelManager.grant(role2, permission3);
modelManager.grant(role3, permission4);
modelManager.grant(role4, permission5);
- Map roleSets = new HashMap();
- Map permissionSets = new HashMap();
+ Map<Group, RoleSet> roleSets = new HashMap<Group, RoleSet>();
+ Map<Role, PermissionSet> permissionSets = new HashMap<Role,
PermissionSet>();
roleSets.put(group, ((DynamicGroup) group).getRoles());
roleSets.put(group2, ((DynamicGroup) group2).getRoles());
roleSets.put(group3, ((DynamicGroup) group3).getRoles());
