epugh 2003/11/18 03:54:02
Modified: src/java/org/apache/turbine/services/security
BaseSecurityService.java
. project.xml
Log:
Switch to merlinized crypto service.
Revision Changes Path
1.34 +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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- BaseSecurityService.java 24 Oct 2003 13:33:03 -0000 1.33
+++ BaseSecurityService.java 18 Nov 2003 11:54:01 -0000 1.34
@@ -77,6 +77,7 @@
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
+import org.apache.turbine.services.avaloncomponent.MerlinComponentService;
import org.apache.fulcrum.crypto.CryptoAlgorithm;
import org.apache.fulcrum.crypto.CryptoService;
import org.apache.turbine.services.factory.FactoryService;
@@ -195,13 +196,13 @@
SecurityService.SECURE_PASSWORDS_ALGORITHM_KEY,
SecurityService.SECURE_PASSWORDS_ALGORITHM_DEFAULT);
- AvalonComponentService acs =
(AvalonComponentService)TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
+ MerlinComponentService merlin =
(MerlinComponentService)TurbineServices.getInstance().getService(MerlinComponentService.SERVICE_NAME);
CryptoService cs = null;
try {
- cs = (CryptoService)acs.lookup(CryptoService.ROLE);
+ cs = (CryptoService)merlin.lookup("/fulcrum/crypto");
}
- catch (ComponentException ce){
- throw new RuntimeException("Could not access Crypto Service",ce);
+ catch (Exception e){
+ throw new RuntimeException("Could not access Crypto Service",e);
}
if (cs != null && (secure.equals("true") || secure.equals("yes")))
1.149 +11 -2 jakarta-turbine-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.xml,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- project.xml 15 Nov 2003 19:42:47 -0000 1.148
+++ project.xml 18 Nov 2003 11:54:01 -0000 1.149
@@ -542,13 +542,22 @@
</dependency>
<dependency>
<groupId>fulcrum</groupId>
- <artifactId>fulcrum-crypto</artifactId>
- <version>1.0-alpha-3</version>
+ <artifactId>fulcrum-crypto-api</artifactId>
+ <version>1.0-alpha-4</version>
<url>http://jakarta.apache.org/turbine/fulcrum/fulcrum-crypto</url>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-crypto-impl</artifactId>
+ <version>1.0-alpha-4</version>
+ <url>http://jakarta.apache.org/turbine/fulcrum/fulcrum-crypto</url>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-localization-api</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
