You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by se...@apache.org on 2004/12/23 01:50:02 UTC

cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/crypto/provider JavaCrypt.java

seade       2004/12/22 16:50:02

  Modified:    .        Tag: TURBINE_2_3_BRANCH project.xml
               xdocs    Tag: TURBINE_2_3_BRANCH changes.xml
               src/java/org/apache/turbine/services/uniqueid Tag:
                        TURBINE_2_3_BRANCH TurbineUniqueIdService.java
               src/java/org/apache/turbine/services/crypto/provider Tag:
                        TURBINE_2_3_BRANCH JavaCrypt.java
  Log:
  commons-codec was upgraded to 1.3.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.136.2.19 +1 -1      jakarta-turbine-2/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/project.xml,v
  retrieving revision 1.136.2.18
  retrieving revision 1.136.2.19
  diff -u -r1.136.2.18 -r1.136.2.19
  --- project.xml	8 Nov 2004 14:17:13 -0000	1.136.2.18
  +++ project.xml	23 Dec 2004 00:50:02 -0000	1.136.2.19
  @@ -374,7 +374,7 @@
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
  -      <version>1.1</version>
  +      <version>1.3</version>
         <url>http://jakarta.apache.org/commons/codec/</url>
         <type>jar</type>
       </dependency>
  
  
  
  No                   revision
  No                   revision
  1.60.2.25 +3 -0      jakarta-turbine-2/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/xdocs/changes.xml,v
  retrieving revision 1.60.2.24
  retrieving revision 1.60.2.25
  diff -u -r1.60.2.24 -r1.60.2.25
  --- changes.xml	25 Nov 2004 05:32:42 -0000	1.60.2.24
  +++ changes.xml	23 Dec 2004 00:50:02 -0000	1.60.2.25
  @@ -34,6 +34,9 @@
       <action type="update" dev="seade">
         Update DateFormatter to use DateFormatUtils from commons lang.
       </action>
  +    <action type="update" dev="seade">
  +      commons-codec was upgraded to 1.3.
  +    </action>
     </release>
   
     <release version="2.3.1" date="2004-10-29">
  
  
  
  No                   revision
  No                   revision
  1.9.2.3   +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.9.2.2
  retrieving revision 1.9.2.3
  diff -u -r1.9.2.2 -r1.9.2.3
  --- TurbineUniqueIdService.java	20 May 2004 03:06:48 -0000	1.9.2.2
  +++ TurbineUniqueIdService.java	23 Dec 2004 00:50:02 -0000	1.9.2.3
  @@ -18,7 +18,7 @@
   
   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;
  @@ -78,7 +78,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);
  
  
  
  No                   revision
  No                   revision
  1.5.2.3   +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.5.2.2
  retrieving revision 1.5.2.3
  diff -u -r1.5.2.2 -r1.5.2.3
  --- JavaCrypt.java	20 May 2004 03:05:19 -0000	1.5.2.2
  +++ JavaCrypt.java	23 Dec 2004 00:50:02 -0000	1.5.2.3
  @@ -18,7 +18,7 @@
   
   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;
   
  @@ -100,7 +100,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));
       }
       
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org