epugh 2003/10/24 06:33:04
Modified: src/java/org/apache/turbine/services/security
BaseSecurityService.java TurbineSecurity.java
SecurityService.java
src/java/org/apache/turbine/om/security TurbineUser.java
User.java
src/java/org/apache/turbine/services/security/ldap
LDAPUser.java
Log:
Remove deprecated methods.
Revision Changes Path
1.33 +1 -22
jakarta-turbine-2/src/java/org/apache/turbine/services/security/BaseSecurityService.java
Index: BaseSecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/BaseSecurityService.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- BaseSecurityService.java 24 Oct 2003 13:20:11 -0000 1.32
+++ BaseSecurityService.java 24 Oct 2003 13:33:03 -0000 1.33
@@ -765,27 +765,6 @@
* @return a List of users meeting the criteria.
* @throws DataBackendException if there is a problem accessing the
* storage.
- * @deprecated Use <a href="#getUserList">getUserList</a> instead.
- */
- public User[] getUsers(Criteria criteria)
- throws DataBackendException
- {
- return (User []) getUserList(criteria).toArray(new User[0]);
- }
-
- /**
- * Retrieve a set of users that meet the specified criteria.
- *
- * As the keys for the criteria, you should use the constants that
- * are defined in [EMAIL PROTECTED] User} interface, plus the names
- * of the custom attributes you added to your user representation
- * in the data storage. Use verbatim names of the attributes -
- * without table name prefix in case of DB implementation.
- *
- * @param criteria The criteria of selection.
- * @return a List of users meeting the criteria.
- * @throws DataBackendException if there is a problem accessing the
- * storage.
*/
public List getUserList(Criteria criteria)
throws DataBackendException
1.20 +1 -41
jakarta-turbine-2/src/java/org/apache/turbine/services/security/TurbineSecurity.java
Index: TurbineSecurity.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/TurbineSecurity.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TurbineSecurity.java 11 Apr 2003 12:05:09 -0000 1.19
+++ TurbineSecurity.java 24 Oct 2003 13:33:03 -0000 1.20
@@ -318,46 +318,6 @@
}
/**
- * Retrieve a set of users that meet the specified criteria.
- *
- * As the keys for the criteria, you should use the constants that
- * are defined in [EMAIL PROTECTED] User} interface, plus the names
- * of the custom attributes you added to your user representation
- * in the data storage. Use verbatim names of the attributes -
- * without table name prefix in case of DB implementation.
- *
- * @param criteria The criteria of selection.
- * @return a List of users meeting the criteria.
- * @throws DataBackendException if there is a problem accessing the
- * storage.
- */
- public static User[] getUsers(Criteria criteria)
- throws DataBackendException
- {
- return getService().getUsers(criteria);
- }
-
- /**
- * Retrieve a set of users that meet the specified criteria.
- *
- * As the keys for the criteria, you should use the constants that
- * are defined in [EMAIL PROTECTED] User} interface, plus the names
- * of the custom attributes you added to your user representation
- * in the data storage. Use verbatim names of the attributes -
- * without table name prefix in case of DB implementation.
- *
- * @param criteria The criteria of selection.
- * @return a List of users meeting the criteria.
- * @throws DataBackendException if there is a problem accessing the
- * storage.
- */
- public static List getUserList(Criteria criteria)
- throws DataBackendException
- {
- return getService().getUserList(criteria);
- }
-
- /**
* Constructs an User object to represent an anonymous user of the
* application.
*
1.22 +1 -19
jakarta-turbine-2/src/java/org/apache/turbine/services/security/SecurityService.java
Index: SecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/SecurityService.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SecurityService.java 11 Apr 2003 12:05:09 -0000 1.21
+++ SecurityService.java 24 Oct 2003 13:33:03 -0000 1.22
@@ -453,24 +453,6 @@
* are defined in [EMAIL PROTECTED] User} interface, plus the names
* of the custom attributes you added to your user representation
* in the data storage. Use verbatim names of the attributes -
- * without table name prefix in case of DB implementation.
- *
- * @param criteria The criteria of selection.
- * @return a List of users meeting the criteria.
- * @throws DataBackendException if there is a problem accessing the
- * storage.
- * @deprecated Use <a href="#retrieveList">retrieveList</a> instead.
- */
- User[] getUsers(Criteria criteria)
- throws DataBackendException;
-
- /**
- * Retrieve a set of users that meet the specified criteria.
- *
- * As the keys for the criteria, you should use the constants that
- * are defined in [EMAIL PROTECTED] User} interface, plus the names
- * of the custom attributes you added to your user representation
- * in the data storage. Use verbatim names of the attributes -
* without table name prefix in case of Torque implementation.
*
* @param criteria The criteria of selection.
1.17 +1 -21
jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineUser.java
Index: TurbineUser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineUser.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TurbineUser.java 27 Jun 2003 22:09:38 -0000 1.16
+++ TurbineUser.java 24 Oct 2003 13:33:03 -0000 1.17
@@ -286,16 +286,6 @@
return val;
}
- /**
- * Returns the username for this user.
- *
- * @return A String with the username.
- * @deprecated use [EMAIL PROTECTED] #getName} instead.
- */
- public String getUserName()
- {
- return getName();
- }
/**
* Returns the first name for this user.
@@ -536,16 +526,6 @@
getTempStorage().put(name, (value == null) ? "" : value);
}
- /**
- * Sets the username for this user.
- *
- * @param username The user's username.
- * @deprecated use [EMAIL PROTECTED] #setName} instead
- */
- public void setUserName(String username)
- {
- setName(username);
- }
/**
* Sets the first name for this user.
1.8 +1 -19
jakarta-turbine-2/src/java/org/apache/turbine/om/security/User.java
Index: User.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/User.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- User.java 10 Apr 2003 16:22:26 -0000 1.7
+++ User.java 24 Oct 2003 13:33:03 -0000 1.8
@@ -214,15 +214,6 @@
Object getTemp(String name, Object def);
/**
- * Returns the username for this user.
- *
- * @return A String with the username.
- *
- * @deprecated This is the same as getName(), so use this.
- */
- String getUserName();
-
- /**
* Returns the first name for this user.
*
* @return A String with the user's first name.
@@ -347,15 +338,6 @@
* @param value The object.
*/
void setTemp(String name, Object value);
-
- /**
- * Sets the username for this user.
- *
- * @param username The user's username.
- *
- * @deprecated This is the same as setName(), so use this.
- */
- void setUserName(String username);
/**
* Sets the first name for this user.
1.13 +4 -22
jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java
Index: LDAPUser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LDAPUser.java 10 Apr 2003 16:41:37 -0000 1.12
+++ LDAPUser.java 24 Oct 2003 13:33:04 -0000 1.13
@@ -155,7 +155,7 @@
attr = attribs.get(attrName);
if (attr != null && attr.get() != null)
{
- setUserName(attr.get().toString());
+ setName(attr.get().toString());
}
}
else
@@ -542,17 +542,6 @@
return this.timeout;
}
- /**
- * Returns the username for this user. If this is defined, then
- * the user is considered logged in.
- *
- * @return A String with the username.
- * @deprecated Use getName() instead
- */
- public String getUserName()
- {
- return getName();
- }
/**
* Returns the first name for this user. If this is defined, then
@@ -844,15 +833,7 @@
this.timeout = time;
}
- /**
- * Sets the username for this user.
- *
- * @param username The user's username.
- */
- public void setUserName(String username)
- {
- setPerm(User.USERNAME, username);
- }
+
/**
* Updates the last login date in the database.
@@ -927,11 +908,12 @@
}
/**
- * Not implemented.
+ * Set the users name.
* @param name the name of the User.
*/
public void setName(String name)
{
+ setPerm(User.USERNAME, name);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
