epugh 2003/08/25 08:29:37
Modified: security/src/java/org/apache/fulcrum/security/model/simple/entity
SimpleGroup.java SimpleRole.java
Log:
Add in the Many to Many relationships that the model suggests.
Revision Changes Path
1.2 +31 -1
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/model/simple/entity/SimpleGroup.java
Index: SimpleGroup.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/model/simple/entity/SimpleGroup.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleGroup.java 23 Aug 2003 15:26:55 -0000 1.1
+++ SimpleGroup.java 25 Aug 2003 15:29:37 -0000 1.2
@@ -1,7 +1,11 @@
package org.apache.fulcrum.security.model.simple.entity;
+import java.util.HashSet;
+import java.util.Set;
+
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Role;
+import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.entity.impl.SecurityEntityImpl;
import org.apache.fulcrum.security.util.RoleSet;
/**
@@ -13,7 +17,24 @@
*/
public class SimpleGroup extends SecurityEntityImpl implements Group
{
- private RoleSet roleSet = new RoleSet();
+ private RoleSet roleSet = new RoleSet();
+ private Set users = new HashSet();
+ /**
+ * @return
+ */
+ public Set getUsers()
+ {
+ return users;
+ }
+
+ /**
+ * @param users
+ */
+ public void setUsers(Set users)
+ {
+ this.users = users;
+ }
+
/**
* @return
*/
@@ -36,4 +57,13 @@
{
getRoles().remove(role);
}
+
+ public void addUser(User user)
+ {
+ getUsers().add(user);
+ }
+ public void removeUser(User user)
+ {
+ getUsers().remove(user);
+ }
}
1.3 +37 -1
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/model/simple/entity/SimpleRole.java
Index: SimpleRole.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/model/simple/entity/SimpleRole.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleRole.java 24 Aug 2003 19:40:35 -0000 1.2
+++ SimpleRole.java 25 Aug 2003 15:29:37 -0000 1.3
@@ -1,7 +1,9 @@
package org.apache.fulcrum.security.model.simple.entity;
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.entity.Role;
+import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.impl.SecurityEntityImpl;
+import org.apache.fulcrum.security.util.GroupSet;
import org.apache.fulcrum.security.util.PermissionSet;
/**
* @author Eric Pugh
@@ -12,7 +14,9 @@
*/
public class SimpleRole extends SecurityEntityImpl implements Role
{
- private PermissionSet permissionSet = new PermissionSet();
+ private PermissionSet permissionSet = new PermissionSet();
+
+ private GroupSet groupSet = new GroupSet();
/**
* @return
*/
@@ -44,4 +48,36 @@
{
getPermissions().remove(permission);
}
+
+ /**
+ * @return
+ */
+ public GroupSet getGroups()
+ {
+ return groupSet;
+ }
+ /**
+ * @param groupSet
+ */
+ public void setGroups(GroupSet groupSet)
+ {
+ this.groupSet = groupSet;
+ }
+
+ /**
+ * This method should only be used by a RoleManager. Not directly.
+ * @param group
+ */
+ public void addGroup(Group group)
+ {
+ getGroups().add(group);
+ }
+ /**
+ * This method should only be used by a RoleManager. Not directly.
+ * @param group
+ */
+ public void removeGroup(Group group)
+ {
+ getGroups().remove(group);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
