You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/04/08 11:50:36 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque GroupPeerManager.java GroupPeerManagerConstants.java PermissionPeerManager.java PermissionPeerManagerConstants.java RolePeerManager.java RolePeerManagerConstants.java TorqueGroup.java TorqueObject.java TorquePermission.java TorqueRole.java TorqueSecurityService.java TorqueUser.java TorqueUserManager.java UserPeerManager.java
henning 2003/04/08 02:50:36
Modified: src/java/org/apache/turbine/services/security/torque
GroupPeerManager.java
GroupPeerManagerConstants.java
PermissionPeerManager.java
PermissionPeerManagerConstants.java
RolePeerManager.java RolePeerManagerConstants.java
TorqueGroup.java TorqueObject.java
TorquePermission.java TorqueRole.java
TorqueSecurityService.java TorqueUser.java
TorqueUserManager.java UserPeerManager.java
Log:
Resynced to our current internal tree:
- removed public static final from the interfaces
- cleaned up imports
- use class.getName() instead of string constants
- remove last remnants of "db" variable names
Revision Changes Path
1.3 +7 -13 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java
Index: GroupPeerManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GroupPeerManager.java 9 Mar 2003 03:06:32 -0000 1.2
+++ GroupPeerManager.java 8 Apr 2003 09:50:35 -0000 1.3
@@ -53,7 +53,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
import java.beans.PropertyDescriptor;
import java.util.ArrayList;
@@ -65,21 +64,16 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.turbine.services.InitializationException;
-
-import org.apache.turbine.services.security.TurbineSecurity;
-
-import org.apache.turbine.om.security.Group;
-
-import org.apache.turbine.util.security.DataBackendException;
-import org.apache.turbine.util.security.GroupSet;
-
import org.apache.torque.TorqueException;
-
import org.apache.torque.om.Persistent;
-
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Criteria;
+
+import org.apache.turbine.om.security.Group;
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.turbine.util.security.DataBackendException;
+import org.apache.turbine.util.security.GroupSet;
/**
* This class capsulates all direct Peer access for the Group entities.
1.3 +19 -20 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/GroupPeerManagerConstants.java
Index: GroupPeerManagerConstants.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/GroupPeerManagerConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GroupPeerManagerConstants.java 9 Mar 2003 03:06:32 -0000 1.2
+++ GroupPeerManagerConstants.java 8 Apr 2003 09:50:35 -0000 1.3
@@ -54,6 +54,8 @@
* <http://www.apache.org/>.
*/
+import org.apache.turbine.services.security.torque.om.TurbineGroupPeer;
+
/**
* Constants for configuring the various columns and bean properties
* for the used peer.
@@ -80,52 +82,49 @@
public interface GroupPeerManagerConstants
{
/** The key within the security service properties for the group class implementation */
- public static final String GROUP_CLASS_KEY =
- "torque.group.class";
+ String GROUP_CLASS_KEY =
+ "torque.group.class";
/** The key within the security service properties for the group peer class implementation */
- public static final String GROUP_PEER_CLASS_KEY =
- "torque.groupPeer.class";
+ String GROUP_PEER_CLASS_KEY =
+ "torque.groupPeer.class";
/** Group peer default class */
- public static final String GROUP_PEER_CLASS_DEFAULT =
- "org.apache.turbine.services.security.torque.om.TurbineGroupPeer";
+ String GROUP_PEER_CLASS_DEFAULT =
+ TurbineGroupPeer.class.getName();
/** The column name for the login name field. */
- public static final String GROUP_NAME_COLUMN_KEY =
- "torque.groupPeer.column.name";
+ String GROUP_NAME_COLUMN_KEY =
+ "torque.groupPeer.column.name";
/** The column name for the id field. */
- public static final String GROUP_ID_COLUMN_KEY =
+ String GROUP_ID_COLUMN_KEY =
"torque.groupPeer.column.id";
/** The default value for the column name constant for the login name field. */
- public static final String GROUP_NAME_COLUMN_DEFAULT =
+ String GROUP_NAME_COLUMN_DEFAULT =
"GROUP_NAME";
/** The default value for the column name constant for the id field. */
- public static final String GROUP_ID_COLUMN_DEFAULT =
+ String GROUP_ID_COLUMN_DEFAULT =
"GROUP_ID";
/** The property name of the bean property for the login name field. */
- public static final String GROUP_NAME_PROPERTY_KEY =
+ String GROUP_NAME_PROPERTY_KEY =
"torque.group.property.name";
/** The property name of the bean property for the id field. */
- public static final String GROUP_ID_PROPERTY_KEY =
+ String GROUP_ID_PROPERTY_KEY =
"torque.group.property.id";
/** The default value of the bean property for the login name field. */
- public static final String GROUP_NAME_PROPERTY_DEFAULT =
+ String GROUP_NAME_PROPERTY_DEFAULT =
"Name";
/** The default value of the bean property for the id field. */
- public static final String GROUP_ID_PROPERTY_DEFAULT =
+ String GROUP_ID_PROPERTY_DEFAULT =
"GroupId";
-
-};
-
-
+}
1.3 +3 -9 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/PermissionPeerManager.java
Index: PermissionPeerManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/PermissionPeerManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PermissionPeerManager.java 9 Mar 2003 03:06:32 -0000 1.2
+++ PermissionPeerManager.java 8 Apr 2003 09:50:35 -0000 1.3
@@ -67,22 +67,16 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.turbine.services.InitializationException;
-
-import org.apache.turbine.services.security.TurbineSecurity;
-
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.om.security.Role;
-
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.services.security.torque.om.TurbineRolePermissionPeer;
-
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.PermissionSet;
import org.apache.torque.TorqueException;
-
import org.apache.torque.om.Persistent;
-
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Criteria;
1.3 +16 -16 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/PermissionPeerManagerConstants.java
Index: PermissionPeerManagerConstants.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/PermissionPeerManagerConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PermissionPeerManagerConstants.java 9 Mar 2003 03:06:32 -0000 1.2
+++ PermissionPeerManagerConstants.java 8 Apr 2003 09:50:35 -0000 1.3
@@ -54,6 +54,8 @@
* <http://www.apache.org/>.
*/
+import org.apache.turbine.services.security.torque.om.TurbinePermissionPeer;
+
/**
* Constants for configuring the various columns and bean properties
* for the used peer.
@@ -80,52 +82,50 @@
public interface PermissionPeerManagerConstants
{
/** The key within the security service properties for the permission class implementation */
- public static final String PERMISSION_CLASS_KEY =
+ String PERMISSION_CLASS_KEY =
"torque.permission.class";
/** The key within the security service properties for the permission peer class implementation */
- public static final String PERMISSION_PEER_CLASS_KEY =
+ String PERMISSION_PEER_CLASS_KEY =
"torque.permissionPeer.class";
/** Permission peer default class */
- public static final String PERMISSION_PEER_CLASS_DEFAULT =
- "org.apache.turbine.services.security.torque.om.TurbinePermissionPeer";
+ String PERMISSION_PEER_CLASS_DEFAULT =
+ TurbinePermissionPeer.class.getName();
/** The column name for the login name field. */
- public static final String PERMISSION_NAME_COLUMN_KEY =
+ String PERMISSION_NAME_COLUMN_KEY =
"torque.permissionPeer.column.name";
/** The column name for the id field. */
- public static final String PERMISSION_ID_COLUMN_KEY =
+ String PERMISSION_ID_COLUMN_KEY =
"torque.permissionPeer.column.id";
/** The default value for the column name constant for the login name field. */
- public static final String PERMISSION_NAME_COLUMN_DEFAULT =
+ String PERMISSION_NAME_COLUMN_DEFAULT =
"PERMISSION_NAME";
/** The default value for the column name constant for the id field. */
- public static final String PERMISSION_ID_COLUMN_DEFAULT =
+ String PERMISSION_ID_COLUMN_DEFAULT =
"PERMISSION_ID";
/** The property name of the bean property for the login name field. */
- public static final String PERMISSION_NAME_PROPERTY_KEY =
+ String PERMISSION_NAME_PROPERTY_KEY =
"torque.permission.property.name";
/** The property name of the bean property for the id field. */
- public static final String PERMISSION_ID_PROPERTY_KEY =
+ String PERMISSION_ID_PROPERTY_KEY =
"torque.permission.property.id";
/** The default value of the bean property for the login name field. */
- public static final String PERMISSION_NAME_PROPERTY_DEFAULT =
+ String PERMISSION_NAME_PROPERTY_DEFAULT =
"Name";
/** The default value of the bean property for the id field. */
- public static final String PERMISSION_ID_PROPERTY_DEFAULT =
+ String PERMISSION_ID_PROPERTY_DEFAULT =
"PermissionId";
-};
-
-
+}
1.3 +3 -9 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java
Index: RolePeerManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RolePeerManager.java 9 Mar 2003 03:06:32 -0000 1.2
+++ RolePeerManager.java 8 Apr 2003 09:50:35 -0000 1.3
@@ -65,23 +65,17 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.turbine.services.InitializationException;
-
-import org.apache.turbine.services.security.TurbineSecurity;
-
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.User;
-
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.services.security.torque.om.TurbineUserGroupRolePeer;
-
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.RoleSet;
import org.apache.torque.TorqueException;
-
import org.apache.torque.om.Persistent;
-
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Criteria;
1.3 +5 -5 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/RolePeerManagerConstants.java
Index: RolePeerManagerConstants.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/RolePeerManagerConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RolePeerManagerConstants.java 9 Mar 2003 03:06:32 -0000 1.2
+++ RolePeerManagerConstants.java 8 Apr 2003 09:50:35 -0000 1.3
@@ -54,6 +54,8 @@
* <http://www.apache.org/>.
*/
+import org.apache.turbine.services.security.torque.om.TurbineRolePeer;
+
/**
* Constants for configuring the various columns and bean properties
* for the used peer.
@@ -89,7 +91,7 @@
/** Role peer default class */
public static final String ROLE_PEER_CLASS_DEFAULT =
- "org.apache.turbine.services.security.torque.om.TurbineRolePeer";
+ TurbineRolePeer.class.getName();
/** The column name for the login name field. */
public static final String ROLE_NAME_COLUMN_KEY =
@@ -126,6 +128,4 @@
public static final String ROLE_ID_PROPERTY_DEFAULT =
"RoleId";
-};
-
-
+}
1.3 +3 -6 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueGroup.java
Index: TorqueGroup.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueGroup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorqueGroup.java 9 Mar 2003 03:06:32 -0000 1.2
+++ TorqueGroup.java 8 Apr 2003 09:50:35 -0000 1.3
@@ -58,17 +58,14 @@
import java.util.Iterator;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.torque.om.Persistent;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.User;
-
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.security.RoleSet;
-
import org.apache.turbine.util.security.TurbineSecurityException;
-
-import org.apache.torque.om.Persistent;
/**
* This class represents a Group of Users in the system that are associated
1.3 +7 -9 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueObject.java
Index: TorqueObject.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueObject.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorqueObject.java 9 Mar 2003 03:06:32 -0000 1.2
+++ TorqueObject.java 8 Apr 2003 09:50:35 -0000 1.3
@@ -56,13 +56,11 @@
import java.sql.Connection;
-import org.apache.turbine.om.security.SecurityEntity;
-
-import org.apache.turbine.util.security.TurbineSecurityException;
-
-import org.apache.torque.om.Persistent;
import org.apache.torque.om.ObjectKey;
+import org.apache.torque.om.Persistent;
+import org.apache.turbine.om.security.SecurityEntity;
+import org.apache.turbine.util.security.TurbineSecurityException;
/**
* All the Torque Security objects (User, Group, Role, Permission) are
@@ -226,14 +224,14 @@
* Stores the object in the database. If the object is new,
* it inserts it; otherwise an update is performed.
*
- * @param dbName The name under which the object should be stored.
+ * @param torqueName The name under which the object should be stored.
*
* @exception Exception This method might throw an exceptions
*/
- public void save(String dbName)
+ public void save(String torqueName)
throws Exception
{
- getPersistentObj().save(dbName);
+ getPersistentObj().save(torqueName);
}
/**
1.3 +3 -5 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorquePermission.java
Index: TorquePermission.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorquePermission.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorquePermission.java 9 Mar 2003 03:06:32 -0000 1.2
+++ TorquePermission.java 8 Apr 2003 09:50:35 -0000 1.3
@@ -56,13 +56,11 @@
import java.sql.Connection;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.torque.om.Persistent;
import org.apache.turbine.om.security.Permission;
-
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.security.TurbineSecurityException;
-
-import org.apache.torque.om.Persistent;
/**
* This class represents a permission given to a Role associated with the
1.3 +2 -4 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueRole.java
Index: TorqueRole.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueRole.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorqueRole.java 9 Mar 2003 03:06:32 -0000 1.2
+++ TorqueRole.java 8 Apr 2003 09:50:35 -0000 1.3
@@ -58,11 +58,9 @@
import java.util.Iterator;
-import org.apache.turbine.services.security.TurbineSecurity;
-
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.om.security.Role;
-
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.security.PermissionSet;
import org.apache.turbine.util.security.TurbineSecurityException;
1.3 +20 -25 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java
Index: TorqueSecurityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorqueSecurityService.java 9 Mar 2003 03:06:32 -0000 1.2
+++ TorqueSecurityService.java 8 Apr 2003 09:50:35 -0000 1.3
@@ -59,21 +59,26 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.configuration.Configuration;
+
import org.apache.commons.lang.StringUtils;
-import org.apache.turbine.services.InitializationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
-import org.apache.turbine.services.security.BaseSecurityService;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.torque.om.NumberKey;
+import org.apache.torque.om.Persistent;
+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.User;
-
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.services.security.BaseSecurityService;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.services.security.torque.om.TurbineRolePermissionPeer;
import org.apache.turbine.services.security.torque.om.TurbineUserGroupRolePeer;
-
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.EntityExistsException;
@@ -82,16 +87,6 @@
import org.apache.turbine.util.security.RoleSet;
import org.apache.turbine.util.security.UnknownEntityException;
-import org.apache.commons.configuration.Configuration;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.torque.om.Persistent;
-import org.apache.torque.om.NumberKey;
-
-import org.apache.torque.util.Criteria;
-
/**
* An implementation of SecurityService that uses torque objects.
*
@@ -538,13 +533,13 @@
public GroupSet getGroups(Criteria criteria)
throws DataBackendException
{
- Criteria dbCriteria = new Criteria();
+ Criteria torqueCriteria = new Criteria();
Iterator keys = criteria.keySet().iterator();
while (keys.hasNext())
{
String key = (String) keys.next();
- dbCriteria.put(GroupPeerManager.getColumnName(key),
- criteria.get(key));
+ torqueCriteria.put(GroupPeerManager.getColumnName(key),
+ criteria.get(key));
}
List groups = new ArrayList(0);
try
@@ -569,13 +564,13 @@
public RoleSet getRoles(Criteria criteria)
throws DataBackendException
{
- Criteria dbCriteria = new Criteria();
+ Criteria torqueCriteria = new Criteria();
Iterator keys = criteria.keySet().iterator();
while (keys.hasNext())
{
String key = (String) keys.next();
- dbCriteria.put(RolePeerManager.getColumnName(key),
- criteria.get(key));
+ torqueCriteria.put(RolePeerManager.getColumnName(key),
+ criteria.get(key));
}
List roles = new ArrayList(0);
try
@@ -600,13 +595,13 @@
public PermissionSet getPermissions(Criteria criteria)
throws DataBackendException
{
- Criteria dbCriteria = new Criteria();
+ Criteria torqueCriteria = new Criteria();
Iterator keys = criteria.keySet().iterator();
while (keys.hasNext())
{
String key = (String) keys.next();
- dbCriteria.put(PermissionPeerManager.getColumnName(key),
- criteria.get(key));
+ torqueCriteria.put(PermissionPeerManager.getColumnName(key),
+ criteria.get(key));
}
List permissions = new ArrayList(0);
try
1.3 +7 -9 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueUser.java
Index: TorqueUser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueUser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorqueUser.java 9 Mar 2003 03:06:32 -0000 1.2
+++ TorqueUser.java 8 Apr 2003 09:50:35 -0000 1.3
@@ -64,14 +64,12 @@
import javax.servlet.http.HttpSessionBindingEvent;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.torque.om.Persistent;
import org.apache.turbine.om.security.User;
-
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.security.TurbineSecurityException;
-import org.apache.torque.om.Persistent;
-
/**
* This is the User class used by the TorqueSecurity Service. It decouples
* all the database peer access from the actual Peer object
@@ -153,15 +151,15 @@
* Stores the object in the database. If the object is new,
* it inserts it; otherwise an update is performed.
*
- * @param dbName The name under which the object should be stored.
+ * @param torqueName The name under which the object should be stored.
*
* @exception Exception This method might throw an exceptions
*/
- public void save(String dbName)
- throws Exception
+ public void save(String torqueName)
+ throws Exception
{
setObjectdata(ObjectUtils.serializeHashtable(getPermStorage()));
- super.save(dbName);
+ super.save(torqueName);
}
/**
1.3 +18 -21 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java
Index: TorqueUserManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TorqueUserManager.java 9 Mar 2003 03:06:32 -0000 1.2
+++ TorqueUserManager.java 8 Apr 2003 09:50:35 -0000 1.3
@@ -65,21 +65,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.turbine.services.InitializationException;
+import org.apache.torque.om.Persistent;
+import org.apache.torque.util.Criteria;
import org.apache.turbine.om.security.User;
-
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.turbine.services.security.UserManager;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.EntityExistsException;
import org.apache.turbine.util.security.PasswordMismatchException;
import org.apache.turbine.util.security.UnknownEntityException;
-import org.apache.torque.util.Criteria;
-import org.apache.torque.om.Persistent;
-
-import org.apache.turbine.services.security.UserManager;
-import org.apache.turbine.services.security.TurbineSecurity;
-
/**
* An UserManager performs {@link org.apache.turbine.om.security.User}
* objects related tasks on behalf of the
@@ -129,7 +126,7 @@
public boolean accountExists(User user)
throws DataBackendException
{
- return accountExists(user.getUserName());
+ return accountExists(user.getName());
}
/**
@@ -305,7 +302,7 @@
if (!accountExists(user))
{
throw new UnknownEntityException("The account '" +
- user.getUserName() + "' does not exist");
+ user.getName() + "' does not exist");
}
try
@@ -373,7 +370,7 @@
if (!accountExists(user))
{
throw new UnknownEntityException("The account '" +
- user.getUserName() + "' does not exist");
+ user.getName() + "' does not exist");
}
// log.debug("Supplied Pass: " + password);
@@ -413,13 +410,13 @@
if (!accountExists(user))
{
throw new UnknownEntityException("The account '" +
- user.getUserName() + "' does not exist");
+ user.getName() + "' does not exist");
}
if (!TurbineSecurity.checkPassword(oldPassword, user.getPassword()))
{
throw new PasswordMismatchException(
- "The supplied old password for '" + user.getUserName() +
+ "The supplied old password for '" + user.getName() +
"' was incorrect");
}
user.setPassword(TurbineSecurity.encryptPassword(newPassword));
@@ -450,7 +447,7 @@
if (!accountExists(user))
{
throw new UnknownEntityException("The account '" +
- user.getUserName() + "' does not exist");
+ user.getName() + "' does not exist");
}
user.setPassword(TurbineSecurity.encryptPassword(password));
// save the changes in the database immediately, to prevent the
@@ -471,7 +468,7 @@
public void createAccount(User user, String initialPassword)
throws EntityExistsException, DataBackendException
{
- if(StringUtils.isEmpty(user.getUserName()))
+ if(StringUtils.isEmpty(user.getName()))
{
throw new DataBackendException("Could not create "
+ "an user with empty name!");
@@ -480,7 +477,7 @@
if (accountExists(user))
{
throw new EntityExistsException("The account '" +
- user.getUserName() + "' already exists");
+ user.getName() + "' already exists");
}
user.setPassword(TurbineSecurity.encryptPassword(initialPassword));
@@ -497,7 +494,7 @@
catch (Exception e)
{
throw new DataBackendException("Failed to create account '" +
- user.getUserName() + "'", e);
+ user.getName() + "'", e);
}
}
@@ -515,10 +512,10 @@
if (!accountExists(user))
{
throw new UnknownEntityException("The account '" +
- user.getUserName() + "' does not exist");
+ user.getName() + "' does not exist");
}
Criteria criteria = new Criteria();
- criteria.add(UserPeerManager.getNameColumn(), user.getUserName());
+ criteria.add(UserPeerManager.getNameColumn(), user.getName());
try
{
UserPeerManager.doDelete(criteria);
@@ -526,7 +523,7 @@
catch (Exception e)
{
throw new DataBackendException("Failed to remove account '" +
- user.getUserName() + "'", e);
+ user.getName() + "'", e);
}
}
}
1.3 +6 -11 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java
Index: UserPeerManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserPeerManager.java 9 Mar 2003 03:06:32 -0000 1.2
+++ UserPeerManager.java 8 Apr 2003 09:50:35 -0000 1.3
@@ -65,20 +65,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.turbine.services.InitializationException;
-
-import org.apache.turbine.services.security.TurbineSecurity;
-
-import org.apache.turbine.om.security.User;
-
-import org.apache.turbine.util.security.DataBackendException;
-
import org.apache.torque.TorqueException;
-
import org.apache.torque.om.Persistent;
-
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Criteria;
+
+import org.apache.turbine.om.security.User;
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.turbine.util.security.DataBackendException;
/**
* This class capsulates all direct Peer access for the User entities.
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org