/*
 * $Id$
 */

/*

Copyright (c) 2000-2003 Board of Trustees of Leland Stanford Jr. University,
all rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
STANFORD UNIVERSITY BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Except as contained in this notice, the name of Stanford University shall not
be used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from Stanford University.

*/

package org.lockss.uiapi.util;

import java.io.*;
import java.util.*;

import sun.misc.BASE64Encoder;
import sun.misc.BASE64Decoder;
/**
 * Base 64 encoding/decoding
 */
public class Base64Utils
{
  private Base64Utils() {
  }
   
  /**
   * Decode Base 64 text
   *
   * @param 
   *     data for decoding
   * @return
   *     Decoded bytes
   */
  public static byte decodeToBytes(String data)[] throws IOException {
      return new BASE64Decoder().decodeBuffer(data);
  }
   
  /**
   * Decode Base 64 text
   *
   * @param   
   *    data for decoding
   * @return  
   *    Decoded string
   */
  public static String decodeToString(String data) throws IOException {
    return new String(decodeToBytes(data));
  }
   
  /**
   * Encode provided data
   *
   * @param   
   *    data for encoding
   * @return  
   *    Base 64 encoded string
   */
  public static String encode(byte data[]) {
    return filter(new BASE64Encoder().encodeBuffer(data));
  }
   
  /**
   * Encode provided data
   *
   * @param   
   *    data for encoding
   * @return  
   *    Base 64 encoded string
   */
  public static String encode(String data) {
    return encode(data.getBytes());
  }

  /*
   * Remove carriage return/linefeed  
   */
  private static String filter(String encoded) {
    
   StringBuffer filtered = new StringBuffer(encoded.length());

   for (int i = 0; i < encoded.length(); i++) {

     char ch = encoded.charAt(i);

       if ((ch == '\r') || (ch =='\n')) {
            continue;
       }
       filtered.append(encoded.substring(i, i + 1));
    }
    return filtered.toString();
  }
}

@@ -1442,105 +1442,80 @@
 ort 
-java.io.*;%0D%0Aimport java.util.*;%0D%0A%0D%0Aimport sun.misc.BASE64Encoder;%0D%0Aimport sun.misc.BASE64Decoder;
+org.apache.commons.codec.binary.Base64;%0D%0A%0D%0Aimport java.io.IOException;%0D%0A
 %0D%0A/*
@@ -1764,16 +1764,18 @@
 tic byte
+%5B%5D
  decodeT
@@ -1793,18 +1793,16 @@
 ng data)
-%5B%5D
  throws 
@@ -1833,35 +1833,22 @@
 urn 
-new BASE64Decoder()
+Base64
 .decodeB
 uffe
@@ -1839,29 +1839,29 @@
 se64.decodeB
-uffer
+ase64
 (data);%0D%0A  %7D
@@ -2148,32 +2148,71 @@
 de provided data
+ unchunked (ie without 76 char barrier)
 %0D%0A   *%0D%0A   * @pa
@@ -2343,28 +2343,32 @@
  data%5B%5D) %7B%0D%0A
+%0D%0A
     
+//
 return filte
@@ -2373,47 +2373,87 @@
 ter(
-new BASE64Encoder().encodeBuffer
+Base64.encodeBase64String(data));%0D%0A%0D%0A    return Base64.encodeBase64String
 (data)
-)
 ;%0D%0A 
@@ -2641,24 +2641,26 @@
 ng data) %7B%0D%0A
+%0D%0A
     return e

Replace sun.misc.Base64Encoder with commons-codec encoder