henning 2003/01/12 05:52:27
Modified: src/java/org/apache/turbine/services/security
BaseSecurityService.java
src/java/org/apache/turbine/services/security/db
DBSecurityService.java
Log:
Convert the Security Service to use getConfiguration().getString() to
access its properties. This will definitely be necessary for the LDAP
Service, too but the current usage of getProperty() is obfuscated at
best...
Revision Changes Path
1.11 +6 -5
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BaseSecurityService.java 12 Jan 2003 12:33:11 -0000 1.10
+++ BaseSecurityService.java 12 Jan 2003 13:52:27 -0000 1.11
@@ -59,6 +59,7 @@
import java.security.MessageDigest;
import javax.mail.internet.MimeUtility;
import javax.servlet.ServletConfig;
+import org.apache.commons.configuration.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.torque.util.Criteria;
@@ -146,10 +147,10 @@
{
return null;
}
- String secure = getProperties().getProperty(
+ String secure = getConfiguration().getString(
SecurityService.SECURE_PASSWORDS_KEY,
SecurityService.SECURE_PASSWORDS_DEFAULT).toLowerCase();
- String algorithm = getProperties().getProperty(
+ String algorithm = getConfiguration().getString(
SecurityService.SECURE_PASSWORDS_ALGORITHM_KEY,
SecurityService.SECURE_PASSWORDS_ALGORITHM_DEFAULT);
if (secure.equals("true") || secure.equals("yes"))
@@ -190,11 +191,11 @@
public void init()
throws InitializationException
{
- String userManagerClassName = getProperties().getProperty(
+ String userManagerClassName = getConfiguration().getString(
SecurityService.USER_MANAGER_KEY,
SecurityService.USER_MANAGER_DEFAULT);
- String userClassName = getProperties().getProperty(
+ String userClassName = getConfiguration().getString(
SecurityService.USER_CLASS_KEY,
SecurityService.USER_CLASS_DEFAULT);
1.11 +3 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/security/db/DBSecurityService.java
Index: DBSecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/db/DBSecurityService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DBSecurityService.java 12 Jan 2003 12:33:12 -0000 1.10
+++ DBSecurityService.java 12 Jan 2003 13:52:27 -0000 1.11
@@ -78,6 +78,7 @@
import org.apache.turbine.om.security.peer.UserPeer;
import org.apache.turbine.services.security.BaseSecurityService;
import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.commons.configuration.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.turbine.util.security.AccessControlList;
@@ -1160,7 +1161,7 @@
*/
public Class getUserPeerClass() throws UnknownEntityException
{
- String userPeerClassName = getProperties().getProperty(
+ String userPeerClassName = getConfiguration().getString(
USER_PEER_CLASS_KEY, USER_PEER_CLASS_DEFAULT);
try
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
