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 13:59:07 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/security BaseSecurityService.java SecurityService.java
henning 2003/04/08 04:59:07
Modified: src/java/org/apache/turbine/services/security
BaseSecurityService.java SecurityService.java
Log:
get the Usermanager object only trough the accessor. Add a setter for the
usermanager.
Revision Changes Path
1.25 +23 -12 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- BaseSecurityService.java 8 Apr 2003 11:51:31 -0000 1.24
+++ BaseSecurityService.java 8 Apr 2003 11:59:07 -0000 1.25
@@ -324,8 +324,9 @@
try
{
- userManager =
+ UserManager userManager =
(UserManager) Class.forName(userManagerClassName).newInstance();
+ setUserManager(userManager);
}
catch (Exception e)
{
@@ -676,6 +677,16 @@
}
/**
+ * Configure a new user Manager.
+ *
+ * @param userManager An UserManager object
+ */
+ public void setUserManager(UserManager userManager)
+ {
+ this.userManager = userManager;
+ }
+
+ /**
* Check whether a specified user's account exists.
*
* The login name is used for looking up the account.
@@ -688,7 +699,7 @@
public boolean accountExists(User user)
throws DataBackendException
{
- return userManager.accountExists(user);
+ return getUserManager().accountExists(user);
}
/**
@@ -704,7 +715,7 @@
public boolean accountExists(String userName)
throws DataBackendException
{
- return userManager.accountExists(userName);
+ return getUserManager().accountExists(userName);
}
/**
@@ -723,7 +734,7 @@
throws DataBackendException, UnknownEntityException,
PasswordMismatchException
{
- return userManager.retrieve(username, password);
+ return getUserManager().retrieve(username, password);
}
/**
@@ -738,7 +749,7 @@
public User getUser(String username)
throws DataBackendException, UnknownEntityException
{
- return userManager.retrieve(username);
+ return getUserManager().retrieve(username);
}
/**
@@ -778,7 +789,7 @@
public List getUserList(Criteria criteria)
throws DataBackendException
{
- return userManager.retrieveList(criteria);
+ return getUserManager().retrieveList(criteria);
}
/**
@@ -824,7 +835,7 @@
public void saveUser(User user)
throws UnknownEntityException, DataBackendException
{
- userManager.store(user);
+ getUserManager().store(user);
}
/**
@@ -858,7 +869,7 @@
public void addUser(User user, String password)
throws DataBackendException, EntityExistsException
{
- userManager.createAccount(user, password);
+ getUserManager().createAccount(user, password);
}
/**
@@ -875,7 +886,7 @@
// revoke all roles form the user
revokeAll(user);
- userManager.removeAccount(user);
+ getUserManager().removeAccount(user);
}
/**
@@ -894,7 +905,7 @@
throws PasswordMismatchException, UnknownEntityException,
DataBackendException
{
- userManager.changePassword(user, oldPassword, newPassword);
+ getUserManager().changePassword(user, oldPassword, newPassword);
}
/**
@@ -914,7 +925,7 @@
public void forcePassword(User user, String password)
throws UnknownEntityException, DataBackendException
{
- userManager.forcePassword(user, password);
+ getUserManager().forcePassword(user, password);
}
/**
1.18 +8 -1 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SecurityService.java 8 Apr 2003 11:51:31 -0000 1.17
+++ SecurityService.java 8 Apr 2003 11:59:07 -0000 1.18
@@ -386,6 +386,13 @@
UserManager getUserManager();
/**
+ * Configure a new user Manager.
+ *
+ * @param userManager An UserManager object
+ */
+ void setUserManager(UserManager userManager);
+
+ /**
* Check whether a specified user's account exists.
*
* The login name is used for looking up the account.
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org