You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2007/09/01 15:09:36 UTC
svn commit: r571795 [1/2] - in /turbine/core/branches/TURBINE_2_3_BRANCH: ./
src/java/org/apache/turbine/om/security/
src/java/org/apache/turbine/om/security/peer/
src/java/org/apache/turbine/services/security/
src/java/org/apache/turbine/services/secu...
Author: tv
Date: Sat Sep 1 06:09:35 2007
New Revision: 571795
URL: http://svn.apache.org/viewvc?rev=571795&view=rev
Log:
To make an integration with Torque 3.3 possible, the deprecated DBSecurityService is now simply derived from TorqueSecurityService. All defaults have been changed to use the TorqueSecurityService classes. The classes in org.apache.om.security likewise are derived from their Torque counterparts. There are no references left in the code however and they can be removed in the next release.
Note that these changes require a Torque version compiled from SVN (Revision 571790 or greater) for now.
Modified:
turbine/core/branches/TURBINE_2_3_BRANCH/project.xml
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineGroup.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbinePermission.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineRole.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineUser.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/GroupPeer.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePeer.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/SecurityService.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/TurbineSecurity.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/db/DBSecurityService.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/db/DBUserManager.java
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/ldap/LDAPSecurityService.java
turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/ldap-security-service.xml
turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/security-service.xml
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/project.xml
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml?rev=571795&r1=571794&r2=571795&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/project.xml (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/project.xml Sat Sep 1 06:09:35 2007
@@ -675,7 +675,7 @@
<dependency>
<groupId>torque</groupId>
<artifactId>torque</artifactId>
- <version>3.2</version>
+ <version>3.3-RC3</version>
<url>http://db.apache.org/torque/</url>
<type>jar</type>
<properties>
@@ -837,7 +837,7 @@
<dependency>
<groupId>torque</groupId>
<artifactId>maven-torque-plugin</artifactId>
- <version>3.2</version>
+ <version>3.3-RC3</version>
<type>plugin</type>
</dependency>
@@ -974,7 +974,7 @@
<report>maven-tasklist-plugin</report>
<report>maven-pmd-plugin</report>
<report>maven-simian-plugin</report>
- <report>maven-jcoverage-plugin</report>
+ <!-- report>maven-jcoverage-plugin</report -->
<report>maven-findbugs-plugin</report>
</reports>
</project>
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineGroup.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineGroup.java?rev=571795&r1=571794&r2=571795&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineGroup.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineGroup.java Sat Sep 1 06:09:35 2007
@@ -19,12 +19,7 @@
* under the License.
*/
-import java.sql.Connection;
-import java.util.Iterator;
-
-import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.util.security.RoleSet;
-import org.apache.turbine.util.security.TurbineSecurityException;
+import org.apache.turbine.services.security.torque.TorqueGroup;
/**
* This class represents a Group of Users in the system that are associated
@@ -46,141 +41,8 @@
*
* @version $Id$
*/
-public class TurbineGroup extends SecurityObject implements Group
+public class TurbineGroup extends TorqueGroup
{
/** Serial Version UID */
private static final long serialVersionUID = -6034684697021752649L;
-
- /**
- * Constructs a new Group.
- */
- public TurbineGroup()
- {
- super();
- }
-
- /**
- * Constructs a new Group with the specified name.
- *
- * @param name The name of the new object.
- */
- public TurbineGroup(String name)
- {
- super(name);
- }
-
- // These following methods are wrappers around TurbineSecurity
-
- /**
- * Makes changes made to the Group attributes permanent.
- *
- * @throws TurbineSecurityException if there is a problem while saving data.
- */
- public void save() throws TurbineSecurityException
- {
- TurbineSecurity.saveGroup(this);
- }
-
- /**
- * not implemented
- *
- * @param conn
- * @throws Exception
- */
- public void save(Connection conn) throws Exception
- {
- throw new Exception("not implemented");
- }
-
- /**
- * not implemented
- *
- * @param dbname
- * @throws Exception
- */
- public void save(String dbname) throws Exception
- {
- throw new Exception("not implemented");
- }
-
- /**
- * Removes a group from the system.
- *
- * @throws TurbineSecurityException if the Group could not be removed.
- */
- public void remove() throws TurbineSecurityException
- {
- TurbineSecurity.removeGroup(this);
- }
-
- /**
- * Renames the role.
- *
- * @param name The new Group name.
- * @throws TurbineSecurityException if the Group could not be renamed.
- */
- public void rename(String name) throws TurbineSecurityException
- {
- TurbineSecurity.renameGroup(this, name);
- }
-
- /**
- * Grants a Role in this Group to an User.
- *
- * @param user An User.
- * @param role A Role.
- * @throws TurbineSecurityException if there is a problem while assigning
- * the Role.
- */
- public void grant(User user, Role role) throws TurbineSecurityException
- {
- TurbineSecurity.grant(user, this, role);
- }
-
- /**
- * Grants Roles in this Group to an User.
- *
- * @param user An User.
- * @param roleSet A RoleSet.
- * @throws TurbineSecurityException if there is a problem while assigning
- * the Roles.
- */
- public void grant(User user, RoleSet roleSet)
- throws TurbineSecurityException
- {
- for (Iterator roles = roleSet.iterator(); roles.hasNext();)
- {
- TurbineSecurity.grant(user, this, (Role) roles.next());
- }
- }
-
- /**
- * Revokes a Role in this Group from an User.
- *
- * @param user An User.
- * @param role A Role.
- * @throws TurbineSecurityException if there is a problem while unassigning
- * the Role.
- */
- public void revoke(User user, Role role) throws TurbineSecurityException
- {
- TurbineSecurity.revoke(user, this, role);
- }
-
- /**
- * Revokes Roles in this group from an User.
- *
- * @param user An User.
- * @param roleSet a RoleSet.
- * @throws TurbineSecurityException if there is a problem while unassigning
- * the Roles.
- */
- public void revoke(User user, RoleSet roleSet)
- throws TurbineSecurityException
- {
- for (Iterator roles = roleSet.iterator(); roles.hasNext();)
- {
- TurbineSecurity.revoke(user, this, (Role) roles.next());
- }
- }
}
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbinePermission.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbinePermission.java?rev=571795&r1=571794&r2=571795&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbinePermission.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbinePermission.java Sat Sep 1 06:09:35 2007
@@ -19,9 +19,7 @@
* under the License.
*/
-import java.sql.Connection;
-import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.util.security.TurbineSecurityException;
+import org.apache.turbine.services.security.torque.TorquePermission;
/**
* This class represents the permissions that a Role has to access
@@ -38,79 +36,8 @@
*
* @version $Id$
*/
-public class TurbinePermission extends SecurityObject implements Permission
+public class TurbinePermission extends TorquePermission
{
/** Serial Version UID */
private static final long serialVersionUID = -2193700445644560143L;
-
- /**
- * Constructs a new TurbinePermission.
- */
- public TurbinePermission()
- {
- super();
- }
-
- /**
- * Constructs a new TurbinePermission with the sepcified name.
- *
- * @param name The name of the new object.
- */
- public TurbinePermission(String name)
- {
- super(name);
- }
-
- /**
- * Makes changes made to the Permission attributes permanent.
- *
- * @throws TurbineSecurityException if there is a problem while saving data.
- */
- public void save() throws TurbineSecurityException
- {
- TurbineSecurity.savePermission(this);
- }
-
- /**
- * not implemented
- *
- * @param conn
- * @throws Exception
- */
- public void save(Connection conn) throws Exception
- {
- throw new Exception("not implemented");
- }
-
- /**
- * not implemented
- *
- * @param dbname
- * @throws Exception
- */
- public void save(String dbname) throws Exception
- {
- throw new Exception("not implemented");
- }
-
- /**
- * Removes a permission from the system.
- *
- * @throws TurbineSecurityException if the Permission could not be removed.
- */
- public void remove() throws TurbineSecurityException
- {
- TurbineSecurity.removePermission(this);
- }
-
- /**
- * Renames the permission.
- *
- * @param name The new Permission name.
- * @throws TurbineSecurityException if the Permission could not be renamed.
- */
- public void rename(String name) throws TurbineSecurityException
- {
- TurbineSecurity.renamePermission(this, name);
- }
}
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineRole.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineRole.java?rev=571795&r1=571794&r2=571795&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineRole.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineRole.java Sat Sep 1 06:09:35 2007
@@ -19,12 +19,7 @@
* under the License.
*/
-import java.sql.Connection;
-import java.util.Iterator;
-
-import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.util.security.PermissionSet;
-import org.apache.turbine.util.security.TurbineSecurityException;
+import org.apache.turbine.services.security.torque.TorqueRole;
/**
* This class represents a role played by the User associated with the
@@ -39,184 +34,8 @@
*
* @version $Id$
*/
-public class TurbineRole extends SecurityObject implements Role
+public class TurbineRole extends TorqueRole
{
/** Serial Version UID */
private static final long serialVersionUID = -1354408789347969126L;
-
- /**
- * Constructs a new Role
- */
- public TurbineRole()
- {
- super();
- }
-
- /**
- * Constructs a new Role with the sepcified name.
- *
- * @param name The name of the new object.
- */
- public TurbineRole(String name)
- {
- super(name);
- }
-
- /** The permissions for this role. */
- private PermissionSet permissionSet = null;
-
- /**
- * Returns the set of Permissions associated with this Role.
- *
- * @return A PermissionSet.
- * @exception Exception a generic exception.
- */
- public PermissionSet getPermissions()
- throws Exception
- {
- return permissionSet;
- }
-
- /**
- * Sets the Permissions associated with this Role.
- *
- * @param permissionSet A PermissionSet.
- */
- public void setPermissions(PermissionSet permissionSet)
- {
- this.permissionSet = permissionSet;
- }
-
- // These following methods are wrappers around TurbineSecurity
-
- /**
- * Creates a new Role in the system.
- *
- * @param name The name of the new Role.
- * @return An object representing the new Role.
- * @throws TurbineSecurityException if the Role could not be created.
- */
- public Role create(String name)
- throws TurbineSecurityException
- {
- //Role role = new Role(name);
- Role role = new TurbineRole(name);
- TurbineSecurity.addRole(role);
- return role;
- }
-
- /**
- * Makes changes made to the Role attributes permanent.
- *
- * @throws TurbineSecurityException if there is a problem while
- * saving data.
- */
- public void save()
- throws TurbineSecurityException
- {
- TurbineSecurity.saveRole(this);
- }
-
- /**
- * not implemented
- *
- * @param conn
- * @throws Exception
- */
- public void save(Connection conn) throws Exception
- {
- throw new Exception("not implemented");
- }
-
- /**
- * not implemented
- *
- * @param dbname
- * @throws Exception
- */
- public void save(String dbname) throws Exception
- {
- throw new Exception("not implemented");
- }
-
- /**
- * Removes a role from the system.
- *
- * @throws TurbineSecurityException if the Role could not be removed.
- */
- public void remove()
- throws TurbineSecurityException
- {
- TurbineSecurity.removeRole(this);
- }
-
- /**
- * Renames the role.
- *
- * @param name The new Role name.
- * @throws TurbineSecurityException if the Role could not be renamed.
- */
- public void rename(String name)
- throws TurbineSecurityException
- {
- TurbineSecurity.renameRole(this, name);
- }
-
- /**
- * Grants a Permission to this Role.
- *
- * @param permission A Permission.
- * @throws TurbineSecurityException if there is a problem while assigning
- * the Permission.
- */
- public void grant(Permission permission)
- throws TurbineSecurityException
- {
- TurbineSecurity.grant(this, permission);
- }
-
- /**
- * Grants Permissions from a PermissionSet to this Role.
- *
- * @param permissionSet A PermissionSet.
- * @throws TurbineSecurityException if there is a problem while assigning
- * the Permissions.
- */
- public void grant(PermissionSet permissionSet)
- throws TurbineSecurityException
- {
- for (Iterator permissions = permissionSet.iterator(); permissions.hasNext();)
- {
- TurbineSecurity.grant(this, (Permission) permissions.next());
- }
- }
-
- /**
- * Revokes a Permission from this Role.
- *
- * @param permission A Permission.
- * @throws TurbineSecurityException if there is a problem while unassigning
- * the Permission.
- */
- public void revoke(Permission permission)
- throws TurbineSecurityException
- {
- TurbineSecurity.revoke(this, permission);
- }
-
- /**
- * Revokes Permissions from a PermissionSet from this Role.
- *
- * @param permissionSet A PermissionSet.
- * @throws TurbineSecurityException if there is a problem while unassigning
- * the Permissions.
- */
- public void revoke(PermissionSet permissionSet)
- throws TurbineSecurityException
- {
- for (Iterator permissions = permissionSet.iterator(); permissions.hasNext();)
- {
- TurbineSecurity.revoke(this, (Permission) permissions.next());
- }
- }
}
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineUser.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineUser.java?rev=571795&r1=571794&r2=571795&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineUser.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/TurbineUser.java Sat Sep 1 06:09:35 2007
@@ -19,17 +19,7 @@
* under the License.
*/
-import java.sql.Connection;
-
-import java.util.Date;
-import java.util.Hashtable;
-
-import javax.servlet.http.HttpSessionBindingEvent;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.turbine.services.security.torque.TorqueUser;
/**
* A generic implementation of User interface.
@@ -55,640 +45,8 @@
*
* @version $Id$
*/
-public class TurbineUser extends SecurityObject implements User
+public class TurbineUser extends TorqueUser
{
/** Serial Version UID */
private static final long serialVersionUID = -6090627713197456117L;
-
- /** Logging */
- private static Log log = LogFactory.getLog(TurbineUser.class);
-
- /** The date on which the user account was created. */
- private Date createDate = null;
-
- /** The date on which the user last accessed the application. */
- private Date lastAccessDate = null;
-
- /** This is data that will survive a servlet engine restart. */
- private Hashtable permStorage = null;
-
- /** This is data that will not survive a servlet engine restart. */
- private Hashtable tempStorage = null;
-
- /**
- * Constructor.
- *
- * Create a new User and set the createDate.
- */
- public TurbineUser()
- {
- super();
- createDate = new Date();
- setHasLoggedIn(Boolean.FALSE);
- }
-
- /**
- * Gets the access counter for a user during a session.
- *
- * @return The access counter for the user for the session.
- */
- public int getAccessCounterForSession()
- {
- try
- {
- return ((Integer) getTemp(User.SESSION_ACCESS_COUNTER)).intValue();
- }
- catch (Exception e)
- {
- return 0;
- }
- }
-
- /**
- * Gets the access counter for a user from perm storage.
- *
- * @return The access counter for the user.
- */
- public int getAccessCounter()
- {
- try
- {
- return ((Integer) getPerm(User.ACCESS_COUNTER)).intValue();
- }
- catch (Exception e)
- {
- return 0;
- }
- }
-
- /**
- * Gets the create date for this User. This is the time at which
- * the user object was created.
- *
- * @return A Java Date with the date of creation for the user.
- */
- public java.util.Date getCreateDate()
- {
- return createDate;
- }
-
- /**
- * Gets the last access date for this User. This is the last time
- * that the user object was referenced.
- *
- * @return A Java Date with the last access date for the user.
- */
- public java.util.Date getLastAccessDate()
- {
- if (lastAccessDate == null)
- {
- setLastAccessDate();
- }
- return lastAccessDate;
- }
-
- /**
- * Get last login date/time for this user.
- *
- * @return A Java Date with the last login date for the user.
- */
- public java.util.Date getLastLogin()
- {
- return (java.util.Date) getPerm(User.LAST_LOGIN);
- }
-
- /**
- * Get password for this user.
- *
- * @return A String with the password for the user.
- */
- public String getPassword()
- {
- return (String) getPerm(User.PASSWORD);
- }
-
- /**
- * Get an object from permanent storage.
- *
- * @param name The object's name.
- * @return An Object with the given name, or null if not found.
- */
- public Object getPerm(String name)
- {
- return getPerm(name,null);
- }
-
- /**
- * Get an object from permanent storage; return default if value
- * is null.
- *
- * @param name The object's name.
- * @param def A default value to return.
- * @return An Object with the given name.
- */
- public Object getPerm(String name, Object def)
- {
- Object val;
- try
- {
- val = getPermStorage().get(name);
- if (val == null)
- {
- val = def;
- }
- }
- catch (Exception e)
- {
- val = def;
- }
- return val;
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @return A Hashtable.
- */
- public Hashtable getPermStorage()
- {
- if (permStorage == null)
- {
- permStorage = new Hashtable(10);
- }
- return permStorage;
- }
-
- /**
- * Get an object from temporary storage; return null if the
- * object can't be found.
- *
- * @param name The object's name.
- * @return An Object with the given name.
- */
- public Object getTemp(String name)
- {
- return getTemp(name, null);
- }
-
- /**
- * Get an object from temporary storage; return default if value
- * is null.
- *
- * @param name The object's name.
- * @param def A default value to return.
- * @return An Object with the given name.
- */
- public Object getTemp(String name, Object def)
- {
- Object val;
- try
- {
- val = getTempStorage().get(name);
- if (val == null)
- {
- val = def;
- }
-
- }
- catch (Exception e)
- {
- val = def;
- }
- return val;
- }
-
- /**
- * Returns the username for this user.
- *
- * @return A String with the username.
- * @deprecated use {@link #getName} instead.
- */
- public String getUserName()
- {
- return getName();
- }
-
- /**
- * Returns the first name for this user.
- *
- * @return A String with the user's first name.
- */
- public String getFirstName()
- {
- String tmp = null;
- try
- {
- tmp = (String) getPerm(User.FIRST_NAME);
- if(tmp.length() == 0)
- {
- tmp = null;
- }
- }
- catch (Exception e)
- {
- }
- return tmp;
- }
-
- /**
- * Returns the last name for this user.
- *
- * @return A String with the user's last name.
- */
- public String getLastName()
- {
- String tmp = null;
- try
- {
- tmp = (String) getPerm(User.LAST_NAME);
- if (tmp.length() == 0)
- tmp = null;
- }
- catch (Exception e)
- {
- }
- return tmp;
- }
-
- /**
- * The user is considered logged in if they have not timed out.
- *
- * @return Whether the user has logged in.
- */
- public boolean hasLoggedIn()
- {
- Boolean loggedIn = getHasLoggedIn();
- return (loggedIn != null && loggedIn.booleanValue());
- }
-
- /**
- * Returns the email address for this user.
- *
- * @return A String with the user's email address.
- */
- public String getEmail()
- {
- return (String) getPerm(User.EMAIL);
- }
-
- /**
- * Increments the permanent hit counter for the user.
- */
- public void incrementAccessCounter()
- {
- setAccessCounter(getAccessCounter() + 1);
- }
-
- /**
- * Increments the session hit counter for the user.
- */
- public void incrementAccessCounterForSession()
- {
- setAccessCounterForSession(getAccessCounterForSession() + 1);
- }
-
- /**
- * Remove an object from temporary storage and return the object.
- *
- * @param name The name of the object to remove.
- * @return An Object.
- */
- public Object removeTemp(String name)
- {
- return getTempStorage().remove(name);
- }
-
- /**
- * Sets the access counter for a user, saved in perm storage.
- *
- * @param cnt The new count.
- */
- public void setAccessCounter(int cnt)
- {
- setPerm(User.ACCESS_COUNTER, new Integer(cnt));
- }
-
- /**
- * Sets the session access counter for a user, saved in temp
- * storage.
- *
- * @param cnt The new count.
- */
- public void setAccessCounterForSession(int cnt)
- {
- setTemp(User.SESSION_ACCESS_COUNTER, new Integer(cnt));
- }
-
- /**
- * Sets the last access date for this User. This is the last time
- * that the user object was referenced.
- */
- public void setLastAccessDate()
- {
- lastAccessDate = new java.util.Date();
- }
-
- /**
- * Sets the create date for this User. This is the time at which
- * the user object was created.
- *
- * @param date The create date.
- */
- public void setCreateDate(java.util.Date date)
- {
- createDate = date;
- }
-
- /**
- * Set last login date/time.
- *
- * @param date The last login date.
- */
- public void setLastLogin(java.util.Date date)
- {
- setPerm(User.LAST_LOGIN, date);
- }
-
- /**
- * Set password.
- *
- * @param password The new password.
- */
- public void setPassword(String password)
- {
- setPerm(User.PASSWORD, password);
- }
-
- /**
- * Put an object into permanent storage. If the value is null,
- * it will convert that to a "" because the underlying storage
- * mechanism within TurbineUser is currently a Hashtable and
- * null is not a valid value.
- *
- * @param name The object's name.
- * @param value The object.
- */
- public void setPerm(String name, Object value)
- {
- getPermStorage().put(name, (value == null) ? "" : value);
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @param permStorage A Hashtable.
- */
- public void setPermStorage(Hashtable permStorage)
- {
- this.permStorage = permStorage;
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @return A Hashtable.
- */
- public Hashtable getTempStorage()
- {
- if (tempStorage == null)
- {
- tempStorage = new Hashtable(10);
- }
- return tempStorage;
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @param storage A Hashtable.
- */
- public void setTempStorage(Hashtable tempStorage)
- {
- this.tempStorage = tempStorage;
- }
-
- /**
- * This gets whether or not someone has logged in. hasLoggedIn()
- * returns this value as a boolean. This is private because you
- * should use hasLoggedIn() instead.
- *
- * @return True if someone has logged in.
- */
- private Boolean getHasLoggedIn()
- {
- return (Boolean) getTemp(User.HAS_LOGGED_IN);
- }
-
- /**
- * This sets whether or not someone has logged in. hasLoggedIn()
- * returns this value.
- *
- * @param value Whether someone has logged in or not.
- */
- public void setHasLoggedIn(Boolean value)
- {
- setTemp(User.HAS_LOGGED_IN, value);
- }
-
- /**
- * Put an object into temporary storage. If the value is null,
- * it will convert that to a "" because the underlying storage
- * mechanism within TurbineUser is currently a Hashtable and
- * null is not a valid value.
- *
- * @param name The object's name.
- * @param value The object.
- */
- public void setTemp(String name, Object value)
- {
- getTempStorage().put(name, (value == null) ? "" : value);
- }
-
- /**
- * Sets the username for this user.
- *
- * @param username The user's username.
- * @deprecated use {@link #setName} instead
- */
- public void setUserName(String username)
- {
- setName(username);
- }
-
- /**
- * Sets the first name for this user.
- *
- * @param firstName User's first name.
- */
- public void setFirstName(String firstName)
- {
- setPerm(User.FIRST_NAME, firstName);
- }
-
- /**
- * Sets the last name for this user.
- *
- * @param lastName User's last name.
- */
- public void setLastName(String lastName)
- {
- setPerm(User.LAST_NAME, lastName);
- }
-
- /**
- * Sets the email address.
- *
- * @param address The email address.
- */
- public void setEmail(String address)
- {
- setPerm(User.EMAIL, address);
- }
-
- /**
- * This method reports whether or not the user has been confirmed
- * in the system by checking the User.CONFIRM_VALUE
- * column in the users record to see if it is equal to
- * User.CONFIRM_DATA.
- *
- * @return True if the user has been confirmed.
- */
- public boolean isConfirmed()
- {
- String value = getConfirmed();
- return (value != null && value.equals(User.CONFIRM_DATA));
- }
-
- /**
- * Sets the confirmation value. The value should
- * be either a random string or User.CONFIRM_DATA
- *
- * @param value The confirmation key value.
- */
- public void setConfirmed(String value)
- {
- String val = "";
- if (value != null)
- {
- val = value;
- }
- setPerm(User.CONFIRM_VALUE, val);
- }
-
- /**
- * Gets the confirmation value.
- *
- * @return status The confirmation value for this User
- */
- public String getConfirmed()
- {
- return (String) getPerm(User.CONFIRM_VALUE);
- }
-
- /**
- * Updates the last login date in the database.
- *
- * @exception Exception a generic exception.
- */
- public void updateLastLogin()
- throws Exception
- {
- setPerm(User.LAST_LOGIN, new java.util.Date());
- }
-
- /**
- * Implement this method if you wish to be notified when the User
- * has been Bound to the session.
- *
- * @param hsbe The HttpSessionBindingEvent.
- */
- public void valueBound(HttpSessionBindingEvent hsbe)
- {
- // Currently we have no need for this method.
- }
-
- /**
- * Implement this method if you wish to be notified when the User
- * has been Unbound from the session.
- *
- * @param hsbe The HttpSessionBindingEvent.
- */
- public void valueUnbound(HttpSessionBindingEvent hsbe)
- {
- try
- {
- if (hasLoggedIn())
- {
- TurbineSecurity.saveOnSessionUnbind(this);
- }
- }
- catch (Exception e)
- {
- log.error("TurbineUser.valueUnbound(): " + e.getMessage(), e);
- }
- }
-
- /**
- * Saves this object to the data store.
- */
- public void save()
- throws Exception
- {
- if (TurbineSecurity.accountExists(this))
- {
- TurbineSecurity.saveUser(this);
- }
- else
- {
- TurbineSecurity.addUser(this, getPassword());
- }
- }
-
- /**
- * not implemented
- *
- * @param conn
- * @throws Exception
- */
- public void save(Connection conn) throws Exception
- {
- throw new Exception("not implemented");
- }
-
- /**
- * not implemented
- *
- * @param dbname
- * @throws Exception
- */
- public void save(String dbname) throws Exception
- {
- throw new Exception("not implemented");
- }
-
- /**
- * Returns the name of this user. This will be the user name/
- * login name.
- *
- * @return The name of the user.
- */
- public String getName()
- {
- return (String) getPerm(User.USERNAME);
- }
-
- /**
- * Sets the name of this user. This will be the user name/
- * login name.
- *
- * @param name The name of the object.
- */
- public void setName(String name)
- {
- setPerm(User.USERNAME, name);
- }
}
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/GroupPeer.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/GroupPeer.java?rev=571795&r1=571794&r2=571795&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/GroupPeer.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/GroupPeer.java Sat Sep 1 06:09:35 2007
@@ -21,18 +21,16 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
+import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
import org.apache.torque.om.BaseObject;
import org.apache.torque.om.NumberKey;
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Criteria;
import org.apache.turbine.om.security.Group;
-import org.apache.turbine.om.security.SecurityObject;
import org.apache.turbine.om.security.TurbineGroup;
import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.GroupSet;
@@ -77,7 +75,7 @@
{
try
{
- MAP_BUILDER = (TurbineMapBuilder)/* Torque. */getMapBuilder(TurbineMapBuilder.class.getName());
+ MAP_BUILDER = (TurbineMapBuilder) Torque.getMapBuilder(TurbineMapBuilder.class.getName());
}
catch (TorqueException e)
{
@@ -162,15 +160,20 @@
{
Group obj = TurbineSecurity.getGroupInstance(null);
Record row = (Record) rows.get(i);
- ((SecurityObject) obj).setPrimaryKey(
+ ((TurbineGroup) obj).setPrimaryKey(
new NumberKey(row.getValue(1).asInt()));
- ((SecurityObject) obj).setName(row.getValue(2).asString());
+ ((TurbineGroup) obj).setName(row.getValue(2).asString());
+
+ // TODO: Clean up OBJECTDATA columns. They are no longer supported
+ /*
byte[] objectData = row.getValue(3).asBytes();
Map temp = (Map) ObjectUtils.deserialize(objectData);
if (temp != null)
{
- ((SecurityObject) obj).setAttributes(temp);
+ ((TurbineGroup) obj).setAttributes(temp);
}
+ */
+
results.add(obj);
}
@@ -212,7 +215,7 @@
{
Criteria criteria = new Criteria();
criteria.addSelectColumn(GROUP_ID);
- criteria.add(NAME, ((SecurityObject) group).getName());
+ criteria.add(NAME, ((TurbineGroup) group).getName());
List results = BasePeer.doSelect(criteria);
if (results.size() > 1)
{
@@ -256,7 +259,7 @@
public static Criteria buildCriteria(Group group)
{
Criteria criteria = new Criteria();
- criteria.add(NAME, ((SecurityObject) group).getName());
+ criteria.add(NAME, ((TurbineGroup) group).getName());
if (!((BaseObject) group).isNew())
{
criteria.add(GROUP_ID, ((BaseObject) group).getPrimaryKey());
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java?rev=571795&r1=571794&r2=571795&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java Sat Sep 1 06:09:35 2007
@@ -22,9 +22,9 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
-import java.util.Map;
import java.util.Vector;
+import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
import org.apache.torque.om.BaseObject;
import org.apache.torque.om.NumberKey;
@@ -32,10 +32,9 @@
import org.apache.torque.util.Criteria;
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.om.security.Role;
-import org.apache.turbine.om.security.SecurityObject;
+import org.apache.turbine.om.security.TurbinePermission;
import org.apache.turbine.om.security.TurbineRole;
import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.PermissionSet;
@@ -80,7 +79,7 @@
{
try
{
- MAP_BUILDER = (TurbineMapBuilder)/* Torque. */getMapBuilder(TurbineMapBuilder.class.getName());
+ MAP_BUILDER = (TurbineMapBuilder) Torque.getMapBuilder(TurbineMapBuilder.class.getName());
}
catch (TorqueException e)
{
@@ -174,15 +173,20 @@
{
Permission obj = TurbineSecurity.getPermissionInstance(null);
Record row = (Record) rows.get(i);
- ((SecurityObject) obj).setPrimaryKey(
+ ((TurbinePermission) obj).setPrimaryKey(
new NumberKey(row.getValue(1).asInt()));
- ((SecurityObject) obj).setName(row.getValue(2).asString());
+ ((TurbinePermission) obj).setName(row.getValue(2).asString());
+
+ // TODO: Clean up OBJECTDATA columns. They are no longer supported
+ /*
byte[] objectData = row.getValue(3).asBytes();
Map temp = (Map) ObjectUtils.deserialize(objectData);
if (temp != null)
{
- ((SecurityObject) obj).setAttributes(temp);
+ ((TurbinePermission) obj).setAttributes(temp);
}
+ */
+
results.add(obj);
}
@@ -208,7 +212,7 @@
criteria.add(PERMISSION_ID,
((BaseObject) permission).getPrimaryKey());
}
- criteria.add(NAME, ((SecurityObject) permission).getName());
+ criteria.add(NAME, ((TurbinePermission) permission).getName());
/*
* This is causing the the removal and updating of
@@ -257,12 +261,12 @@
{
Criteria criteria = new Criteria();
criteria.addSelectColumn(PERMISSION_ID);
- criteria.add(NAME, ((SecurityObject) permission).getName());
+ criteria.add(NAME, ((TurbinePermission) permission).getName());
List results = BasePeer.doSelect(criteria);
if (results.size() > 1)
{
throw new DataBackendException("Multiple permissions named '"
- + ((SecurityObject) permission).getName() + "' exist!");
+ + ((TurbinePermission) permission).getName() + "' exist!");
}
return (results.size() == 1);
}
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePeer.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePeer.java?rev=571795&r1=571794&r2=571795&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePeer.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePeer.java Sat Sep 1 06:09:35 2007
@@ -21,8 +21,8 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
+import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
import org.apache.torque.om.BaseObject;
import org.apache.torque.om.NumberKey;
@@ -33,7 +33,6 @@
import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.TurbineRole;
import org.apache.turbine.om.security.User;
-import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.RoleSet;
@@ -78,7 +77,7 @@
{
try
{
- MAP_BUILDER = (TurbineMapBuilder)/* Torque. */getMapBuilder(TurbineMapBuilder.class.getName());
+ MAP_BUILDER = (TurbineMapBuilder) Torque.getMapBuilder(TurbineMapBuilder.class.getName());
}
catch (TorqueException e)
{
@@ -175,12 +174,16 @@
((TurbineRole) obj).setPrimaryKey(
new NumberKey(row.getValue(1).asInt()));
((TurbineRole) obj).setName(row.getValue(2).asString());
+
+ // TODO: Clean up OBJECTDATA columns. They are no longer supported
+ /*
byte[] objectData = row.getValue(3).asBytes();
Map temp = (Map) ObjectUtils.deserialize(objectData);
if (temp != null)
{
((TurbineRole) obj).setAttributes(temp);
}
+ */
results.add(obj);
}
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java?rev=571795&r1=571794&r2=571795&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java Sat Sep 1 06:09:35 2007
@@ -19,6 +19,7 @@
* under the License.
*/
+import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Criteria;
@@ -61,7 +62,7 @@
{
try
{
- MAP_BUILDER = (TurbineMapBuilder)/* Torque. */getMapBuilder(TurbineMapBuilder.class.getName());
+ MAP_BUILDER = (TurbineMapBuilder) Torque.getMapBuilder(TurbineMapBuilder.class.getName());
}
catch (TorqueException e)
{
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java?rev=571795&r1=571794&r2=571795&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java Sat Sep 1 06:09:35 2007
@@ -24,6 +24,7 @@
import java.util.Hashtable;
import java.util.List;
+import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
import org.apache.torque.map.TableMap;
import org.apache.torque.om.NumberKey;
@@ -125,7 +126,7 @@
{
try
{
- MAP_BUILDER = (TurbineMapBuilder)/* Torque. */getMapBuilder(TurbineMapBuilder.class.getName());
+ MAP_BUILDER = (TurbineMapBuilder) Torque.getMapBuilder(TurbineMapBuilder.class.getName());
}
catch (TorqueException e)
{
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java?rev=571795&r1=571794&r2=571795&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java Sat Sep 1 06:09:35 2007
@@ -19,6 +19,7 @@
* under the License.
*/
+import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
import org.apache.torque.util.BasePeer;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
@@ -60,7 +61,7 @@
{
try
{
- MAP_BUILDER = (TurbineMapBuilder)/* Torque. */getMapBuilder(TurbineMapBuilder.class.getName());
+ MAP_BUILDER = (TurbineMapBuilder) Torque.getMapBuilder(TurbineMapBuilder.class.getName());
}
catch (TorqueException e)
{
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/SecurityService.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/SecurityService.java?rev=571795&r1=571794&r2=571795&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/SecurityService.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/SecurityService.java Sat Sep 1 06:09:35 2007
@@ -23,17 +23,16 @@
import java.util.Map;
import org.apache.torque.util.Criteria;
-
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.om.security.Role;
-import org.apache.turbine.om.security.TurbineGroup;
-import org.apache.turbine.om.security.TurbinePermission;
-import org.apache.turbine.om.security.TurbineRole;
-import org.apache.turbine.om.security.TurbineUser;
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.Service;
-import org.apache.turbine.services.security.db.DBUserManager;
+import org.apache.turbine.services.security.torque.TorqueGroup;
+import org.apache.turbine.services.security.torque.TorquePermission;
+import org.apache.turbine.services.security.torque.TorqueRole;
+import org.apache.turbine.services.security.torque.TorqueUser;
+import org.apache.turbine.services.security.torque.TorqueUserManager;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.EntityExistsException;
@@ -79,7 +78,7 @@
* (org.apache.turbine.om.security.TurbineUser)
*/
String USER_CLASS_DEFAULT
- = TurbineUser.class.getName();
+ = TorqueUser.class.getName();
/**
* The key within services' properties for the GROUP
@@ -92,7 +91,7 @@
* (org.apache.turbine.om.security.TurbineGroup)
*/
String GROUP_CLASS_DEFAULT
- = TurbineGroup.class.getName();
+ = TorqueGroup.class.getName();
/**
* The key within services' properties for the PERMISSION
@@ -105,7 +104,7 @@
* (org.apache.turbine.om.security.TurbinePermission)
*/
String PERMISSION_CLASS_DEFAULT
- = TurbinePermission.class.getName();
+ = TorquePermission.class.getName();
/**
* The key within services' properties for the ROLE
@@ -118,7 +117,7 @@
* (org.apache.turbine.om.security.TurbineRole)
*/
String ROLE_CLASS_DEFAULT
- = TurbineRole.class.getName();
+ = TorqueRole.class.getName();
/**
* The key within services' properties for the
@@ -141,10 +140,10 @@
/**
* the default implementation of UserManager interface
- * (org.apache.turbine.services.security.DBUserManager)
+ * (org.apache.turbine.services.security.torque.TorqueUserManager)
*/
String USER_MANAGER_DEFAULT
- = DBUserManager.class.getName();
+ = TorqueUserManager.class.getName();
/**
* the key within services's properties for secure passwords flag
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/TurbineSecurity.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/TurbineSecurity.java?rev=571795&r1=571794&r2=571795&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/TurbineSecurity.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/TurbineSecurity.java Sat Sep 1 06:09:35 2007
@@ -295,11 +295,12 @@
* @return a List of users meeting the criteria.
* @throws DataBackendException if there is a problem accessing the
* storage.
+ * @deprecated use getUserList() instead
*/
public static User[] getUsers(Criteria criteria)
throws DataBackendException
{
- return getService().getUsers(criteria);
+ return (User[])getService().getUserList(criteria).toArray();
}
/**