Return-Path: Delivered-To: apmail-roller-commits-archive@www.apache.org Received: (qmail 8291 invoked from network); 6 Sep 2007 13:01:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Sep 2007 13:01:00 -0000 Received: (qmail 88397 invoked by uid 500); 6 Sep 2007 13:00:54 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 88361 invoked by uid 500); 6 Sep 2007 13:00:54 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 88352 invoked by uid 99); 6 Sep 2007 13:00:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Sep 2007 06:00:54 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Sep 2007 13:02:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7AAFA1A9832; Thu, 6 Sep 2007 06:00:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r573249 - /roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/HandlerBaseTest.java Date: Thu, 06 Sep 2007 13:00:37 -0000 To: commits@roller.apache.org From: snoopdave@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070906130037.7AAFA1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: snoopdave Date: Thu Sep 6 06:00:36 2007 New Revision: 573249 URL: http://svn.apache.org/viewvc?rev=573249&view=rev Log: Use Base64 from commons codec rather than the one from HTTPClient Modified: roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/HandlerBaseTest.java Modified: roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/HandlerBaseTest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/HandlerBaseTest.java?rev=573249&r1=573248&r2=573249&view=diff ============================================================================== --- roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/HandlerBaseTest.java (original) +++ roller/branches/roller_4.1_dev/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/HandlerBaseTest.java Thu Sep 6 06:00:36 2007 @@ -19,6 +19,7 @@ import java.io.IOException; import java.io.InputStream; +import org.apache.commons.codec.binary.Base64; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.methods.DeleteMethod; @@ -26,7 +27,6 @@ import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.methods.PutMethod; -import org.apache.commons.httpclient.util.Base64; import org.apache.roller.weblogger.webservices.adminprotocol.sdk.MemberEntry; import org.apache.roller.weblogger.webservices.adminprotocol.sdk.MemberEntrySet; import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException; @@ -391,7 +391,8 @@ private static void addAuthHeader(HttpMethod method, String user, String password) { String credentials = user + ":" + password; - method.setRequestHeader("Authorization", "Basic " + new String(Base64.encode(credentials.getBytes()))); + Base64 base64 = new Base64(); + method.setRequestHeader("Authorization", "Basic " + new String(base64.encode(credentials.getBytes()))); } }