From 59994a039eb40954332617f6976b874f30a3531f Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Tue, 21 Dec 2010 22:30:10 +0000
Subject: [PATCH] CSPACE-3346: Removed refs to sun.misc.BASE64Decoder in
 ServletTools class and replaced with http://commons.apache.org/codec/.  Found
 this when cleaning up my Eclipse settings files -stricter compliance settings
 triggered a build error on this usage.

---
 services/common/pom.xml                                     | 5 +++++
 .../org/collectionspace/services/common/ServletTools.java   | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/services/common/pom.xml b/services/common/pom.xml
index 111cb2d4b..48325b21c 100644
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -78,6 +78,11 @@
             <artifactId>commons-jexl</artifactId>
             <version>2.0.1</version>
         </dependency>
+        <dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.4</version>
+        </dependency>
 
         <!-- javax -->
         <dependency>
diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServletTools.java b/services/common/src/main/java/org/collectionspace/services/common/ServletTools.java
index 87a909c3b..2d126652a 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/ServletTools.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ServletTools.java
@@ -250,8 +250,10 @@ public class ServletTools {
                 }
                 authString = authString.substring(6).trim();
                 byte mydata[];
-                sun.misc.BASE64Decoder base64 = new sun.misc.BASE64Decoder();
-                mydata = base64.decodeBuffer(authString);
+//                sun.misc.BASE64Decoder base64 = new sun.misc.BASE64Decoder();
+                org.apache.commons.codec.binary.Base64 base64 = new org.apache.commons.codec.binary.Base64();
+//                mydata = base64.decodeBuffer(authString);
+                mydata = base64.decode(authString);
                 String loginInfo = new String(mydata);
                 int index = loginInfo.indexOf(":");
                 if( index != -1 ){
-- 
2.47.3