epugh 2004/12/03 02:51:39
Modified: src/java/org/apache/turbine/services/crypto/provider
JavaCrypt.java
src/java/org/apache/turbine/services/uniqueid
TurbineUniqueIdService.java
Log:
Fix compile errors with commons-code-1.3
Revision Changes Path
1.7 +3 -3
jakarta-turbine-2/src/java/org/apache/turbine/services/crypto/provider/JavaCrypt.java
Index: JavaCrypt.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/crypto/provider/JavaCrypt.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JavaCrypt.java 24 Oct 2003 12:45:58 -0000 1.6
+++ JavaCrypt.java 3 Dec 2004 10:51:39 -0000 1.7
@@ -56,8 +56,8 @@
import java.security.MessageDigest;
-import org.apache.commons.codec.base64.Base64;
+import org.apache.commons.codec.binary.Base64;
import org.apache.turbine.services.crypto.CryptoAlgorithm;
/**
@@ -149,7 +149,7 @@
byte[] digest = md.digest(value.getBytes("UTF-8"));
// Base64-encode the digest.
- byte[] encodedDigest = Base64.encode(digest);
+ byte[] encodedDigest = Base64.encodeBase64(digest);
return (encodedDigest == null ? null : new String(encodedDigest));
}
}
1.11 +3 -3
jakarta-turbine-2/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java
Index: TurbineUniqueIdService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TurbineUniqueIdService.java 2 Aug 2004 08:57:35 -0000 1.10
+++ TurbineUniqueIdService.java 3 Dec 2004 10:51:39 -0000 1.11
@@ -56,8 +56,8 @@
import java.security.MessageDigest;
-import org.apache.commons.codec.base64.Base64;
+import org.apache.commons.codec.binary.Base64;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -107,7 +107,7 @@
MessageDigest md = MessageDigest.getInstance("MD5");
byte [] bytesId = md.digest(url.getBytes("UTF-8"));
- turbineId = new String(Base64.encode(bytesId));
+ turbineId = new String(Base64.encodeBase64(bytesId));
log.info("This is Turbine instance running at: " + url);
log.info("The instance id is #" + turbineId);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
