Load cups into easysw/current.

[thirdparty/cups.git] / scripting / java / src / com / easysw / cups / IPPHttp.java

diff --git a/scripting/java/src/com/easysw/cups/IPPHttp.java b/scripting/java/src/com/easysw/cups/IPPHttp.java
index f53bdff7bf406e613ee36a832db915c96c0bf6ab..2ec20085436c56bd07aed4d9ffc004ecbe203ec9 100644 (file)
--- a/scripting/java/src/com/easysw/cups/IPPHttp.java
+++ b/scripting/java/src/com/easysw/cups/IPPHttp.java
@@ -1,29 +1,20 @@
 package com.easysw.cups;
 
 /**
- * @version 1.00 06-NOV-2002
- * @author  Easy Software Products
+ * @version 1.1 23-JAN-2007
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
- *   Copyright 1997-2002 by Easy Software Products.
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /**
@@ -31,7 +22,7 @@ package com.easysw.cups;
  * server, and processing responses.
  *
  * @author     TDB
- * @version    1.0
+ * @version    1.1
  * @since      JDK1.3
  */
 
@@ -483,8 +474,7 @@ public class IPPHttp
       if (auth_type.compareTo("basic") == 0)
       {
         s1 = user + ":" + passwd;
-        IPPBase64Encoder encoder = new IPPBase64Encoder();
-        String auth_string = encoder.encode(s1.getBytes());
+        String auth_string = Base64Coder.encodeString(s1);
         s1 = "Authorization: Basic " + auth_string + "\r\n";
         os.write(s1.getBytes(), 0, s1.length());
       }