epugh 2003/08/24 12:38:34 Modified: security/src/java/org/apache/fulcrum/security/entity/impl SecurityEntityImpl.java security/src/java/org/apache/fulcrum/security/entity Permission.java SecurityEntity.java Role.java Log: Switch to using longs, not ints Revision Changes Path 1.2 +7 -6 jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/entity/impl/SecurityEntityImpl.java Index: SecurityEntityImpl.java =================================================================== RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/entity/impl/SecurityEntityImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SecurityEntityImpl.java 23 Aug 2003 03:56:23 -0000 1.1 +++ SecurityEntityImpl.java 24 Aug 2003 19:38:33 -0000 1.2 @@ -10,24 +10,25 @@ /** * @author Eric Pugh * - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments + * Base class for all objects implementing SecurityEnitity. This + * class automatically lowercases the name. So the permission "EDIT" + * will equal "eDit" and "edit"; */ public class SecurityEntityImpl implements SecurityEntity { private String name; - private int id; + private long id; /** * @return */ - public int getId() + public long getId() { return id; } /** * @param id */ - public void setId(int id) + public void setId(long id) { this.id = id; } @@ -43,7 +44,7 @@ */ public void setName(String name) { - this.name = name; + this.name = name.toLowerCase(); } public String toString() { 1.2 +2 -3 jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/entity/Permission.java Index: Permission.java =================================================================== RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/entity/Permission.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Permission.java 23 Aug 2003 03:56:26 -0000 1.1 +++ Permission.java 24 Aug 2003 19:38:34 -0000 1.2 @@ -56,8 +56,7 @@ /** - * This class represents the permissions that a Role has to access - * certain pages/functions within the system. The class implements + * This class represents the a permissions.. The class implements * Comparable so that when Permissions are added to a Set, they will * be in alphabetical order by name. * 1.2 +3 -3 jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/entity/SecurityEntity.java Index: SecurityEntity.java =================================================================== RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/entity/SecurityEntity.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SecurityEntity.java 23 Aug 2003 03:56:26 -0000 1.1 +++ SecurityEntity.java 24 Aug 2003 19:38:34 -0000 1.2 @@ -87,12 +87,12 @@ * * @return The Id of the SecurityEntity. */ - int getId(); + long getId(); /** * Sets the Id of the SecurityEntity. * * @param id The new Id of the SecurityEntity */ - void setId(int id); + void setId(long id); } 1.2 +1 -16 jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/entity/Role.java Index: Role.java =================================================================== RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/entity/Role.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Role.java 23 Aug 2003 03:56:26 -0000 1.1 +++ Role.java 24 Aug 2003 19:38:34 -0000 1.2 @@ -54,7 +54,6 @@ * <http://www.apache.org/>. */ -import org.apache.fulcrum.security.util.PermissionSet; /** * This class represents a role played by the User associated with the @@ -67,21 +66,7 @@ */ public interface Role extends SecurityEntity { - /** - * Returns the set of Permissions associated with this Role. - * - * @return A PermissionSet. - * @exception Exception A generic exception. - */ - PermissionSet getPermissions() - throws Exception; - /** - * Sets the Permissions associated with this Role. - * - * @param permissionSet A PermissionSet. - */ - void setPermissions(PermissionSet permissionSet);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]