From 52eede59108155ea5f189d497d7226d9996e563e Mon Sep 17 00:00:00 2001
From: maxcooper <maxcooper>
Date: Mon, 26 May 2003 11:14:51 +0000
Subject: [PATCH] now using Base64 class from commons-codec instead of catalina

---
 build-webapps.xml                                       |  9 ++++-----
 build.xml                                               | 16 ++++------------
 properties.xml                                          |  7 ++++---
 src/share/org/securityfilter/filter/SecurityFilter.java | 12 ++++++------
 4 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/build-webapps.xml b/build-webapps.xml
index 8aba8f9..d3cc33b 100644
--- a/build-webapps.xml
+++ b/build-webapps.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 
 <!--
-$Id: build-webapps.xml,v 1.4 2003/05/05 11:38:27 maxcooper Exp $
-$Revision: 1.4 $
-$Date: 2003/05/05 11:38:27 $
+$Id: build-webapps.xml,v 1.5 2003/05/26 11:14:51 maxcooper Exp $
+$Revision: 1.5 $
+$Date: 2003/05/26 11:14:51 $
 -->
 
 <!DOCTYPE project [
@@ -29,6 +29,7 @@ $Date: 2003/05/05 11:38:27 $
    <patternset id="common.lib.files">
       <include name="${project.name}.jar"/>
       <include name="commons-beanutils.jar"/>
+      <include name="commons-codec.jar"/>
       <include name="commons-collections.jar"/>
       <include name="commons-digester.jar"/>
       <include name="commons-logging.jar"/>
@@ -39,7 +40,6 @@ $Date: 2003/05/05 11:38:27 $
 
    <fileset id="blank.lib.files" dir="${build.lib.dir}">
       <patternset refid="common.lib.files"/>
-      <include name="catalina-base64.jar"/>
    </fileset>
 
    <path id="blank.static.path" location="${web.dir}/blank"/>
@@ -50,7 +50,6 @@ $Date: 2003/05/05 11:38:27 $
 
    <fileset id="example.lib.files" dir="${build.lib.dir}">
       <patternset refid="common.lib.files"/>
-      <include name="catalina-base64.jar"/>
    </fileset>
 
    <path id="example.static.path">
diff --git a/build.xml b/build.xml
index c656675..846d953 100644
--- a/build.xml
+++ b/build.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 
 <!--
-$Id: build.xml,v 1.18 2003/05/06 13:54:04 maxcooper Exp $
-$Revision: 1.18 $
-$Date: 2003/05/06 13:54:04 $
+$Id: build.xml,v 1.19 2003/05/26 11:14:51 maxcooper Exp $
+$Revision: 1.19 $
+$Date: 2003/05/26 11:14:51 $
 -->
 
 <!DOCTYPE project [
@@ -73,6 +73,7 @@ $Date: 2003/05/06 13:54:04 $
 
       <!-- copy core external libraries into build.lib.dir -->
       <copy file="${commons-beanutils.jar}" tofile="${build.lib.dir}/commons-beanutils.jar"/>
+      <copy file="${commons-codec.jar}" tofile="${build.lib.dir}/commons-codec.jar"/>
       <copy file="${commons-collections.jar}" tofile="${build.lib.dir}/commons-collections.jar"/>
       <copy file="${commons-digester.jar}" tofile="${build.lib.dir}/commons-digester.jar"/>
       <copy file="${commons-logging.jar}" tofile="${build.lib.dir}/commons-logging.jar"/>
@@ -80,15 +81,6 @@ $Date: 2003/05/06 13:54:04 $
 
       <!-- catalina.jar file is needed for realm classes -->
       <copy file="${catalina.jar}" tofile="${build.lib.dir}/catalina.jar"/>
-
-      <!-- extract Base64 class from the catalina.jar file -->
-      <jar destfile="${build.lib.dir}/catalina-base64.jar">
-         <zipfileset src="${catalina.jar}">
-            <patternset>
-               <include name="org/apache/catalina/util/Base64.class"/>
-            </patternset>
-         </zipfileset>
-      </jar>
    </target>
 
    <target name="build-webapps" depends="build-library">
diff --git a/properties.xml b/properties.xml
index f763bb7..6eca785 100644
--- a/properties.xml
+++ b/properties.xml
@@ -1,7 +1,7 @@
 <!--
-$Id: properties.xml,v 1.5 2003/05/26 10:54:22 maxcooper Exp $
-$Revision: 1.5 $
-$Date: 2003/05/26 10:54:22 $
+$Id: properties.xml,v 1.6 2003/05/26 11:14:51 maxcooper Exp $
+$Revision: 1.6 $
+$Date: 2003/05/26 11:14:51 $
 -->
 
 <!--
@@ -101,6 +101,7 @@ $Date: 2003/05/26 10:54:22 $
 <path id="compile.classpath">
    <pathelement location="${catalina.jar}"/>
    <pathelement location="${commons-beanutils.jar}"/>
+   <pathelement location="${commons-codec.jar}"/>
    <pathelement location="${commons-collections.jar}"/>
    <pathelement location="${commons-digester.jar}"/>
    <pathelement location="${commons-logging.jar}"/>
diff --git a/src/share/org/securityfilter/filter/SecurityFilter.java b/src/share/org/securityfilter/filter/SecurityFilter.java
index 3e1f665..cf56d31 100644
--- a/src/share/org/securityfilter/filter/SecurityFilter.java
+++ b/src/share/org/securityfilter/filter/SecurityFilter.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/filter/SecurityFilter.java,v 1.17 2003/03/30 10:33:02 maxcooper Exp $
- * $Revision: 1.17 $
- * $Date: 2003/03/30 10:33:02 $
+ * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/filter/SecurityFilter.java,v 1.18 2003/05/26 11:14:52 maxcooper Exp $
+ * $Revision: 1.18 $
+ * $Date: 2003/05/26 11:14:52 $
  *
  * ====================================================================
  * The SecurityFilter Software License, Version 1.1
@@ -55,12 +55,12 @@
 
 package org.securityfilter.filter;
 
+import org.apache.commons.codec.binary.Base64;
 import org.securityfilter.config.AuthConstraint;
 import org.securityfilter.config.SecurityConfig;
 import org.securityfilter.config.SecurityConstraint;
 import org.securityfilter.config.WebResourceCollection;
 import org.securityfilter.realm.SecurityRealmInterface;
-import org.apache.catalina.util.Base64;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
@@ -77,7 +77,7 @@ import java.util.*;
  * @author Max Cooper (max@maxcooper.com)
  * @author Daya Sharma (iamdaya@yahoo.com, billydaya@sbcglobal.net)
  * @author Torgeir Veimo (torgeir@pobox.com)
- * @version $Revision: 1.17 $ $Date: 2003/03/30 10:33:02 $
+ * @version $Revision: 1.18 $ $Date: 2003/05/26 11:14:52 $
  */
 public class SecurityFilter implements Filter {
    public static final String SAVED_REQUEST_URL = SecurityFilter.class.getName() + ".SAVED_REQUEST_URL";
@@ -554,7 +554,7 @@ public class SecurityFilter implements Filter {
       } else {
          authorization = authorization.substring(6).trim();
          // Decode and parse the authorization credentials
-         return new String(base64Helper.decode(authorization.getBytes()));
+         return new String(base64Helper.decodeBase64(authorization.getBytes()));
       }
    }
 
-- 
2.11.0