CSPACE-3346: Removed refs to sun.misc.BASE64Decoder in ServletTools class and replace...

diff --git a/services/common/pom.xml b/services/common/pom.xml
index 111cb2d4bead68a7721ecb77189dfbfe23cf4aa2..48325b21ce0bb8260d87103a28b1bac177801c2f 100644 (file)
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -78,6 +78,11 @@
             <artifactId>commons-jexl</artifactId>\r
             <version>2.0.1</version>\r
         </dependency>\r
+        <dependency>\r
+                       <groupId>commons-codec</groupId>\r
+                       <artifactId>commons-codec</artifactId>\r
+                       <version>1.4</version>\r
+        </dependency>\r
 \r
         <!-- javax -->\r
         <dependency>\r

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 87a909c3bea07f00eb59465549a05d31adb3d6f9..2d126652a0a240b69cbdbc647e128dd5290b7c34 100644 (file)
--- 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 {
                 }\r
                 authString = authString.substring(6).trim();\r
                 byte mydata[];\r
-                sun.misc.BASE64Decoder base64 = new sun.misc.BASE64Decoder();\r
-                mydata = base64.decodeBuffer(authString);\r
+//                sun.misc.BASE64Decoder base64 = new sun.misc.BASE64Decoder();\r
+                org.apache.commons.codec.binary.Base64 base64 = new org.apache.commons.codec.binary.Base64();\r
+//                mydata = base64.decodeBuffer(authString);\r
+                mydata = base64.decode(authString);\r
                 String loginInfo = new String(mydata);\r
                 int index = loginInfo.indexOf(":");\r
                 if( index != -1 ){\r