You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2005/02/19 20:03:23 UTC

svn commit: r154442 - in jakarta/httpclient/trunk/http-common/src/java/org/apache/http: Header.java HeaderElement.java HeaderGroup.java HttpException.java HttpStatus.java NameValuePair.java ProtocolException.java util/ util/ParameterParser.java

Author: olegk
Date: Sat Feb 19 11:03:20 2005
New Revision: 154442

URL: http://svn.apache.org/viewcvs?view=rev&rev=154442
Log:
More files copied over from Commons HttpClient. Package names adjusted. Removed references to commons-logging

Added:
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/NameValuePair.java
      - copied, changed from r154441, jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/NameValuePair.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/ParameterParser.java
      - copied, changed from r154441, jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/util/ParameterParser.java
Modified:
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/Header.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HeaderElement.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HeaderGroup.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpException.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpStatus.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/ProtocolException.java

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/Header.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/Header.java?view=diff&r1=154441&r2=154442
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/Header.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/Header.java Sat Feb 19 11:03:20 2005
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.commons.httpclient;
+package org.apache.http;
 
 /**
  * <p>An HTTP header.</p>

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HeaderElement.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HeaderElement.java?view=diff&r1=154441&r2=154442
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HeaderElement.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HeaderElement.java Sat Feb 19 11:03:20 2005
@@ -27,14 +27,12 @@
  *
  */
 
-package org.apache.commons.httpclient;
+package org.apache.http;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.httpclient.util.ParameterParser;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.http.util.ParameterParser;
 
 /**
  * <p>One element of an HTTP header's value.</p>
@@ -156,9 +154,6 @@
 
     // -------------------------------------------------------- Constants
 
-    /** Log object for this class. */
-    private static final Log LOG = LogFactory.getLog(HeaderElement.class);
-
     // ----------------------------------------------------- Instance Variables
 
     /** My parameters, if any. */
@@ -189,9 +184,6 @@
      * @since 3.0
      */
     public static final HeaderElement[] parseElements(char[] headerValue) {
-            
-        LOG.trace("enter HeaderElement.parseElements(char[])");
-
         if (headerValue == null) {
             return new HeaderElement[] {};
         }
@@ -233,9 +225,6 @@
      * @since 3.0
      */
     public static final HeaderElement[] parseElements(String headerValue) {
-            
-        LOG.trace("enter HeaderElement.parseElements(String)");
-
         if (headerValue == null) {
             return new HeaderElement[] {};
         }
@@ -255,9 +244,6 @@
      */
     public static final HeaderElement[] parse(String headerValue)
         throws HttpException {
-            
-        LOG.trace("enter HeaderElement.parse(String)");
-
         if (headerValue == null) {
             return new HeaderElement[] {};
         }
@@ -272,11 +258,7 @@
      * @param name The name to search by.
      * @return NameValuePair parameter with the given name
      */
-
     public NameValuePair getParameterByName(String name) {
-
-        LOG.trace("enter HeaderElement.getParameterByName(String)");
-
         if (name == null) {
             throw new IllegalArgumentException("Name may not be null");
         } 

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HeaderGroup.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HeaderGroup.java?view=diff&r1=154441&r2=154442
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HeaderGroup.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HeaderGroup.java Sat Feb 19 11:03:20 2005
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.commons.httpclient;
+package org.apache.http;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpException.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpException.java?view=diff&r1=154441&r2=154442
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpException.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpException.java Sat Feb 19 11:03:20 2005
@@ -1,7 +1,7 @@
 /*
  * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//httpclient/src/java/org/apache/commons/httpclient/HttpException.java,v 1.19 2004/09/30 18:53:20 olegk Exp $
  * $Revision: 1.19 $
- * $Date: 2004/09/30 18:53:20 $
+ * $Date$
  *
  * ====================================================================
  *
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.commons.httpclient;
+package org.apache.http;
 
 import java.io.IOException;
 import java.io.PrintStream;
@@ -39,7 +39,7 @@
  * 
  * @author Laura Werner
  * 
- * @version $Revision: 1.19 $ $Date: 2004/09/30 18:53:20 $
+ * @version $Revision: 1.19 $ $Date$
  */
 public class HttpException extends IOException {
 

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpStatus.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpStatus.java?view=diff&r1=154441&r2=154442
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpStatus.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpStatus.java Sat Feb 19 11:03:20 2005
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.commons.httpclient;
+package org.apache.http;
 
 /**
  * Constants enumerating the HTTP status codes.

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/NameValuePair.java (from r154441, jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/NameValuePair.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/NameValuePair.java?view=diff&rev=154442&p1=jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/NameValuePair.java&r1=154441&p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/NameValuePair.java&r2=154442
==============================================================================
--- jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/NameValuePair.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/NameValuePair.java Sat Feb 19 11:03:20 2005
@@ -1,7 +1,7 @@
 /*
  * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//httpclient/src/java/org/apache/commons/httpclient/NameValuePair.java,v 1.17 2004/04/18 23:51:35 jsdever Exp $
  * $Revision: 1.17 $
- * $Date: 2004/04/18 23:51:35 $
+ * $Date$
  *
  * ====================================================================
  *
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.commons.httpclient;
+package org.apache.http;
 
 import java.io.Serializable;
 
@@ -38,7 +38,7 @@
  * @author Sean C. Sullivan
  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
  * 
- * @version $Revision: 1.17 $ $Date: 2004/04/18 23:51:35 $
+ * @version $Revision: 1.17 $ $Date$
  * 
  */
 public class NameValuePair implements Serializable {

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/ProtocolException.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/ProtocolException.java?view=diff&r1=154441&r2=154442
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/ProtocolException.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/ProtocolException.java Sat Feb 19 11:03:20 2005
@@ -1,7 +1,7 @@
 /*
  * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//httpclient/src/java/org/apache/commons/httpclient/ProtocolException.java,v 1.4 2004/05/13 04:03:25 mbecke Exp $
  * $Revision: 1.4 $
- * $Date: 2004/05/13 04:03:25 $
+ * $Date$
  *
  * ====================================================================
  *
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.commons.httpclient;
+package org.apache.http;
 
 /**
  * Signals that an HTTP protocol violation has occurred.  For example, HttpClient

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/ParameterParser.java (from r154441, jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/util/ParameterParser.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/ParameterParser.java?view=diff&rev=154442&p1=jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/util/ParameterParser.java&r1=154441&p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/ParameterParser.java&r2=154442
==============================================================================
--- jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/util/ParameterParser.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/ParameterParser.java Sat Feb 19 11:03:20 2005
@@ -1,7 +1,7 @@
 /*
  * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//httpclient/src/java/org/apache/commons/httpclient/util/ParameterParser.java,v 1.5 2004/05/13 04:01:22 mbecke Exp $
  * $Revision: 1.5 $
- * $Date: 2004/05/13 04:01:22 $
+ * $Date$
  *
  * ====================================================================
  *
@@ -27,11 +27,12 @@
  *
  */
 
-package org.apache.commons.httpclient.util;
+package org.apache.http.util;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.httpclient.NameValuePair;
+import org.apache.http.NameValuePair;
 
 /**
  * A simple parser intended to parse sequences of name/value pairs.