You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by tv...@apache.org on 2006/08/27 22:20:45 UTC
svn commit: r437451 - in
/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security:
./ acl/ authenticator/ entity/impl/ model/basic/ model/basic/entity/
model/dynamic/ model/dynamic/entity/ model/turbine/entity/
model/turbine/tes...
Author: tv
Date: Sun Aug 27 13:20:44 2006
New Revision: 437451
URL: http://svn.apache.org/viewvc?rev=437451&view=rev
Log:
Cleanup:
- added serialVersionIDs
- removed unnecessary references to commons.logging
- formatted code to comply with style guide
- added/fixed some JavaDocs
Modified:
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/BaseSecurityService.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlException.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/CryptoAuthenticator.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/NoOpAuthenticator.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/TextMatchAuthenticator.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/impl/SecurityEntityImpl.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/BasicACLFactory.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/BasicAccessControlListImpl.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/entity/BasicUser.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicACLFactory.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicAccessControlListImpl.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicRole.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicUser.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineRole.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUser.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUserGroupRole.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractEntityManager.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractGroupManager.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractPermissionManager.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractRoleManager.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractUserManager.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/DataBackendException.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/EntityExistsException.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/GroupSet.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PasswordMismatchException.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PermissionSet.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/RoleSet.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/TurbineSecurityException.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UnknownEntityException.java
jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UserSet.java
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/BaseSecurityService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/BaseSecurityService.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/BaseSecurityService.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/BaseSecurityService.java Sun Aug 27 13:20:44 2006
@@ -40,7 +40,6 @@
extends AbstractLogEnabled
implements SecurityService, Configurable, Initializable, Serviceable, ThreadSafe
{
- private boolean disposed = false;
private ServiceManager manager = null;
// management of Groups/Role/Permissions
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlException.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlException.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlException.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlException.java Sun Aug 27 13:20:44 2006
@@ -27,6 +27,11 @@
extends TurbineSecurityException
{
/**
+ * Serial number
+ */
+ private static final long serialVersionUID = 1053699577313013739L;
+
+ /**
* Construct an AccessControlException with specified detail message.
*
* @param msg The detail message.
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/CryptoAuthenticator.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/CryptoAuthenticator.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/CryptoAuthenticator.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/CryptoAuthenticator.java Sun Aug 27 13:20:44 2006
@@ -24,8 +24,6 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.crypto.CryptoAlgorithm;
import org.apache.fulcrum.crypto.CryptoService;
import org.apache.fulcrum.security.entity.User;
@@ -39,10 +37,9 @@
* @avalon.component name="crypto-authenticator"
* @avalon.service type="org.apache.fulcrum.security.authenticator.Authenticator"
*/
-public class CryptoAuthenticator extends AbstractLogEnabled implements Authenticator, Serviceable, Disposable,Configurable
+public class CryptoAuthenticator extends AbstractLogEnabled
+ implements Authenticator, Serviceable, Disposable, Configurable
{
- /** Logging */
- private static Log log = LogFactory.getLog(CryptoAuthenticator.class);
boolean composed = false;
protected CryptoService cryptoService = null;
private String algorithm;
@@ -81,22 +78,26 @@
}
// ---------------- Avalon Lifecycle Methods ---------------------
- /**
- * Avalon component lifecycle method
- */
- public void configure(Configuration conf) throws ConfigurationException
- {
-
- algorithm = conf.getChild("algorithm").getValue();
- cipher = conf.getChild("cipher").getValue();
- }
/**
- * Avalon component lifecycle method
- */
+ * Avalon component lifecycle method
+ */
+ public void configure(Configuration conf) throws ConfigurationException
+ {
+ algorithm = conf.getChild("algorithm").getValue();
+ cipher = conf.getChild("cipher").getValue();
+ }
+
+ /**
+ * Avalon component lifecycle method
+ */
public void service(ServiceManager manager) throws ServiceException
{
this.cryptoService = (CryptoService)manager.lookup(CryptoService.ROLE);
}
+
+ /**
+ * Avalon component lifecycle method
+ */
public void dispose()
{
cryptoService = null;
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/NoOpAuthenticator.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/NoOpAuthenticator.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/NoOpAuthenticator.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/NoOpAuthenticator.java Sun Aug 27 13:20:44 2006
@@ -15,8 +15,6 @@
* limitations under the License.
*/
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.util.DataBackendException;
/**
@@ -30,8 +28,6 @@
*/
public class NoOpAuthenticator extends AbstractLogEnabled implements Authenticator
{
- /** Logging */
- private static Log log = LogFactory.getLog(NoOpAuthenticator.class);
/**
* Authenticate an username with the specified password. Always returns
* true.
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/TextMatchAuthenticator.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/TextMatchAuthenticator.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/TextMatchAuthenticator.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/TextMatchAuthenticator.java Sun Aug 27 13:20:44 2006
@@ -15,8 +15,6 @@
* limitations under the License.
*/
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.util.DataBackendException;
/**
@@ -30,8 +28,6 @@
*/
public class TextMatchAuthenticator extends AbstractLogEnabled implements Authenticator
{
- /** Logging */
- private static Log log = LogFactory.getLog(TextMatchAuthenticator.class);
/**
* Authenticate an username with the specified password. Returns true
* if the user password plain text matches the passed in password.
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/impl/SecurityEntityImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/impl/SecurityEntityImpl.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/impl/SecurityEntityImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/impl/SecurityEntityImpl.java Sun Aug 27 13:20:44 2006
@@ -1,4 +1,5 @@
package org.apache.fulcrum.security.entity.impl;
+
/*
* Copyright 2001-2004 The Apache Software Foundation
*
@@ -15,22 +16,23 @@
* limitations under the License.
*/
-
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.fulcrum.security.entity.SecurityEntity;
/**
- * Base class for all objects implementing SecurityEnitity. This
- * class automatically lowercases the name. So the permission "EDIT"
- * will equal "eDit" and "edit";
- *
+ * Base class for all objects implementing SecurityEnitity. This class
+ * automatically lowercases the name. So the permission "EDIT" will equal "eDit"
+ * and "edit";
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
public class SecurityEntityImpl implements SecurityEntity
{
private String name;
+
private Object id;
+
/**
* @return
*/
@@ -38,6 +40,7 @@
{
return id;
}
+
/**
* @param id
*/
@@ -45,6 +48,7 @@
{
this.id = id;
}
+
/**
* @return
*/
@@ -52,23 +56,35 @@
{
return name;
}
+
/**
- * Pass in the name for this entity. Also lowercases it.
+ * Pass in the name for this entity. Also lowercases it.
+ *
* @param name
*/
public void setName(String name)
{
- if (name !=null){
- // throw new InvalidParameterException("Must provide a valid name for all SecurityEntities.");
- name = name.toLowerCase();
+ if (name != null)
+ {
+ // throw new InvalidParameterException("Must provide a valid name
+ // for all SecurityEntities.");
+ name = name.toLowerCase();
}
- this.name = name;
- //this.name = name.toLowerCase();
+ this.name = name;
+ // this.name = name.toLowerCase();
}
+
public String toString()
{
- return getClass().getName() + " (id:" + getId() + " name:" + getName()+")";
+ return getClass().getName() + " (id:" + getId() + " name:" + getName()
+ + ")";
}
+
+ /**
+ * Check if this object is equal to another
+ *
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
public boolean equals(Object o)
{
boolean equals = true;
@@ -78,12 +94,18 @@
}
else
{
- equals = (getId() == ((SecurityEntityImpl) o).getId());
+ equals = (getId().equals(((SecurityEntityImpl) o).getId()));
}
return equals;
}
- public int hashCode(Object o)
+
+ /**
+ * Calculate a hash code for this object
+ *
+ * @see java.lang.Object#hashCode()
+ */
+ public int hashCode()
{
- return HashCodeBuilder.reflectionHashCode(this);
+ return new HashCodeBuilder(47, 11).append(getId()).append(getName()).toHashCode();
}
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/BasicACLFactory.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/BasicACLFactory.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/BasicACLFactory.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/BasicACLFactory.java Sun Aug 27 13:20:44 2006
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.acl.AccessControlList;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.model.ACLFactory;
@@ -32,9 +30,6 @@
*/
public class BasicACLFactory extends AbstractManager implements ACLFactory
{
-
- /** Logging */
- private static Log log = LogFactory.getLog(BasicACLFactory.class);
/**
* Construct a new ACL object.
*
@@ -50,8 +45,8 @@
private AccessControlList getAclInstance(GroupSet groupSet)
throws UnknownEntityException
{
- Object[] objects = { groupSet};
- String[] signatures = { GroupSet.class.getName()};
+// Object[] objects = { groupSet};
+// String[] signatures = { GroupSet.class.getName()};
AccessControlList accessControlList;
try
{
@@ -72,6 +67,7 @@
}
return accessControlList;
}
+
public AccessControlList getAccessControlList(User user)
{
GroupSet groupSet = ((BasicUser)user).getGroups();
@@ -85,5 +81,4 @@
throw new RuntimeException(uue.getMessage(), uue);
}
}
-
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/BasicAccessControlListImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/BasicAccessControlListImpl.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/BasicAccessControlListImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/BasicAccessControlListImpl.java Sun Aug 27 13:20:44 2006
@@ -28,7 +28,11 @@
*/
public class BasicAccessControlListImpl implements BasicAccessControlList
{
-
+ /**
+ * Serial number
+ */
+ private static final long serialVersionUID = 2911747448261740381L;
+
/** The distinct list of groups that this user is part of */
private GroupSet groupSet = new GroupSet();
@@ -51,7 +55,6 @@
public BasicAccessControlListImpl(GroupSet groupSet)
{
this.groupSet = groupSet;
-
}
/**
@@ -74,6 +77,7 @@
{
return groupSet.contains(group);
}
+
/**
* Checks if the user is assigned a specific Group
*
@@ -91,4 +95,4 @@
return false;
}
}
- }
+}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/entity/BasicUser.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/entity/BasicUser.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/entity/BasicUser.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/entity/BasicUser.java Sun Aug 27 13:20:44 2006
@@ -17,6 +17,7 @@
import java.util.Set;
+import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.entity.impl.SecurityEntityImpl;
@@ -31,6 +32,11 @@
*/
public class BasicUser extends SecurityEntityImpl implements User
{
+ /**
+ * Serial number
+ */
+ private static final long serialVersionUID = 7911631916604987203L;
+
private String password;
private Set groupSet = new GroupSet();
@@ -85,5 +91,18 @@
public Set getGroupsAsSet()
{
return groupSet;
+ }
+
+ /**
+ * Calculate a hash code for this object
+ *
+ * @see org.apache.fulcrum.security.entity.impl.SecurityEntityImpl#hashCode()
+ */
+ public int hashCode()
+ {
+ return new HashCodeBuilder(43, 19)
+ .append(getPassword())
+ .appendSuper(super.hashCode())
+ .toHashCode();
}
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicACLFactory.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicACLFactory.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicACLFactory.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicACLFactory.java Sun Aug 27 13:20:44 2006
@@ -21,8 +21,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.acl.AccessControlList;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.User;
@@ -42,102 +40,113 @@
* @author <a href="mailto:ben@gidley.co.uk">Ben Gidley </a>
* @version $Id$
*/
-public class DynamicACLFactory extends AbstractManager implements ACLFactory {
-
- /** Logging */
- private static Log log = LogFactory.getLog(DynamicACLFactory.class);
-
- /**
- * Construct a new ACL object.
- *
- * This constructs a new ACL object from the configured class and
- * initializes it with the supplied roles and permissions.
- *
- * @param roles
- * The roles that this ACL should contain
- * @param permissions
- * The permissions for this ACL
- *
- * @return an object implementing ACL interface.
- * @throws UnknownEntityException
- * if the object could not be instantiated.
- */
- private AccessControlList getAclInstance(Map roles, Map permissions)
- throws UnknownEntityException {
- Object[] objects = { roles, permissions };
- String[] signatures = { Map.class.getName(), Map.class.getName() };
- AccessControlList accessControlList;
- try {
- /*
- *
- * @todo I think this is overkill for now.. accessControlList =
- * (AccessControlList)
- * aclFactoryService.getInstance(aclClass.getName(), objects,
- * signatures);
- */
- accessControlList = new DynamicAccessControlListImpl(roles,
- permissions);
- } catch (Exception e) {
- throw new UnknownEntityException(
- "Failed to instantiate an ACL implementation object", e);
- }
- return accessControlList;
- }
-
- public AccessControlList getAccessControlList(User user) {
- Map roleSets = new HashMap();
- Map permissionSets = new HashMap();
-
- Set users = new HashSet();
- // add the root user
- users.add(user);
- addDelegators((DynamicUser) user, users);
-
- Iterator i = users.iterator();
- while (i.hasNext()) {
- DynamicUser aUser = (DynamicUser) i.next();
- addRolesAndPermissions(aUser, roleSets, permissionSets);
- }
-
- try {
- return getAclInstance(roleSets, permissionSets);
- } catch (UnknownEntityException uue) {
- throw new RuntimeException(uue.getMessage(), uue);
- }
- }
-
- public void addDelegators(DynamicUser user, Set users) {
- for (Iterator iter = user.getDelegators().iterator(); iter.hasNext();) {
- DynamicUser delegatorUser = (DynamicUser) iter.next();
-
- if (users.add(delegatorUser)) {
- // Only come here if user NOT in users
- addDelegators(delegatorUser, users);
- }
- }
- }
-
- /**
- * Adds the passed users roles and permissions to the sets As maps overwrite
- * duplicates we just put it in an let it overwrite it is probably quicker
- * than checking for duplicates
- *
- * @param user
- * @param roleSets
- * @param permissionSets
- */
- private void addRolesAndPermissions(User user, Map roleSets,
- Map permissionSets) {
- for (Iterator i = ((DynamicUser) user).getGroups().iterator(); i
- .hasNext();) {
- Group group = (Group) i.next();
- RoleSet roleSet = (RoleSet) ((DynamicGroup) group).getRoles();
- roleSets.put(group, roleSet);
- for (Iterator j = roleSet.iterator(); j.hasNext();) {
- DynamicRole role = (DynamicRole) j.next();
- permissionSets.put(role, role.getPermissions());
- }
- }
- }
-
-}
\ No newline at end of file
+public class DynamicACLFactory extends AbstractManager implements ACLFactory
+{
+ /**
+ * Construct a new ACL object.
+ *
+ * This constructs a new ACL object from the configured class and
+ * initializes it with the supplied roles and permissions.
+ *
+ * @param roles
+ * The roles that this ACL should contain
+ * @param permissions
+ * The permissions for this ACL
+ *
+ * @return an object implementing ACL interface.
+ * @throws UnknownEntityException
+ * if the object could not be instantiated.
+ */
+ private AccessControlList getAclInstance(Map roles, Map permissions)
+ throws UnknownEntityException
+ {
+ // Object[] objects = { roles, permissions };
+ // String[] signatures = { Map.class.getName(), Map.class.getName() };
+ AccessControlList accessControlList;
+ try
+ {
+ /*
+ *
+ * @todo I think this is overkill for now.. accessControlList =
+ * (AccessControlList)
+ * aclFactoryService.getInstance(aclClass.getName(), objects,
+ * signatures);
+ */
+ accessControlList = new DynamicAccessControlListImpl(roles,
+ permissions);
+ }
+ catch (Exception e)
+ {
+ throw new UnknownEntityException(
+ "Failed to instantiate an ACL implementation object", e);
+ }
+ return accessControlList;
+ }
+
+ public AccessControlList getAccessControlList(User user)
+ {
+ Map roleSets = new HashMap();
+ Map permissionSets = new HashMap();
+
+ Set users = new HashSet();
+ // add the root user
+ users.add(user);
+ addDelegators((DynamicUser) user, users);
+
+ Iterator i = users.iterator();
+ while (i.hasNext())
+ {
+ DynamicUser aUser = (DynamicUser) i.next();
+ addRolesAndPermissions(aUser, roleSets, permissionSets);
+ }
+
+ try
+ {
+ return getAclInstance(roleSets, permissionSets);
+ }
+ catch (UnknownEntityException uue)
+ {
+ throw new RuntimeException(uue.getMessage(), uue);
+ }
+ }
+
+ public void addDelegators(DynamicUser user, Set users)
+ {
+ for (Iterator iter = user.getDelegators().iterator(); iter.hasNext();)
+ {
+ DynamicUser delegatorUser = (DynamicUser) iter.next();
+
+ if (users.add(delegatorUser))
+ {
+ // Only come here if user NOT in users
+ addDelegators(delegatorUser, users);
+ }
+ }
+ }
+
+ /**
+ * Adds the passed users roles and permissions to the sets As maps overwrite
+ * duplicates we just put it in an let it overwrite it is probably quicker
+ * than checking for duplicates
+ *
+ * @param user
+ * @param roleSets
+ * @param permissionSets
+ */
+ private void addRolesAndPermissions(User user, Map roleSets,
+ Map permissionSets)
+ {
+ for (Iterator i = ((DynamicUser) user).getGroups().iterator(); i
+ .hasNext();)
+ {
+ Group group = (Group) i.next();
+ RoleSet roleSet = (RoleSet) ((DynamicGroup) group).getRoles();
+ roleSets.put(group, roleSet);
+ for (Iterator j = roleSet.iterator(); j.hasNext();)
+ {
+ DynamicRole role = (DynamicRole) j.next();
+ permissionSets.put(role, role.getPermissions());
+ }
+ }
+ }
+}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicAccessControlListImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicAccessControlListImpl.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicAccessControlListImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicAccessControlListImpl.java Sun Aug 27 13:20:44 2006
@@ -35,6 +35,11 @@
*/
public class DynamicAccessControlListImpl implements DynamicAccessControlList
{
+ /**
+ * Serial number
+ */
+ private static final long serialVersionUID = -5180551537096244085L;
+
/** The sets of roles that the user has in different groups */
private Map roleSets;
/** The sets of permissions that the user has in different groups */
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicRole.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicRole.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicRole.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicRole.java Sun Aug 27 13:20:44 2006
@@ -59,7 +59,7 @@
public void setPermissionsAsSet(Set permissions)
{
- this.permissionSet = permissions;;
+ this.permissionSet = permissions;
}
/**
* @param permissionSet
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicUser.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicUser.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicUser.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/entity/DynamicUser.java Sun Aug 27 13:20:44 2006
@@ -1,4 +1,5 @@
package org.apache.fulcrum.security.model.dynamic.entity;
+
/*
* Copyright 2001-2004 The Apache Software Foundation
*
@@ -18,54 +19,73 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.entity.impl.SecurityEntityImpl;
import org.apache.fulcrum.security.util.GroupSet;
/**
- * Represents the "simple" model where permissions are related to roles,
- * roles are related to groups and groups are related to users,
- * all in many to many relationships.
+ * Represents the "simple" model where permissions are related to roles, roles
+ * are related to groups and groups are related to users, all in many to many
+ * relationships.
+ *
+ * Users have a set of delegates and delegatee's. If user A has B in their
+ * delegates - B assumes A's groups,roles and permissions If user C has D in
+ * their delegatees - C assumes D's groups,roles and permissions
*
- * Users have a set of delegates and delegatee's.
- * If user A has B in their delegates - B assumes A's groups,roles and permissions
- * If user C has D in their delegatees - C assumes D's groups,roles and permissions
- *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
public class DynamicUser extends SecurityEntityImpl implements User
{
+ /**
+ * Serial number
+ */
+ private static final long serialVersionUID = 2841311062371647853L;
+
private String password;
+
private Set groupSet = new GroupSet();
+
private Set delegators = new HashSet();
+
private Set delegatees = new HashSet();
- /**
- * @return Returns the delegatees.
- */
- public Set getDelegatees() {
- return delegatees;
- }
- /**
- * @param delegatees The delegatees to set.
- */
- public void setDelegatees(Set delegatees) {
- this.delegatees = delegatees;
- }
- /**
- * @return Returns the delegators.
- */
- public Set getDelegators() {
- return delegators;
- }
- /**
- * @param delegates The delegators to set.
- */
- public void setDelegators(Set delegates) {
- this.delegators = delegates;
- }
+ /**
+ * @return Returns the delegatees.
+ */
+ public Set getDelegatees()
+ {
+ return delegatees;
+ }
+
+ /**
+ * @param delegatees
+ * The delegatees to set.
+ */
+ public void setDelegatees(Set delegatees)
+ {
+ this.delegatees = delegatees;
+ }
+
+ /**
+ * @return Returns the delegators.
+ */
+ public Set getDelegators()
+ {
+ return delegators;
+ }
+
+ /**
+ * @param delegates
+ * The delegators to set.
+ */
+ public void setDelegators(Set delegates)
+ {
+ this.delegators = delegates;
+ }
+
/**
* @return
*/
@@ -73,6 +93,7 @@
{
return password;
}
+
/**
* @param password
*/
@@ -80,43 +101,62 @@
{
this.password = password;
}
+
/**
- * @return
- */
+ * @return
+ */
public GroupSet getGroups()
{
- if( groupSet instanceof GroupSet )
- return (GroupSet) groupSet;
- else {
- groupSet = new GroupSet(groupSet);
- return (GroupSet)groupSet;
- }
+ if (groupSet instanceof GroupSet)
+ return (GroupSet) groupSet;
+ else
+ {
+ groupSet = new GroupSet(groupSet);
+ return (GroupSet) groupSet;
+ }
}
+
/**
* @param groups
*/
public void setGroups(GroupSet groups)
{
- if( groups != null )
- this.groupSet = groups;
- else
- this.groupSet = new GroupSet();
+ if (groups != null)
+ this.groupSet = groups;
+ else
+ this.groupSet = new GroupSet();
}
+
public void removeGroup(Group group)
{
getGroups().remove(group);
}
+
public void addGroup(Group group)
{
getGroups().add(group);
}
- public void setGroupsAsSet(Set groups)
- {
- this.groupSet = groups;
- }
- public Set getGroupsAsSet()
- {
- return groupSet;
- }
+ public void setGroupsAsSet(Set groups)
+ {
+ this.groupSet = groups;
+ }
+
+ public Set getGroupsAsSet()
+ {
+ return groupSet;
+ }
+
+ /**
+ * Calculate a hash code for this object
+ *
+ * @see org.apache.fulcrum.security.entity.impl.SecurityEntityImpl#hashCode()
+ */
+ public int hashCode()
+ {
+ return new HashCodeBuilder(45, 13)
+ .append(getPassword())
+ .appendSuper(super.hashCode())
+ .toHashCode();
+ }
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineRole.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineRole.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineRole.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineRole.java Sun Aug 27 13:20:44 2006
@@ -32,7 +32,8 @@
* @author <a href="mailto:epugh@upstate.com">Eric Pugh </a>
* @version $Id$
*/
-public class TurbineRole extends SecurityEntityImpl implements Role {
+public class TurbineRole extends SecurityEntityImpl implements Role
+{
private Set permissionSet = new PermissionSet();
private Set userGroupRoleSet = new HashSet();
@@ -40,10 +41,12 @@
/**
* @return
*/
- public PermissionSet getPermissions() {
+ public PermissionSet getPermissions()
+ {
if (permissionSet instanceof PermissionSet)
return (PermissionSet) permissionSet;
- else {
+ else
+ {
permissionSet = new PermissionSet(permissionSet);
return (PermissionSet) permissionSet;
}
@@ -52,19 +55,21 @@
/**
* @return
*/
- public Set getPermissionsAsSet() {
+ public Set getPermissionsAsSet()
+ {
return permissionSet;
}
- public void setPermissionsAsSet(Set permissions) {
+ public void setPermissionsAsSet(Set permissions)
+ {
this.permissionSet = permissions;
- ;
}
/**
* @param permissionSet
*/
- public void setPermissions(PermissionSet permissionSet) {
+ public void setPermissions(PermissionSet permissionSet)
+ {
if (permissionSet != null)
this.permissionSet = permissionSet;
else
@@ -76,7 +81,8 @@
*
* @param permission
*/
- public void addPermission(Permission permission) {
+ public void addPermission(Permission permission)
+ {
getPermissions().add(permission);
}
@@ -85,14 +91,16 @@
*
* @param permission
*/
- public void removePermission(Permission permission) {
+ public void removePermission(Permission permission)
+ {
getPermissions().remove(permission);
}
/**
* @return
*/
- public Set getUserGroupRoleSet() {
+ public Set getUserGroupRoleSet()
+ {
return userGroupRoleSet;
}
@@ -100,7 +108,8 @@
/**
* @param userGroupRoleSet
*/
- public void setUserGroupRoleSet(Set userGroupRoleSet) {
+ public void setUserGroupRoleSet(Set userGroupRoleSet)
+ {
this.userGroupRoleSet = userGroupRoleSet;
@@ -111,7 +120,8 @@
*
* @param group
*/
- public void addUserGroupRole(TurbineUserGroupRole userGroupRole) {
+ public void addUserGroupRole(TurbineUserGroupRole userGroupRole)
+ {
getUserGroupRoleSet().add(userGroupRole);
}
@@ -120,9 +130,9 @@
*
* @param group
*/
- public void removeUserGroupRole(TurbineUserGroupRole userGroupRole) {
+ public void removeUserGroupRole(TurbineUserGroupRole userGroupRole)
+ {
getUserGroupRoleSet().remove(userGroupRole);
}
-
-}
\ No newline at end of file
+}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUser.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUser.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUser.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUser.java Sun Aug 27 13:20:44 2006
@@ -1,4 +1,5 @@
package org.apache.fulcrum.security.model.turbine.entity;
+
/*
* Copyright 2001-2004 The Apache Software Foundation
*
@@ -18,21 +19,27 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.entity.impl.SecurityEntityImpl;
/**
- * Represents the "turbine" model where permissions are in a many to
- * many relationship to roles,
- * roles are related to groups are related to users,
- * all in many to many relationships.
+ * Represents the "turbine" model where permissions are in a many to many
+ * relationship to roles, roles are related to groups are related to users, all
+ * in many to many relationships.
*
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
public class TurbineUser extends SecurityEntityImpl implements User
{
+ /**
+ * Serial number
+ */
+ private static final long serialVersionUID = -7309619325167081811L;
+
private Set userGroupRoleSet = new HashSet();
+
private String password;
/**
@@ -40,18 +47,17 @@
*/
public Set getUserGroupRoleSet()
{
-
- return userGroupRoleSet;
+ return userGroupRoleSet;
}
+
/**
* @param userGroupRoleSet
*/
public void setUserGroupRoleSet(Set userGroupRoleSet)
{
- this.userGroupRoleSet = userGroupRoleSet;
-
+ this.userGroupRoleSet = userGroupRoleSet;
}
-
+
/**
* @return
*/
@@ -59,21 +65,35 @@
{
return password;
}
+
/**
* @param password
*/
public void setPassword(String password)
{
this.password = password;
- }
+ }
+
public void addUserGroupRole(TurbineUserGroupRole userGroupRole)
{
getUserGroupRoleSet().add(userGroupRole);
}
+
public void removeUserGroupRole(TurbineUserGroupRole userGroupRole)
{
getUserGroupRoleSet().remove(userGroupRole);
}
-
-
+
+ /**
+ * Calculate a hash code for this object
+ *
+ * @see org.apache.fulcrum.security.entity.impl.SecurityEntityImpl#hashCode()
+ */
+ public int hashCode()
+ {
+ return new HashCodeBuilder(41, 15)
+ .append(getPassword())
+ .appendSuper(super.hashCode())
+ .toHashCode();
+ }
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUserGroupRole.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUserGroupRole.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUserGroupRole.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/TurbineUserGroupRole.java Sun Aug 27 13:20:44 2006
@@ -22,7 +22,6 @@
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.entity.User;
-
/**
* Represents the "turbine" model where permissions are in a many to many
* relationship to roles, roles are related to groups are related to users, all
@@ -31,50 +30,74 @@
* @author <a href="mailto:epugh@upstate.com">Eric Pugh </a>
* @version $Id$
*/
-public class TurbineUserGroupRole implements Serializable {
+public class TurbineUserGroupRole implements Serializable
+{
+ /**
+ * Serial number
+ */
+ private static final long serialVersionUID = 265670888102016829L;
+
private User user;
+
private Group group;
+
private Role role;
+
private int hashCode;
- private boolean hashCodeGenerated=false;
-
+
+ private boolean hashCodeGenerated = false;
+
/**
* @return Returns the group.
*/
- public Group getGroup() {
+ public Group getGroup()
+ {
return group;
}
+
/**
* @return Returns the role.
*/
- public Role getRole() {
+ public Role getRole()
+ {
return role;
}
+
/**
* @return Returns the user.
*/
- public User getUser() {
+ public User getUser()
+ {
return user;
}
+
/**
- * @param group The group to set.
+ * @param group
+ * The group to set.
*/
- public void setGroup(Group group) {
+ public void setGroup(Group group)
+ {
this.group = group;
}
+
/**
- * @param role The role to set.
+ * @param role
+ * The role to set.
*/
- public void setRole(Role role) {
+ public void setRole(Role role)
+ {
this.role = role;
}
+
/**
- * @param user The user to set.
+ * @param user
+ * The user to set.
*/
- public void setUser(User user) {
+ public void setUser(User user)
+ {
this.user = user;
}
-
+
public boolean equals(Object obj)
{
if (null == obj)
@@ -87,7 +110,7 @@
}
else
{
- TurbineUserGroupRole mObj =(TurbineUserGroupRole) obj;
+ TurbineUserGroupRole mObj = (TurbineUserGroupRole) obj;
if (null != this.getRole() && null != mObj.getRole())
{
if (!this.getRole().equals(mObj.getRole()))
@@ -125,7 +148,6 @@
}
}
-
public int hashCode()
{
if (!hashCodeGenerated)
@@ -163,9 +185,8 @@
return this.hashCode;
}
-
public String toString()
{
return super.toString();
- }
-}
\ No newline at end of file
+ }
+}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java Sun Aug 27 13:20:44 2006
@@ -1,4 +1,5 @@
package org.apache.fulcrum.security.model.turbine.test;
+
/*
* Copyright 2001-2004 The Apache Software Foundation
*
@@ -35,12 +36,9 @@
import org.apache.fulcrum.security.util.PermissionSet;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
-
/**
* @author Eric Pugh
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
+ *
*/
public abstract class AbstractTurbineModelManagerTest extends BaseUnitTest
{
@@ -58,7 +56,8 @@
protected SecurityService securityService;
- public void setUp() throws Exception {
+ public void setUp() throws Exception
+ {
super.setUp();
roleManager = securityService.getRoleManager();
userManager = securityService.getUserManager();
@@ -69,24 +68,23 @@
/**
* Constructor for AbstractTurbineModelManagerTest.
+ *
* @param arg0
*/
public AbstractTurbineModelManagerTest(String arg0)
{
super(arg0);
}
-
- public void testGetGlobalGroup() throws Exception
- {
-
- Group global =modelManager.getGlobalGroup();
- assertNotNull(global);
- assertEquals(global.getName(),TurbineModelManager.GLOBAL_GROUP_NAME);
- }
-
-
- public void testGrantRolePermission() throws Exception {
+ public void testGetGlobalGroup() throws Exception
+ {
+ Group global = modelManager.getGlobalGroup();
+ assertNotNull(global);
+ assertEquals(global.getName(), TurbineModelManager.GLOBAL_GROUP_NAME);
+ }
+
+ public void testGrantRolePermission() throws Exception
+ {
Permission permission = permissionManager.getPermissionInstance();
permission.setName("ANSWER_PHONE");
permissionManager.addPermission(permission);
@@ -99,7 +97,8 @@
assertTrue(((TurbineRole) role).getPermissions().contains(permission));
}
- public void testRevokeRolePermission() throws Exception {
+ public void testRevokeRolePermission() throws Exception
+ {
Permission permission = securityService.getPermissionManager()
.getPermissionInstance();
permission.setName("ANSWER_FAX");
@@ -117,7 +116,8 @@
assertFalse(((TurbineRole) role).getPermissions().contains(permission));
}
- public void testRevokeAllRole() throws Exception {
+ public void testRevokeAllRole() throws Exception
+ {
Permission permission = securityService.getPermissionManager()
.getPermissionInstance();
Permission permission2 = securityService.getPermissionManager()
@@ -139,18 +139,19 @@
assertEquals(0, permissions.size());
}
- public void testRevokeAllUser() throws Exception {
+ public void testRevokeAllUser() throws Exception
+ {
Group group = securityService.getGroupManager().getGroupInstance();
group.setName("TEST_REVOKEALLUSER_GROUP");
securityService.getGroupManager().addGroup(group);
Role role = securityService.getRoleManager().getRoleInstance();
role.setName("TEST_REVOKEALLUSER_ROLE");
securityService.getRoleManager().addRole(role);
-
+
User user = userManager.getUserInstance("calvin");
userManager.addUser(user, "calvin");
- modelManager.grant(user, group,role);
-
+ modelManager.grant(user, group, role);
+
group = groupManager.getGroupById(group.getId());
Set userGroupRoleSet = ((TurbineGroup) group).getUserGroupRoleSet();
assertEquals(1, userGroupRoleSet.size());
@@ -162,13 +163,12 @@
role = securityService.getRoleManager().getRoleByName(
"TEST_REVOKEALLUSER_ROLE");
- //assertFalse(((TurbineRole) role).getGroups().contains(group));
+ // assertFalse(((TurbineRole) role).getGroups().contains(group));
}
-
-
- public void testGrantUserGroupRole() throws Exception {
+ public void testGrantUserGroupRole() throws Exception
+ {
Group group = securityService.getGroupManager().getGroupInstance();
group.setName("TEST_GROUP");
securityService.getGroupManager().addGroup(group);
@@ -177,23 +177,28 @@
roleManager.addRole(role);
User user = userManager.getUserInstance("Clint");
userManager.addUser(user, "clint");
- modelManager.grant(user, group,role);
+ modelManager.grant(user, group, role);
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)){
- ugrFound=true;
+ 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))
+ {
+ ugrFound = true;
break;
}
}
- assertTrue(ugrFound);;
+ assertTrue(ugrFound);
assertTrue(ugr.getGroup().equals(group));
assertTrue(ugr.getUser().equals(user));
}
- public void testRevokeUserGroupRole() throws Exception {
+ public void testRevokeUserGroupRole() throws Exception
+ {
Group group = securityService.getGroupManager().getGroupInstance();
group.setName("TEST_REVOKE");
securityService.getGroupManager().addGroup(group);
@@ -201,21 +206,22 @@
userManager.addUser(user, "pet");
Role role = roleManager.getRoleInstance();
role.setName("TEST_REVOKE_ROLE");
- roleManager.addRole(role);
- modelManager.grant(user, group,role);
- modelManager.revoke(user, group,role);
+ roleManager.addRole(role);
+ modelManager.grant(user, group, role);
+ modelManager.revoke(user, group, role);
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)){
- ugrFound=true;
+ 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))
+ {
+ ugrFound = true;
break;
}
}
- assertFalse(ugrFound);;
-
+ assertFalse(ugrFound);
}
-
-
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractEntityManager.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractEntityManager.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractEntityManager.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractEntityManager.java Sun Aug 27 13:20:44 2006
@@ -17,8 +17,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
*
@@ -35,16 +33,14 @@
private String className;
private static final String CLASS_NAME_KEY = "className";
- /** Logging */
- private static Log log = LogFactory.getLog(AbstractEntityManager.class);
-
- /**
+ /**
* Avalon Service lifecycle method
*/
public void configure(Configuration conf) throws ConfigurationException
{
className = conf.getChild(CLASS_NAME_KEY).getValue();
}
+
/**
* @return Returns the className.
*/
@@ -60,6 +56,5 @@
{
this.className = className;
}
-
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractGroupManager.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractGroupManager.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractGroupManager.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractGroupManager.java Sun Aug 27 13:20:44 2006
@@ -15,8 +15,6 @@
* limitations under the License.
*/
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.GroupManager;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.util.DataBackendException;
@@ -34,9 +32,6 @@
extends AbstractEntityManager
implements GroupManager
{
- /** Logging */
- private static Log log = LogFactory.getLog(AbstractGroupManager.class);
-
protected abstract Group persistNewGroup(Group group) throws DataBackendException;
/**
@@ -64,18 +59,19 @@
return group;
}
+
/**
- * Construct a blank Group object.
- *
- * This method calls getGroupClass, and then creates a new object using
- * the default constructor.
- *
- * @param groupName The name of the Group
- *
- * @return an object implementing Group interface.
- *
- * @throws DataBackendException if the object could not be instantiated.
- */
+ * Construct a blank Group object.
+ *
+ * This method calls getGroupClass, and then creates a new object using
+ * the default constructor.
+ *
+ * @param groupName The name of the Group
+ *
+ * @return an object implementing Group interface.
+ *
+ * @throws DataBackendException if the object could not be instantiated.
+ */
public Group getGroupInstance(String groupName) throws DataBackendException
{
Group group = getGroupInstance();
@@ -102,6 +98,7 @@
}
return group;
}
+
/**
* Retrieve a Group object with specified Id.
*
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java Sun Aug 27 13:20:44 2006
@@ -20,8 +20,6 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.GroupManager;
import org.apache.fulcrum.security.PermissionManager;
import org.apache.fulcrum.security.RoleManager;
@@ -40,10 +38,7 @@
extends AbstractLogEnabled
implements Serviceable, Disposable, ThreadSafe
{
-
boolean composed = false;
- /** Logging */
- private static Log log = LogFactory.getLog(AbstractManager.class);
private ServiceManager manager = null;
private PermissionManager permissionManager;
@@ -78,6 +73,7 @@
}
return userManager;
}
+
/**
* @return
*/
@@ -99,6 +95,7 @@
}
return permissionManager;
}
+
/**
* @return
*/
@@ -118,6 +115,7 @@
}
return roleManager;
}
+
/**
* @return
*/
@@ -137,6 +135,7 @@
}
return groupManager;
}
+
/**
* Avalon Service lifecycle method
*/
@@ -145,6 +144,7 @@
this.manager = manager;
}
+
public void dispose()
{
release(roleManager);
@@ -154,12 +154,12 @@
manager = null;
}
- protected void release(Object obj){
+ protected void release(Object obj)
+ {
if(obj!=null){
manager.release(obj);
obj = null;
}
-
}
@@ -174,7 +174,6 @@
try
{
component = manager.lookup(lookup);
-
}
catch (ServiceException ce)
{
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractPermissionManager.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractPermissionManager.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractPermissionManager.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractPermissionManager.java Sun Aug 27 13:20:44 2006
@@ -15,8 +15,6 @@
* limitations under the License.
*/
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.PermissionManager;
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.util.DataBackendException;
@@ -32,9 +30,6 @@
*/
public abstract class AbstractPermissionManager extends AbstractEntityManager implements PermissionManager
{
- /** Logging */
- private static Log log = LogFactory.getLog(AbstractPermissionManager.class);
-
protected abstract Permission persistNewPermission(Permission permission) throws DataBackendException;
/**
@@ -61,6 +56,7 @@
}
return permission;
}
+
/**
* Construct a blank Permission object.
*
@@ -78,6 +74,7 @@
perm.setName(permName);
return perm;
}
+
/**
* Retrieve a Permission object with specified name.
*
@@ -96,6 +93,7 @@
}
return permission;
}
+
/**
* Retrieve a Permission object with specified Id.
*
@@ -116,7 +114,8 @@
}
return permission;
}
- /**
+
+ /**
* Creates a new permission with specified attributes.
*
* @param permission the object describing the permission to be created.
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractRoleManager.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractRoleManager.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractRoleManager.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractRoleManager.java Sun Aug 27 13:20:44 2006
@@ -15,8 +15,6 @@
* limitations under the License.
*/
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.RoleManager;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.util.DataBackendException;
@@ -35,9 +33,6 @@
extends AbstractEntityManager
implements RoleManager
{
- /** Logging */
- private static Log log = LogFactory.getLog(AbstractRoleManager.class);
-
protected abstract Role persistNewRole(Role role) throws DataBackendException;
/**
@@ -65,33 +60,35 @@
return role;
}
+
/**
- * Construct a blank Role object.
- *
- * This method calls getRoleClass, and then creates a new object using
- * the default constructor.
- *
- * @param roleName The name of the role.
- *
- * @return an object implementing Role interface.
- *
- * @throws DataBackendException if the object could not be instantiated.
- */
+ * Construct a blank Role object.
+ *
+ * This method calls getRoleClass, and then creates a new object using
+ * the default constructor.
+ *
+ * @param roleName The name of the role.
+ *
+ * @return an object implementing Role interface.
+ *
+ * @throws DataBackendException if the object could not be instantiated.
+ */
public Role getRoleInstance(String roleName) throws DataBackendException
{
Role role = getRoleInstance();
role.setName(roleName);
return role;
}
+
/**
- * Retrieve a Role object with specified name.
- *
- * @param name the name of the Role.
- * @return an object representing the Role with specified name.
- * @throws DataBackendException if there was an error accessing the
- * data backend.
- * @throws UnknownEntityException if the role does not exist.
- */
+ * Retrieve a Role object with specified name.
+ *
+ * @param name the name of the Role.
+ * @return an object representing the Role with specified name.
+ * @throws DataBackendException if there was an error accessing the
+ * data backend.
+ * @throws UnknownEntityException if the role does not exist.
+ */
public Role getRoleByName(String name)
throws DataBackendException, UnknownEntityException
{
@@ -102,18 +99,19 @@
}
return role;
}
+
/**
- * Retrieve a Role object with specified Id.
- *
- * @param name the name of the Role.
- *
- * @return an object representing the Role with specified name.
- *
- * @throws UnknownEntityException if the permission does not
- * exist in the database.
- * @throws DataBackendException if there is a problem accessing the
- * storage.
- */
+ * Retrieve a Role object with specified Id.
+ *
+ * @param name the name of the Role.
+ *
+ * @return an object representing the Role with specified name.
+ *
+ * @throws UnknownEntityException if the permission does not
+ * exist in the database.
+ * @throws DataBackendException if there is a problem accessing the
+ * storage.
+ */
public Role getRoleById(Object id)
throws DataBackendException, UnknownEntityException
{
@@ -126,14 +124,14 @@
}
/**
- * Creates a new role with specified attributes.
- *
- * @param role the object describing the role to be created.
- * @return a new Role object that has id set up properly.
- * @throws DataBackendException if there was an error accessing the data
- * backend.
- * @throws EntityExistsException if the role already exists.
- */
+ * Creates a new role with specified attributes.
+ *
+ * @param role the object describing the role to be created.
+ * @return a new Role object that has id set up properly.
+ * @throws DataBackendException if there was an error accessing the data
+ * backend.
+ * @throws EntityExistsException if the role already exists.
+ */
public synchronized Role addRole(Role role)
throws DataBackendException, EntityExistsException
{
@@ -158,9 +156,7 @@
{
throw new DataBackendException("addRole(Role) failed", e);
}
- finally
- {
- }
+
// the only way we could get here without return/throw tirggered
// is that the roleExists was true.
throw new EntityExistsException("Role '" + role + "' already exists");
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractUserManager.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractUserManager.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractUserManager.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractUserManager.java Sun Aug 27 13:20:44 2006
@@ -15,8 +15,6 @@
* limitations under the License.
*/
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.UserManager;
import org.apache.fulcrum.security.acl.AccessControlList;
import org.apache.fulcrum.security.authenticator.Authenticator;
@@ -39,33 +37,27 @@
extends AbstractEntityManager
implements UserManager
{
-
protected abstract User persistNewUser(User user)
throws DataBackendException;
- /** Logging */
- private static Log log = LogFactory.getLog(AbstractUserManager.class);
-
-
private ACLFactory aclFactory;
private Authenticator authenticator;
public AccessControlList getACL(User user) throws UnknownEntityException
{
return getACLFactory().getAccessControlList(user);
-
}
/**
- * Check whether a specified user's account exists.
- *
- * The login name is used for looking up the account.
- *
- * @param user The user to be checked.
- * @return true if the specified account exists
- * @throws DataBackendException if there was an error accessing
- * the data backend.
- */
+ * Check whether a specified user's account exists.
+ *
+ * The login name is used for looking up the account.
+ *
+ * @param user The user to be checked.
+ * @return true if the specified account exists
+ * @throws DataBackendException if there was an error accessing
+ * the data backend.
+ */
public boolean checkExists(User user) throws DataBackendException
{
return checkExists(user.getName());
@@ -128,6 +120,7 @@
}
return user;
}
+
/**
* Authenticate an User with the specified password. If authentication
* is successful the method returns nothing. If there are any problems,
@@ -155,6 +148,7 @@
throw new PasswordMismatchException("Can not authenticate user.");
}
}
+
/**
* Change the password for an User. The user must have supplied the
* old password to allow the change.
@@ -193,6 +187,7 @@
// before it is saved at session's expiry.
saveUser(user);
}
+
/**
* Forcibly sets new password for an User.
*
@@ -222,6 +217,7 @@
// is lost somehow before it is saved at session's expiry.
saveUser(user);
}
+
/**
* Construct a blank User object.
*
@@ -248,6 +244,7 @@
return user;
}
+
/**
* Construct a blank User object.
*
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/DataBackendException.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/DataBackendException.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/DataBackendException.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/DataBackendException.java Sun Aug 27 13:20:44 2006
@@ -27,6 +27,11 @@
extends TurbineSecurityException
{
/**
+ * Serial number
+ */
+ private static final long serialVersionUID = 4037968846303489743L;
+
+ /**
* Construct an DataBackendException with specified detail message.
*
* @param msg The detail message.
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/EntityExistsException.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/EntityExistsException.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/EntityExistsException.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/EntityExistsException.java Sun Aug 27 13:20:44 2006
@@ -27,6 +27,11 @@
extends TurbineSecurityException
{
/**
+ * Serial number
+ */
+ private static final long serialVersionUID = 7525944855557287853L;
+
+ /**
* Construct an EntityExistsException with specified detail message.
*
* @param msg The detail message.
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/GroupSet.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/GroupSet.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/GroupSet.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/GroupSet.java Sun Aug 27 13:20:44 2006
@@ -37,6 +37,11 @@
extends SecuritySet
{
/**
+ * Serial number
+ */
+ private static final long serialVersionUID = 6882240173053961011L;
+
+ /**
* Constructs an empty GroupSet
*/
public GroupSet()
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PasswordMismatchException.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PasswordMismatchException.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PasswordMismatchException.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PasswordMismatchException.java Sun Aug 27 13:20:44 2006
@@ -26,6 +26,11 @@
extends TurbineSecurityException
{
/**
+ * Serial number
+ */
+ private static final long serialVersionUID = -5152999977039562720L;
+
+ /**
* Construct an PasswordMismatchException with specified detail message.
*
* @param msg The detail message.
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PermissionSet.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PermissionSet.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PermissionSet.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PermissionSet.java Sun Aug 27 13:20:44 2006
@@ -37,6 +37,11 @@
extends SecuritySet
{
/**
+ * Serial number
+ */
+ private static final long serialVersionUID = 4532868341893924965L;
+
+ /**
* Constructs an empty PermissionSet
*/
public PermissionSet()
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/RoleSet.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/RoleSet.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/RoleSet.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/RoleSet.java Sun Aug 27 13:20:44 2006
@@ -37,6 +37,11 @@
extends SecuritySet
{
/**
+ * Serial number
+ */
+ private static final long serialVersionUID = -7878336668034575930L;
+
+ /**
* Constructs an empty RoleSet
*/
public RoleSet()
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/TurbineSecurityException.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/TurbineSecurityException.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/TurbineSecurityException.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/TurbineSecurityException.java Sun Aug 27 13:20:44 2006
@@ -26,6 +26,11 @@
extends Exception
{
/**
+ * Serial number
+ */
+ private static final long serialVersionUID = 1768881827472257142L;
+
+ /**
* Construct an SecurityException with specified detail message.
*
* @param msg The detail message.
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UnknownEntityException.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UnknownEntityException.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UnknownEntityException.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UnknownEntityException.java Sun Aug 27 13:20:44 2006
@@ -27,6 +27,11 @@
extends TurbineSecurityException
{
/**
+ * Serial number
+ */
+ private static final long serialVersionUID = 6902116254535728203L;
+
+ /**
* Construct an UnknownEntityException with specified detail message.
*
* @param msg The detail message.
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UserSet.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UserSet.java?rev=437451&r1=437450&r2=437451&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UserSet.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UserSet.java Sun Aug 27 13:20:44 2006
@@ -33,6 +33,11 @@
extends SecuritySet
{
/**
+ * Serial number
+ */
+ private static final long serialVersionUID = 4415634631270197073L;
+
+ /**
* Constructs an empty UserSet
*/
public UserSet()
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org