You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2003/10/24 15:20:11 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/security BaseSecurityService.java
epugh 2003/10/24 06:20:11
Modified: src/java/org/apache/turbine/services/security
BaseSecurityService.java
Log:
Switch to using Fulcrum Crypto service.
Revision Changes Path
1.32 +13 -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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- BaseSecurityService.java 29 Aug 2003 20:33:29 -0000 1.31
+++ BaseSecurityService.java 24 Oct 2003 13:20:11 -0000 1.32
@@ -59,6 +59,7 @@
import javax.servlet.ServletConfig;
+import org.apache.avalon.framework.component.ComponentException;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.lang.StringUtils;
@@ -75,9 +76,9 @@
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.crypto.CryptoAlgorithm;
-import org.apache.turbine.services.crypto.CryptoService;
-import org.apache.turbine.services.crypto.TurbineCrypto;
+import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
+import org.apache.fulcrum.crypto.CryptoAlgorithm;
+import org.apache.fulcrum.crypto.CryptoService;
import org.apache.turbine.services.factory.FactoryService;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.security.DataBackendException;
@@ -194,7 +195,14 @@
SecurityService.SECURE_PASSWORDS_ALGORITHM_KEY,
SecurityService.SECURE_PASSWORDS_ALGORITHM_DEFAULT);
- CryptoService cs = TurbineCrypto.getService();
+ AvalonComponentService acs = (AvalonComponentService)TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
+ CryptoService cs = null;
+ try {
+ cs = (CryptoService)acs.lookup(CryptoService.ROLE);
+ }
+ catch (ComponentException ce){
+ throw new RuntimeException("Could not access Crypto Service",ce);
+ }
if (cs != null && (secure.equals("true") || secure.equals("yes")))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org