hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1573532 [2/5] - in /httpcomponents/httpclient-android/branches/4.3.3-android/src/main: ./ java/org/apache/http/auth/ java/org/apache/http/client/entity/ java/org/apache/http/client/methods/ java/org/apache/http/client/params/ java/org/apac...
Date Mon, 03 Mar 2014 12:10:18 GMT
Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/AbstractHttpEntityHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/AbstractHttpEntityHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/AbstractHttpEntityHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/AbstractHttpEntityHC4.java Mon Mar  3 12:10:15 2014
@@ -43,7 +43,7 @@ import org.apache.http.protocol.HTTP;
  * @since 4.0
  */
 @NotThreadSafe
-public abstract class AbstractHttpEntity implements HttpEntity {
+public abstract class AbstractHttpEntityHC4 implements HttpEntity {
 
     /**
      * Buffer size for output stream processing.
@@ -61,7 +61,7 @@ public abstract class AbstractHttpEntity
      * The contentType, contentEncoding and chunked attributes of the created object are set to
      * <code>null</code>, <code>null</code> and <code>false</code>, respectively.
      */
-    protected AbstractHttpEntity() {
+    protected AbstractHttpEntityHC4() {
         super();
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/BasicHttpEntityHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/BasicHttpEntityHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/BasicHttpEntityHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/BasicHttpEntityHC4.java Mon Mar  3 12:10:15 2014
@@ -42,7 +42,7 @@ import org.apache.http.util.Asserts;
  * @since 4.0
  */
 @NotThreadSafe
-public class BasicHttpEntity extends AbstractHttpEntity {
+public class BasicHttpEntityHC4 extends AbstractHttpEntityHC4 {
 
     private InputStream content;
     private long length;
@@ -52,7 +52,7 @@ public class BasicHttpEntity extends Abs
      * The content is initially missing, the content length
      * is set to a negative number.
      */
-    public BasicHttpEntity() {
+    public BasicHttpEntityHC4() {
         super();
         this.length = -1;
     }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/BufferedHttpEntityHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/BufferedHttpEntityHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/BufferedHttpEntityHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/BufferedHttpEntityHC4.java Mon Mar  3 12:10:15 2014
@@ -35,7 +35,7 @@ import java.io.OutputStream;
 import org.apache.http.HttpEntity;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.util.Args;
-import org.apache.http.util.EntityUtils;
+import org.apache.http.util.EntityUtilsHC4;
 
 /**
  * A wrapping entity that buffers it content if necessary.
@@ -47,7 +47,7 @@ import org.apache.http.util.EntityUtils;
  * @since 4.0
  */
 @NotThreadSafe
-public class BufferedHttpEntity extends HttpEntityWrapper {
+public class BufferedHttpEntityHC4 extends HttpEntityWrapperHC4 {
 
     private final byte[] buffer;
 
@@ -57,10 +57,10 @@ public class BufferedHttpEntity extends 
      * @param entity   the entity to wrap, not null
      * @throws IllegalArgumentException if wrapped is null
      */
-    public BufferedHttpEntity(final HttpEntity entity) throws IOException {
+    public BufferedHttpEntityHC4(final HttpEntity entity) throws IOException {
         super(entity);
         if (!entity.isRepeatable() || entity.getContentLength() < 0) {
-            this.buffer = EntityUtils.toByteArray(entity);
+            this.buffer = EntityUtilsHC4.toByteArray(entity);
         } else {
             this.buffer = null;
         }
@@ -122,4 +122,4 @@ public class BufferedHttpEntity extends 
         return (buffer == null) && super.isStreaming();
     }
 
-} // class BufferedHttpEntity
+} // class BufferedHttpEntityHC4

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/ByteArrayEntityHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/ByteArrayEntityHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/ByteArrayEntityHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/ByteArrayEntityHC4.java Mon Mar  3 12:10:15 2014
@@ -41,7 +41,7 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @NotThreadSafe
-public class ByteArrayEntity extends AbstractHttpEntity implements Cloneable {
+public class ByteArrayEntityHC4 extends AbstractHttpEntityHC4 implements Cloneable {
 
     /**
      * @deprecated (4.2)
@@ -55,7 +55,7 @@ public class ByteArrayEntity extends Abs
      * @since 4.2
      */
     @SuppressWarnings("deprecation")
-    public ByteArrayEntity(final byte[] b, final ContentType contentType) {
+    public ByteArrayEntityHC4(final byte[] b, final ContentType contentType) {
         super();
         Args.notNull(b, "Source byte array");
         this.content = b;
@@ -71,7 +71,7 @@ public class ByteArrayEntity extends Abs
      * @since 4.2
      */
     @SuppressWarnings("deprecation")
-    public ByteArrayEntity(final byte[] b, final int off, final int len, final ContentType contentType) {
+    public ByteArrayEntityHC4(final byte[] b, final int off, final int len, final ContentType contentType) {
         super();
         Args.notNull(b, "Source byte array");
         if ((off < 0) || (off > b.length) || (len < 0) ||
@@ -87,11 +87,11 @@ public class ByteArrayEntity extends Abs
         }
     }
 
-    public ByteArrayEntity(final byte[] b) {
+    public ByteArrayEntityHC4(final byte[] b) {
         this(b, null);
     }
 
-    public ByteArrayEntity(final byte[] b, final int off, final int len) {
+    public ByteArrayEntityHC4(final byte[] b, final int off, final int len) {
         this(b, off, len, null);
     }
 
@@ -128,4 +128,4 @@ public class ByteArrayEntity extends Abs
         return super.clone();
     }
 
-} // class ByteArrayEntity
+} // class ByteArrayEntityHC4

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/ContentType.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/ContentType.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/ContentType.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/ContentType.java Mon Mar  3 12:10:15 2014
@@ -39,8 +39,8 @@ import org.apache.http.HttpEntity;
 import org.apache.http.NameValuePair;
 import org.apache.http.ParseException;
 import org.apache.http.annotation.Immutable;
-import org.apache.http.message.BasicHeaderValueFormatter;
-import org.apache.http.message.BasicHeaderValueParser;
+import org.apache.http.message.BasicHeaderValueFormatterHC4;
+import org.apache.http.message.BasicHeaderValueParserHC4;
 import org.apache.http.message.ParserCursor;
 import org.apache.http.util.Args;
 import org.apache.http.util.CharArrayBuffer;
@@ -145,7 +145,7 @@ public final class ContentType implement
         buf.append(this.mimeType);
         if (this.params != null) {
             buf.append("; ");
-            BasicHeaderValueFormatter.INSTANCE.formatParameters(buf, this.params, false);
+            BasicHeaderValueFormatterHC4.INSTANCE.formatParameters(buf, this.params, false);
         } else if (this.charset != null) {
             buf.append("; charset=");
             buf.append(this.charset.name());
@@ -226,7 +226,7 @@ public final class ContentType implement
         final CharArrayBuffer buf = new CharArrayBuffer(s.length());
         buf.append(s);
         final ParserCursor cursor = new ParserCursor(0, s.length());
-        final HeaderElement[] elements = BasicHeaderValueParser.INSTANCE.parseElements(buf, cursor);
+        final HeaderElement[] elements = BasicHeaderValueParserHC4.INSTANCE.parseElements(buf, cursor);
         if (elements.length > 0) {
             return create(elements[0]);
         } else {

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/FileEntityHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/FileEntityHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/FileEntityHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/FileEntityHC4.java Mon Mar  3 12:10:15 2014
@@ -42,15 +42,15 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @NotThreadSafe
-public class FileEntity extends AbstractHttpEntity implements Cloneable {
+public class FileEntityHC4 extends AbstractHttpEntityHC4 implements Cloneable {
 
     protected final File file;
 
     /**
-     * @deprecated (4.1.3) {@link #FileEntity(File, ContentType)}
+     * @deprecated (4.1.3) {@link #FileEntityHC4(File, ContentType)}
      */
     @Deprecated
-    public FileEntity(final File file, final String contentType) {
+    public FileEntityHC4(final File file, final String contentType) {
         super();
         this.file = Args.notNull(file, "File");
         setContentType(contentType);
@@ -59,7 +59,7 @@ public class FileEntity extends Abstract
     /**
      * @since 4.2
      */
-    public FileEntity(final File file, final ContentType contentType) {
+    public FileEntityHC4(final File file, final ContentType contentType) {
         super();
         this.file = Args.notNull(file, "File");
         if (contentType != null) {
@@ -70,7 +70,7 @@ public class FileEntity extends Abstract
     /**
      * @since 4.2
      */
-    public FileEntity(final File file) {
+    public FileEntityHC4(final File file) {
         super();
         this.file = Args.notNull(file, "File");
     }
@@ -118,4 +118,4 @@ public class FileEntity extends Abstract
         return super.clone();
     }
 
-} // class FileEntity
+} // class FileEntityHC4

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/HttpEntityWrapperHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/HttpEntityWrapperHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/HttpEntityWrapperHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/HttpEntityWrapperHC4.java Mon Mar  3 12:10:15 2014
@@ -46,7 +46,7 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @NotThreadSafe
-public class HttpEntityWrapper implements HttpEntity {
+public class HttpEntityWrapperHC4 implements HttpEntity {
 
     /** The wrapped entity. */
     protected HttpEntity wrappedEntity;
@@ -54,7 +54,7 @@ public class HttpEntityWrapper implement
     /**
      * Creates a new entity wrapper.
      */
-    public HttpEntityWrapper(final HttpEntity wrappedEntity) {
+    public HttpEntityWrapperHC4(final HttpEntity wrappedEntity) {
         super();
         this.wrappedEntity = Args.notNull(wrappedEntity, "Wrapped entity");
     } // constructor

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/InputStreamEntityHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/InputStreamEntityHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/InputStreamEntityHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/InputStreamEntityHC4.java Mon Mar  3 12:10:15 2014
@@ -41,20 +41,20 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @NotThreadSafe
-public class InputStreamEntity extends AbstractHttpEntity {
+public class InputStreamEntityHC4 extends AbstractHttpEntityHC4 {
 
     private final InputStream content;
     private final long length;
 
     /**
      * Creates an entity with an unknown length.
-     * Equivalent to {@code new InputStreamEntity(instream, -1)}.
+     * Equivalent to {@code new InputStreamEntityHC4(instream, -1)}.
      *
      * @param instream input stream
      * @throws IllegalArgumentException if {@code instream} is {@code null}
      * @since 4.3
      */
-    public InputStreamEntity(final InputStream instream) {
+    public InputStreamEntityHC4(final InputStream instream) {
         this(instream, -1);
     }
 
@@ -65,20 +65,20 @@ public class InputStreamEntity extends A
      * @param length of the input stream, {@code -1} if unknown
      * @throws IllegalArgumentException if {@code instream} is {@code null}
      */
-    public InputStreamEntity(final InputStream instream, final long length) {
+    public InputStreamEntityHC4(final InputStream instream, final long length) {
         this(instream, length, null);
     }
 
     /**
      * Creates an entity with a content type and unknown length.
-     * Equivalent to {@code new InputStreamEntity(instream, -1, contentType)}.
+     * Equivalent to {@code new InputStreamEntityHC4(instream, -1, contentType)}.
      *
      * @param instream input stream
      * @param contentType content type
      * @throws IllegalArgumentException if {@code instream} is {@code null}
      * @since 4.3
      */
-    public InputStreamEntity(final InputStream instream, final ContentType contentType) {
+    public InputStreamEntityHC4(final InputStream instream, final ContentType contentType) {
         this(instream, -1, contentType);
     }
 
@@ -89,7 +89,7 @@ public class InputStreamEntity extends A
      * @throws IllegalArgumentException if {@code instream} is {@code null}
      * @since 4.2
      */
-    public InputStreamEntity(final InputStream instream, final long length, final ContentType contentType) {
+    public InputStreamEntityHC4(final InputStream instream, final long length, final ContentType contentType) {
         super();
         this.content = Args.notNull(instream, "Source input stream");
         this.length = length;

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/SerializableEntityHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/SerializableEntityHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/SerializableEntityHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/SerializableEntityHC4.java Mon Mar  3 12:10:15 2014
@@ -47,7 +47,7 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @NotThreadSafe
-public class SerializableEntity extends AbstractHttpEntity {
+public class SerializableEntityHC4 extends AbstractHttpEntityHC4 {
 
     private byte[] objSer;
 
@@ -61,7 +61,7 @@ public class SerializableEntity extends 
      *        stored in an internal buffer
      * @throws IOException in case of an I/O error
      */
-    public SerializableEntity(final Serializable ser, final boolean bufferize) throws IOException {
+    public SerializableEntityHC4(final Serializable ser, final boolean bufferize) throws IOException {
         super();
         Args.notNull(ser, "Source object");
         if (bufferize) {
@@ -74,7 +74,7 @@ public class SerializableEntity extends 
     /**
      * @since 4.3
      */
-    public SerializableEntity(final Serializable ser) {
+    public SerializableEntityHC4(final Serializable ser) {
         super();
         Args.notNull(ser, "Source object");
         this.objRef = ser;

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/StringEntityHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/StringEntityHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/StringEntityHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/StringEntityHC4.java Mon Mar  3 12:10:15 2014
@@ -46,12 +46,12 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @NotThreadSafe
-public class StringEntity extends AbstractHttpEntity implements Cloneable {
+public class StringEntityHC4 extends AbstractHttpEntityHC4 implements Cloneable {
 
     protected final byte[] content;
 
     /**
-     * Creates a StringEntity with the specified content and content type.
+     * Creates a StringEntityHC4 with the specified content and content type.
      *
      * @param string content to be used. Not {@code null}.
      * @param contentType content type to be used. May be {@code null}, in which case the default
@@ -62,12 +62,12 @@ public class StringEntity extends Abstra
      * this instance of the Java virtual machine
      * @since 4.2
      */
-    public StringEntity(final String string, final ContentType contentType) throws UnsupportedCharsetException {
+    public StringEntityHC4(final String string, final ContentType contentType) throws UnsupportedCharsetException {
         super();
         Args.notNull(string, "Source string");
         Charset charset = contentType != null ? contentType.getCharset() : null;
         if (charset == null) {
-            charset = HTTP.DEF_CONTENT_CHARSET;
+            charset = Charset.forName(HTTP.DEFAULT_CONTENT_CHARSET);
         }
         try {
             this.content = string.getBytes(charset.name());
@@ -81,22 +81,22 @@ public class StringEntity extends Abstra
     }
 
     /**
-     * Creates a StringEntity with the specified content, MIME type and charset
+     * Creates a StringEntityHC4 with the specified content, MIME type and charset
      *
      * @param string content to be used. Not {@code null}.
      * @param mimeType MIME type to be used. May be {@code null}, in which case the default
      *   is {@link HTTP#PLAIN_TEXT_TYPE} i.e. "text/plain"
      * @param charset character set to be used. May be {@code null}, in which case the default
-     *   is {@link HTTP#DEF_CONTENT_CHARSET} i.e. "ISO-8859-1"
+     *   is {@link HTTP#DEFAULT_CONTENT_CHARSET} i.e. "ISO-8859-1"
      * @throws  UnsupportedEncodingException If the named charset is not supported.
      *
      * @since 4.1
      * @throws IllegalArgumentException if the string parameter is null
      *
-     * @deprecated (4.1.3) use {@link #StringEntity(String, ContentType)}
+     * @deprecated (4.1.3) use {@link #StringEntityHC4(String, ContentType)}
      */
     @Deprecated
-    public StringEntity(
+    public StringEntityHC4(
             final String string, final String mimeType, final String charset) throws UnsupportedEncodingException {
         super();
         Args.notNull(string, "Source string");
@@ -107,40 +107,40 @@ public class StringEntity extends Abstra
     }
 
     /**
-     * Creates a StringEntity with the specified content and charset. The MIME type defaults
+     * Creates a StringEntityHC4 with the specified content and charset. The MIME type defaults
      * to "text/plain".
      *
      * @param string content to be used. Not {@code null}.
      * @param charset character set to be used. May be {@code null}, in which case the default
-     *   is {@link HTTP#DEF_CONTENT_CHARSET} is assumed
+     *   is {@link HTTP#DEFAULT_CONTENT_CHARSET} is assumed
      *
      * @throws IllegalArgumentException if the string parameter is null
      * @throws UnsupportedCharsetException Thrown when the named charset is not available in
      * this instance of the Java virtual machine
      */
-    public StringEntity(final String string, final String charset)
+    public StringEntityHC4(final String string, final String charset)
             throws UnsupportedCharsetException {
         this(string, ContentType.create(ContentType.TEXT_PLAIN.getMimeType(), charset));
     }
 
     /**
-     * Creates a StringEntity with the specified content and charset. The MIME type defaults
+     * Creates a StringEntityHC4 with the specified content and charset. The MIME type defaults
      * to "text/plain".
      *
      * @param string content to be used. Not {@code null}.
      * @param charset character set to be used. May be {@code null}, in which case the default
-     *   is {@link HTTP#DEF_CONTENT_CHARSET} is assumed
+     *   is {@link HTTP#DEFAULT_CONTENT_CHARSET} is assumed
      *
      * @throws IllegalArgumentException if the string parameter is null
      *
      * @since 4.2
      */
-    public StringEntity(final String string, final Charset charset) {
+    public StringEntityHC4(final String string, final Charset charset) {
         this(string, ContentType.create(ContentType.TEXT_PLAIN.getMimeType(), charset));
     }
 
     /**
-     * Creates a StringEntity with the specified content. The content type defaults to
+     * Creates a StringEntityHC4 with the specified content. The content type defaults to
      * {@link ContentType#TEXT_PLAIN}.
      *
      * @param string content to be used. Not {@code null}.
@@ -148,7 +148,7 @@ public class StringEntity extends Abstra
      * @throws IllegalArgumentException if the string parameter is null
      * @throws UnsupportedEncodingException if the default HTTP charset is not supported.
      */
-    public StringEntity(final String string)
+    public StringEntityHC4(final String string)
             throws UnsupportedEncodingException {
         this(string, ContentType.DEFAULT_TEXT);
     }
@@ -185,4 +185,4 @@ public class StringEntity extends Abstra
         return super.clone();
     }
 
-} // class StringEntity
+} // class StringEntityHC4

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/BHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/BHttpConnectionBase.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/BHttpConnectionBase.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/BHttpConnectionBase.java Mon Mar  3 12:10:15 2014
@@ -47,17 +47,17 @@ import org.apache.http.HttpInetConnectio
 import org.apache.http.HttpMessage;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.config.MessageConstraints;
-import org.apache.http.entity.BasicHttpEntity;
+import org.apache.http.entity.BasicHttpEntityHC4;
 import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.impl.entity.LaxContentLengthStrategy;
-import org.apache.http.impl.entity.StrictContentLengthStrategy;
-import org.apache.http.impl.io.ChunkedInputStream;
-import org.apache.http.impl.io.ChunkedOutputStream;
-import org.apache.http.impl.io.ContentLengthInputStream;
-import org.apache.http.impl.io.ContentLengthOutputStream;
+import org.apache.http.impl.entity.LaxContentLengthStrategyHC4;
+import org.apache.http.impl.entity.StrictContentLengthStrategyHC4;
+import org.apache.http.impl.io.ChunkedInputStreamHC4;
+import org.apache.http.impl.io.ChunkedOutputStreamHC4;
+import org.apache.http.impl.io.ContentLengthInputStreamHC4;
+import org.apache.http.impl.io.ContentLengthOutputStreamHC4;
 import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.impl.io.IdentityInputStream;
-import org.apache.http.impl.io.IdentityOutputStream;
+import org.apache.http.impl.io.IdentityInputStreamHC4;
+import org.apache.http.impl.io.IdentityOutputStreamHC4;
 import org.apache.http.impl.io.SessionInputBufferImpl;
 import org.apache.http.impl.io.SessionOutputBufferImpl;
 import org.apache.http.io.SessionInputBuffer;
@@ -97,9 +97,9 @@ public class BHttpConnectionBase impleme
      * @param constraints Message constraints. If <code>null</code>
      *   {@link MessageConstraints#DEFAULT} will be used.
      * @param incomingContentStrategy incoming content length strategy. If <code>null</code>
-     *   {@link LaxContentLengthStrategy#INSTANCE} will be used.
+     *   {@link LaxContentLengthStrategyHC4#INSTANCE} will be used.
      * @param outgoingContentStrategy outgoing content length strategy. If <code>null</code>
-     *   {@link StrictContentLengthStrategy#INSTANCE} will be used.
+     *   {@link StrictContentLengthStrategyHC4#INSTANCE} will be used.
      */
     protected BHttpConnectionBase(
             final int buffersize,
@@ -119,9 +119,9 @@ public class BHttpConnectionBase impleme
                 charencoder);
         this.connMetrics = new HttpConnectionMetricsImpl(inTransportMetrics, outTransportMetrics);
         this.incomingContentStrategy = incomingContentStrategy != null ? incomingContentStrategy :
-            LaxContentLengthStrategy.INSTANCE;
+            LaxContentLengthStrategyHC4.INSTANCE;
         this.outgoingContentStrategy = outgoingContentStrategy != null ? outgoingContentStrategy :
-            StrictContentLengthStrategy.INSTANCE;
+            StrictContentLengthStrategyHC4.INSTANCE;
     }
 
     protected void ensureOpen() throws IOException {
@@ -184,11 +184,11 @@ public class BHttpConnectionBase impleme
             final long len,
             final SessionOutputBuffer outbuffer) {
         if (len == ContentLengthStrategy.CHUNKED) {
-            return new ChunkedOutputStream(2048, outbuffer);
+            return new ChunkedOutputStreamHC4(2048, outbuffer);
         } else if (len == ContentLengthStrategy.IDENTITY) {
-            return new IdentityOutputStream(outbuffer);
+            return new IdentityOutputStreamHC4(outbuffer);
         } else {
-            return new ContentLengthOutputStream(outbuffer, len);
+            return new ContentLengthOutputStreamHC4(outbuffer, len);
         }
     }
 
@@ -201,16 +201,16 @@ public class BHttpConnectionBase impleme
             final long len,
             final SessionInputBuffer inbuffer) {
         if (len == ContentLengthStrategy.CHUNKED) {
-            return new ChunkedInputStream(inbuffer);
+            return new ChunkedInputStreamHC4(inbuffer);
         } else if (len == ContentLengthStrategy.IDENTITY) {
-            return new IdentityInputStream(inbuffer);
+            return new IdentityInputStreamHC4(inbuffer);
         } else {
-            return new ContentLengthInputStream(inbuffer, len);
+            return new ContentLengthInputStreamHC4(inbuffer, len);
         }
     }
 
     protected HttpEntity prepareInput(final HttpMessage message) throws HttpException {
-        final BasicHttpEntity entity = new BasicHttpEntity();
+        final BasicHttpEntityHC4 entity = new BasicHttpEntityHC4();
 
         final long len = this.incomingContentStrategy.determineLength(message);
         final InputStream instream = createInputStream(len, this.inbuffer);

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultBHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultBHttpClientConnection.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultBHttpClientConnection.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultBHttpClientConnection.java Mon Mar  3 12:10:15 2014
@@ -61,8 +61,8 @@ import org.apache.http.util.Args;
 public class DefaultBHttpClientConnection extends BHttpConnectionBase
                                                    implements HttpClientConnection {
 
-    private final HttpMessageParser<HttpResponse> responseParser;
-    private final HttpMessageWriter<HttpRequest> requestWriter;
+    private final HttpMessageParser responseParser;
+    private final HttpMessageWriter requestWriter;
 
     /**
      * Creates new instance of DefaultBHttpClientConnection.
@@ -76,9 +76,9 @@ public class DefaultBHttpClientConnectio
      * @param constraints Message constraints. If <code>null</code>
      *   {@link MessageConstraints#DEFAULT} will be used.
      * @param incomingContentStrategy incoming content length strategy. If <code>null</code>
-     *   {@link org.apache.http.impl.entity.LaxContentLengthStrategy#INSTANCE} will be used.
+     *   {@link org.apache.http.impl.entity.LaxContentLengthStrategyHC4#INSTANCE} will be used.
      * @param outgoingContentStrategy outgoing content length strategy. If <code>null</code>
-     *   {@link org.apache.http.impl.entity.StrictContentLengthStrategy#INSTANCE} will be used.
+     *   {@link org.apache.http.impl.entity.StrictContentLengthStrategyHC4#INSTANCE} will be used.
      * @param requestWriterFactory request writer factory. If <code>null</code>
      *   {@link DefaultHttpRequestWriterFactory#INSTANCE} will be used.
      * @param responseParserFactory response parser factory. If <code>null</code>
@@ -158,7 +158,7 @@ public class DefaultBHttpClientConnectio
 
     public HttpResponse receiveResponseHeader() throws HttpException, IOException {
         ensureOpen();
-        final HttpResponse response = this.responseParser.parse();
+        final HttpResponse response = (HttpResponse) this.responseParser.parse();
         onResponseReceived(response);
         if (response.getStatusLine().getStatusCode() >= HttpStatus.SC_OK) {
             incrementResponseCount();

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultBHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultBHttpServerConnection.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultBHttpServerConnection.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultBHttpServerConnection.java Mon Mar  3 12:10:15 2014
@@ -60,8 +60,8 @@ import org.apache.http.util.Args;
 public class DefaultBHttpServerConnection extends BHttpConnectionBase
                                                    implements HttpServerConnection {
 
-    private final HttpMessageParser<HttpRequest> requestParser;
-    private final HttpMessageWriter<HttpResponse> responseWriter;
+    private final HttpMessageParser requestParser;
+    private final HttpMessageWriter responseWriter;
 
     /**
      * Creates new instance of DefaultBHttpServerConnection.
@@ -77,7 +77,7 @@ public class DefaultBHttpServerConnectio
      * @param incomingContentStrategy incoming content length strategy. If <code>null</code>
      *   {@link DisallowIdentityContentLengthStrategy#INSTANCE} will be used.
      * @param outgoingContentStrategy outgoing content length strategy. If <code>null</code>
-     *   {@link org.apache.http.impl.entity.StrictContentLengthStrategy#INSTANCE} will be used.
+     *   {@link org.apache.http.impl.entity.StrictContentLengthStrategyHC4#INSTANCE} will be used.
      * @param requestParserFactory request parser factory. If <code>null</code>
      *   {@link DefaultHttpRequestParserFactory#INSTANCE} will be used.
      * @param responseWriterFactory response writer factory. If <code>null</code>
@@ -128,7 +128,7 @@ public class DefaultBHttpServerConnectio
     public HttpRequest receiveRequestHeader()
             throws HttpException, IOException {
         ensureOpen();
-        final HttpRequest request = this.requestParser.parse();
+        final HttpRequest request = (HttpRequest) this.requestParser.parse();
         onRequestReceived(request);
         incrementRequestCount();
         return request;

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategyHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategyHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategyHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategyHC4.java Mon Mar  3 12:10:15 2014
@@ -61,11 +61,11 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @Immutable
-public class DefaultConnectionReuseStrategy implements ConnectionReuseStrategy {
+public class DefaultConnectionReuseStrategyHC4 implements ConnectionReuseStrategy {
 
-    public static final DefaultConnectionReuseStrategy INSTANCE = new DefaultConnectionReuseStrategy();
+    public static final DefaultConnectionReuseStrategyHC4 INSTANCE = new DefaultConnectionReuseStrategyHC4();
 
-    public DefaultConnectionReuseStrategy() {
+    public DefaultConnectionReuseStrategyHC4() {
         super();
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultHttpRequestFactoryHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultHttpRequestFactoryHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultHttpRequestFactoryHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultHttpRequestFactoryHC4.java Mon Mar  3 12:10:15 2014
@@ -42,9 +42,9 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @Immutable
-public class DefaultHttpRequestFactory implements HttpRequestFactory {
+public class DefaultHttpRequestFactoryHC4 implements HttpRequestFactory {
 
-    public static final DefaultHttpRequestFactory INSTANCE = new DefaultHttpRequestFactory();
+    public static final DefaultHttpRequestFactoryHC4 INSTANCE = new DefaultHttpRequestFactoryHC4();
 
     private static final String[] RFC2616_COMMON_METHODS = {
         "GET"
@@ -64,7 +64,7 @@ public class DefaultHttpRequestFactory i
     };
 
 
-    public DefaultHttpRequestFactory() {
+    public DefaultHttpRequestFactoryHC4() {
         super();
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultHttpResponseFactoryHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultHttpResponseFactoryHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultHttpResponseFactoryHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultHttpResponseFactoryHC4.java Mon Mar  3 12:10:15 2014
@@ -46,9 +46,9 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @Immutable
-public class DefaultHttpResponseFactory implements HttpResponseFactory {
+public class DefaultHttpResponseFactoryHC4 implements HttpResponseFactory {
 
-    public static final DefaultHttpResponseFactory INSTANCE = new DefaultHttpResponseFactory();
+    public static final DefaultHttpResponseFactoryHC4 INSTANCE = new DefaultHttpResponseFactoryHC4();
 
     /** The catalog for looking up reason phrases. */
     protected final ReasonPhraseCatalog reasonCatalog;
@@ -59,7 +59,7 @@ public class DefaultHttpResponseFactory 
      *
      * @param catalog   the catalog of reason phrases
      */
-    public DefaultHttpResponseFactory(final ReasonPhraseCatalog catalog) {
+    public DefaultHttpResponseFactoryHC4(final ReasonPhraseCatalog catalog) {
         this.reasonCatalog = Args.notNull(catalog, "Reason phrase catalog");
     }
 
@@ -67,8 +67,8 @@ public class DefaultHttpResponseFactory 
      * Creates a new response factory with the default catalog.
      * The default catalog is {@link EnglishReasonPhraseCatalog}.
      */
-    public DefaultHttpResponseFactory() {
-        this(EnglishReasonPhraseCatalog.INSTANCE);
+    public DefaultHttpResponseFactoryHC4() {
+        this(EnglishReasonPhraseCatalogHC4.INSTANCE);
     }
 
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalogHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalogHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalogHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalogHC4.java Mon Mar  3 12:10:15 2014
@@ -42,7 +42,7 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @Immutable
-public class EnglishReasonPhraseCatalog implements ReasonPhraseCatalog {
+public class EnglishReasonPhraseCatalogHC4 implements ReasonPhraseCatalog {
 
     // static array with english reason phrases defined below
 
@@ -51,15 +51,15 @@ public class EnglishReasonPhraseCatalog 
      * This catalog is thread safe, so there typically
      * is no need to create other instances.
      */
-    public final static EnglishReasonPhraseCatalog INSTANCE =
-        new EnglishReasonPhraseCatalog();
+    public final static EnglishReasonPhraseCatalogHC4 INSTANCE =
+        new EnglishReasonPhraseCatalogHC4();
 
 
     /**
      * Restricted default constructor, for derived classes.
      * If you need an instance of this class, use {@link #INSTANCE INSTANCE}.
      */
-    protected EnglishReasonPhraseCatalog() {
+    protected EnglishReasonPhraseCatalogHC4() {
         // no body
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/NoConnectionReuseStrategyHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/NoConnectionReuseStrategyHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/NoConnectionReuseStrategyHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/NoConnectionReuseStrategyHC4.java Mon Mar  3 12:10:15 2014
@@ -38,11 +38,11 @@ import org.apache.http.protocol.HttpCont
  * @since 4.0
  */
 @Immutable
-public class NoConnectionReuseStrategy implements ConnectionReuseStrategy {
+public class NoConnectionReuseStrategyHC4 implements ConnectionReuseStrategy {
 
-    public static final NoConnectionReuseStrategy INSTANCE = new NoConnectionReuseStrategy();
+    public static final NoConnectionReuseStrategyHC4 INSTANCE = new NoConnectionReuseStrategyHC4();
 
-    public NoConnectionReuseStrategy() {
+    public NoConnectionReuseStrategyHC4() {
         super();
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/AuthSchemeBaseHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/AuthSchemeBaseHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/AuthSchemeBaseHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/AuthSchemeBaseHC4.java Mon Mar  3 12:10:15 2014
@@ -54,7 +54,7 @@ import org.apache.http.util.CharArrayBuf
  * @since 4.0
  */
 @NotThreadSafe
-public abstract class AuthSchemeBase implements ContextAwareAuthScheme {
+public abstract class AuthSchemeBaseHC4 implements ContextAwareAuthScheme {
 
     private ChallengeState challengeState;
 
@@ -67,12 +67,12 @@ public abstract class AuthSchemeBase imp
      * @deprecated (4.3) do not use.
      */
     @Deprecated
-    public AuthSchemeBase(final ChallengeState challengeState) {
+    public AuthSchemeBaseHC4(final ChallengeState challengeState) {
         super();
         this.challengeState = challengeState;
     }
 
-    public AuthSchemeBase() {
+    public AuthSchemeBaseHC4() {
         super();
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/BasicSchemeFactoryHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/BasicSchemeFactoryHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/BasicSchemeFactoryHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/BasicSchemeFactoryHC4.java Mon Mar  3 12:10:15 2014
@@ -44,28 +44,28 @@ import org.apache.http.protocol.HttpCont
  */
 @Immutable
 @SuppressWarnings("deprecation")
-public class BasicSchemeFactory implements AuthSchemeFactory, AuthSchemeProvider {
+public class BasicSchemeFactoryHC4 implements AuthSchemeFactory, AuthSchemeProvider {
 
     private final Charset charset;
 
     /**
      * @since 4.3
      */
-    public BasicSchemeFactory(final Charset charset) {
+    public BasicSchemeFactoryHC4(final Charset charset) {
         super();
         this.charset = charset;
     }
 
-    public BasicSchemeFactory() {
+    public BasicSchemeFactoryHC4() {
         this(null);
     }
 
     public AuthScheme newInstance(final HttpParams params) {
-        return new BasicScheme();
+        return new BasicSchemeHC4();
     }
 
     public AuthScheme create(final HttpContext context) {
-        return new BasicScheme(this.charset);
+        return new BasicSchemeHC4(this.charset);
     }
 
 }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/BasicSchemeHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/BasicSchemeHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/BasicSchemeHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/BasicSchemeHC4.java Mon Mar  3 12:10:15 2014
@@ -39,7 +39,7 @@ import org.apache.http.auth.ChallengeSta
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.MalformedChallengeException;
 import org.apache.http.message.BufferedHeader;
-import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.BasicHttpContextHC4;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.Args;
 import org.apache.http.util.CharArrayBuffer;
@@ -51,7 +51,7 @@ import org.apache.http.util.EncodingUtil
  * @since 4.0
  */
 @NotThreadSafe
-public class BasicScheme extends RFC2617Scheme {
+public class BasicSchemeHC4 extends RFC2617SchemeHC4 {
 
     private final Base64 base64codec;
     /** Whether the basic authentication process is complete */
@@ -60,9 +60,9 @@ public class BasicScheme extends RFC2617
     /**
      * @since 4.3
      */
-    public BasicScheme(final Charset credentialsCharset) {
+    public BasicSchemeHC4(final Charset credentialsCharset) {
         super(credentialsCharset);
-        this.base64codec = new Base64(0);
+        this.base64codec = new Base64();
         this.complete = false;
     }
 
@@ -75,12 +75,12 @@ public class BasicScheme extends RFC2617
      * @deprecated (4.3) do not use.
      */
     @Deprecated
-    public BasicScheme(final ChallengeState challengeState) {
+    public BasicSchemeHC4(final ChallengeState challengeState) {
         super(challengeState);
-        this.base64codec = new Base64(0);
+        this.base64codec = new Base64();
     }
 
-    public BasicScheme() {
+    public BasicSchemeHC4() {
         this(Consts.ASCII);
     }
 
@@ -134,7 +134,7 @@ public class BasicScheme extends RFC2617
     @Deprecated
     public Header authenticate(
             final Credentials credentials, final HttpRequest request) throws AuthenticationException {
-        return authenticate(credentials, request, new BasicHttpContext());
+        return authenticate(credentials, request, new BasicHttpContextHC4());
     }
 
     /**

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/DigestSchemeFactoryHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/DigestSchemeFactoryHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/DigestSchemeFactoryHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/DigestSchemeFactoryHC4.java Mon Mar  3 12:10:15 2014
@@ -44,28 +44,28 @@ import org.apache.http.protocol.HttpCont
  */
 @Immutable
 @SuppressWarnings("deprecation")
-public class DigestSchemeFactory implements AuthSchemeFactory, AuthSchemeProvider {
+public class DigestSchemeFactoryHC4 implements AuthSchemeFactory, AuthSchemeProvider {
 
     private final Charset charset;
 
     /**
      * @since 4.3
      */
-    public DigestSchemeFactory(final Charset charset) {
+    public DigestSchemeFactoryHC4(final Charset charset) {
         super();
         this.charset = charset;
     }
 
-    public DigestSchemeFactory() {
+    public DigestSchemeFactoryHC4() {
         this(null);
     }
 
     public AuthScheme newInstance(final HttpParams params) {
-        return new DigestScheme();
+        return new DigestSchemeHC4();
     }
 
     public AuthScheme create(final HttpContext context) {
-        return new DigestScheme(this.charset);
+        return new DigestSchemeHC4(this.charset);
     }
 
 }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/DigestSchemeHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/DigestSchemeHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/DigestSchemeHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/DigestSchemeHC4.java Mon Mar  3 12:10:15 2014
@@ -49,10 +49,10 @@ import org.apache.http.auth.Authenticati
 import org.apache.http.auth.ChallengeState;
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.MalformedChallengeException;
-import org.apache.http.message.BasicHeaderValueFormatter;
+import org.apache.http.message.BasicHeaderValueFormatterHC4;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.message.BufferedHeader;
-import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.BasicHttpContextHC4;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.Args;
 import org.apache.http.util.CharArrayBuffer;
@@ -72,10 +72,10 @@ import org.apache.http.util.EncodingUtil
  * @since 4.0
  */
 @NotThreadSafe
-public class DigestScheme extends RFC2617Scheme {
+public class DigestSchemeHC4 extends RFC2617SchemeHC4 {
 
     /**
-     * Hexa values used when creating 32 character long digest in HTTP DigestScheme
+     * Hexa values used when creating 32 character long digest in HTTP DigestSchemeHC4
      * in case of authentication.
      *
      * @see #encode(byte[])
@@ -102,7 +102,7 @@ public class DigestScheme extends RFC261
     /**
      * @since 4.3
      */
-    public DigestScheme(final Charset credentialsCharset) {
+    public DigestSchemeHC4(final Charset credentialsCharset) {
         super(credentialsCharset);
         this.complete = false;
     }
@@ -116,11 +116,11 @@ public class DigestScheme extends RFC261
      * @deprecated (4.3) do not use.
      */
     @Deprecated
-    public DigestScheme(final ChallengeState challengeState) {
+    public DigestSchemeHC4(final ChallengeState challengeState) {
         super(challengeState);
     }
 
-    public DigestScheme() {
+    public DigestSchemeHC4() {
         this(Consts.ASCII);
     }
 
@@ -183,7 +183,7 @@ public class DigestScheme extends RFC261
     @Deprecated
     public Header authenticate(
             final Credentials credentials, final HttpRequest request) throws AuthenticationException {
-        return authenticate(credentials, request, new BasicHttpContext());
+        return authenticate(credentials, request, new BasicHttpContextHC4());
     }
 
     /**
@@ -426,7 +426,7 @@ public class DigestScheme extends RFC261
             final String name = param.getName();
             final boolean noQuotes = ("nc".equals(name) || "qop".equals(name)
                     || "algorithm".equals(name));
-            BasicHeaderValueFormatter.INSTANCE.formatNameValuePair(buffer, param, !noQuotes);
+            BasicHeaderValueFormatterHC4.INSTANCE.formatNameValuePair(buffer, param, !noQuotes);
         }
         return new BufferedHeader(buffer);
     }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java Mon Mar  3 12:10:15 2014
@@ -42,7 +42,7 @@ import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthOption;
 import org.apache.http.auth.AuthProtocolState;
 import org.apache.http.auth.AuthScheme;
-import org.apache.http.auth.AuthState;
+import org.apache.http.auth.AuthStateHC4;
 import org.apache.http.auth.AuthenticationException;
 import org.apache.http.auth.ContextAwareAuthScheme;
 import org.apache.http.auth.Credentials;
@@ -71,7 +71,7 @@ public class HttpAuthenticator {
             final HttpHost host,
             final HttpResponse response,
             final AuthenticationStrategy authStrategy,
-            final AuthState authState,
+            final AuthStateHC4 authState,
             final HttpContext context) {
         if (authStrategy.isAuthenticationRequested(host, response, context)) {
             this.log.debug("Authentication required");
@@ -100,7 +100,7 @@ public class HttpAuthenticator {
             final HttpHost host,
             final HttpResponse response,
             final AuthenticationStrategy authStrategy,
-            final AuthState authState,
+            final AuthStateHC4 authState,
             final HttpContext context) {
         try {
             if (this.log.isDebugEnabled()) {
@@ -173,7 +173,7 @@ public class HttpAuthenticator {
 
     public void generateAuthResponse(
             final HttpRequest request,
-            final AuthState authState,
+            final AuthStateHC4 authState,
             final HttpContext context) throws HttpException, IOException {
         AuthScheme authScheme = authState.getAuthScheme();
         Credentials creds = authState.getCredentials();

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/NTLMSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/NTLMSchemeFactory.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/NTLMSchemeFactory.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/NTLMSchemeFactory.java Mon Mar  3 12:10:15 2014
@@ -46,11 +46,11 @@ import org.apache.http.protocol.HttpCont
 public class NTLMSchemeFactory implements AuthSchemeFactory, AuthSchemeProvider {
 
     public AuthScheme newInstance(final HttpParams params) {
-        return new NTLMScheme();
+        return new NTLMSchemeHC4();
     }
 
     public AuthScheme create(final HttpContext context) {
-        return new NTLMScheme();
+        return new NTLMSchemeHC4();
     }
 
 }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/NTLMSchemeHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/NTLMSchemeHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/NTLMSchemeHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/NTLMSchemeHC4.java Mon Mar  3 12:10:15 2014
@@ -46,7 +46,7 @@ import org.apache.http.util.CharArrayBuf
  * @since 4.0
  */
 @NotThreadSafe
-public class NTLMScheme extends AuthSchemeBase {
+public class NTLMSchemeHC4 extends AuthSchemeBaseHC4 {
 
     enum State {
         UNINITIATED,
@@ -62,7 +62,7 @@ public class NTLMScheme extends AuthSche
     private State state;
     private String challenge;
 
-    public NTLMScheme(final NTLMEngine engine) {
+    public NTLMSchemeHC4(final NTLMEngine engine) {
         super();
         Args.notNull(engine, "NTLM engine");
         this.engine = engine;
@@ -73,7 +73,7 @@ public class NTLMScheme extends AuthSche
     /**
      * @since 4.3
      */
-    public NTLMScheme() {
+    public NTLMSchemeHC4() {
         this(new NTLMEngineImpl());
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/RFC2617SchemeHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/RFC2617SchemeHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/RFC2617SchemeHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/RFC2617SchemeHC4.java Mon Mar  3 12:10:15 2014
@@ -38,7 +38,7 @@ import org.apache.http.annotation.NotThr
 import org.apache.http.auth.ChallengeState;
 import org.apache.http.auth.MalformedChallengeException;
 import org.apache.http.auth.params.AuthPNames;
-import org.apache.http.message.BasicHeaderValueParser;
+import org.apache.http.message.BasicHeaderValueParserHC4;
 import org.apache.http.message.HeaderValueParser;
 import org.apache.http.message.ParserCursor;
 import org.apache.http.util.CharArrayBuffer;
@@ -52,7 +52,7 @@ import org.apache.http.util.CharArrayBuf
  */
 @SuppressWarnings("deprecation")
 @NotThreadSafe // AuthSchemeBase, params
-public abstract class RFC2617Scheme extends AuthSchemeBase {
+public abstract class RFC2617SchemeHC4 extends AuthSchemeBaseHC4 {
 
     private final Map<String, String> params;
     private final Charset credentialsCharset;
@@ -66,7 +66,7 @@ public abstract class RFC2617Scheme exte
      * @deprecated (4.3) do not use.
      */
     @Deprecated
-    public RFC2617Scheme(final ChallengeState challengeState) {
+    public RFC2617SchemeHC4(final ChallengeState challengeState) {
         super(challengeState);
         this.params = new HashMap<String, String>();
         this.credentialsCharset = Consts.ASCII;
@@ -75,13 +75,13 @@ public abstract class RFC2617Scheme exte
     /**
      * @since 4.3
      */
-    public RFC2617Scheme(final Charset credentialsCharset) {
+    public RFC2617SchemeHC4(final Charset credentialsCharset) {
         super();
         this.params = new HashMap<String, String>();
         this.credentialsCharset = credentialsCharset != null ? credentialsCharset : Consts.ASCII;
     }
 
-    public RFC2617Scheme() {
+    public RFC2617SchemeHC4() {
         this(Consts.ASCII);
     }
 
@@ -104,7 +104,7 @@ public abstract class RFC2617Scheme exte
     @Override
     protected void parseChallenge(
             final CharArrayBuffer buffer, final int pos, final int len) throws MalformedChallengeException {
-        final HeaderValueParser parser = BasicHeaderValueParser.INSTANCE;
+        final HeaderValueParser parser = BasicHeaderValueParserHC4.INSTANCE;
         final ParserCursor cursor = new ParserCursor(pos, buffer.length());
         final HeaderElement[] elements = parser.parseElements(buffer, cursor);
         if (elements.length == 0) {

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicCookieStoreHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicCookieStoreHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicCookieStoreHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicCookieStoreHC4.java Mon Mar  3 12:10:15 2014
@@ -46,14 +46,14 @@ import org.apache.http.cookie.CookieIden
  * @since 4.0
  */
 @ThreadSafe
-public class BasicCookieStore implements CookieStore, Serializable {
+public class BasicCookieStoreHC4 implements CookieStore, Serializable {
 
     private static final long serialVersionUID = -7581093305228232025L;
 
     @GuardedBy("this")
     private final TreeSet<Cookie> cookies;
 
-    public BasicCookieStore() {
+    public BasicCookieStoreHC4() {
         super();
         this.cookies = new TreeSet<Cookie>(new CookieIdentityComparator());
     }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicCredentialsProviderHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicCredentialsProviderHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicCredentialsProviderHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicCredentialsProviderHC4.java Mon Mar  3 12:10:15 2014
@@ -41,14 +41,14 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @ThreadSafe
-public class BasicCredentialsProvider implements CredentialsProvider {
+public class BasicCredentialsProviderHC4 implements CredentialsProvider {
 
     private final ConcurrentHashMap<AuthScope, Credentials> credMap;
 
     /**
      * Default constructor.
      */
-    public BasicCredentialsProvider() {
+    public BasicCredentialsProviderHC4() {
         super();
         this.credMap = new ConcurrentHashMap<AuthScope, Credentials>();
     }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicResponseHandlerHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicResponseHandlerHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicResponseHandlerHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicResponseHandlerHC4.java Mon Mar  3 12:10:15 2014
@@ -35,7 +35,7 @@ import org.apache.http.StatusLine;
 import org.apache.http.annotation.Immutable;
 import org.apache.http.client.HttpResponseException;
 import org.apache.http.client.ResponseHandler;
-import org.apache.http.util.EntityUtils;
+import org.apache.http.util.EntityUtilsHC4;
 
 /**
  * A {@link ResponseHandler} that returns the response body as a String
@@ -50,7 +50,7 @@ import org.apache.http.util.EntityUtils;
  * @since 4.0
  */
 @Immutable
-public class BasicResponseHandler implements ResponseHandler<String> {
+public class BasicResponseHandlerHC4 implements ResponseHandler<String> {
 
     /**
      * Returns the response body as a String if the response was successful (a
@@ -63,11 +63,11 @@ public class BasicResponseHandler implem
         final StatusLine statusLine = response.getStatusLine();
         final HttpEntity entity = response.getEntity();
         if (statusLine.getStatusCode() >= 300) {
-            EntityUtils.consume(entity);
+            EntityUtilsHC4.consume(entity);
             throw new HttpResponseException(statusLine.getStatusCode(),
                     statusLine.getReasonPhrase());
         }
-        return entity == null ? null : EntityUtils.toString(entity);
+        return entity == null ? null : EntityUtilsHC4.toString(entity);
     }
 
 }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java Mon Mar  3 12:10:15 2014
@@ -44,10 +44,10 @@ import org.apache.http.client.HttpClient
 import org.apache.http.client.ResponseHandler;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.utils.URIUtils;
+import org.apache.http.client.utils.URIUtilsHC4;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.Args;
-import org.apache.http.util.EntityUtils;
+import org.apache.http.util.EntityUtilsHC4;
 
 /**
  * Base implementation of {@link HttpClient} that also implements {@link Closeable}.
@@ -89,7 +89,7 @@ public abstract class CloseableHttpClien
 
         final URI requestURI = request.getURI();
         if (requestURI.isAbsolute()) {
-            target = URIUtils.extractHost(requestURI);
+            target = URIUtilsHC4.extractHost(requestURI);
             if (target == null) {
                 throw new ClientProtocolException("URI does not specify a valid host name: "
                         + requestURI);
@@ -219,7 +219,7 @@ public abstract class CloseableHttpClien
         } catch (final Exception t) {
             final HttpEntity entity = response.getEntity();
             try {
-                EntityUtils.consume(entity);
+                EntityUtilsHC4.consume(entity);
             } catch (final Exception t2) {
                 // Log this exception. The original exception is more
                 // important and will be thrown to the caller.
@@ -237,7 +237,7 @@ public abstract class CloseableHttpClien
         // Handling the response was successful. Ensure that the content has
         // been fully consumed.
         final HttpEntity entity = response.getEntity();
-        EntityUtils.consume(entity);
+        EntityUtilsHC4.consume(entity);
         return result;
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/CloseableHttpResponseProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/CloseableHttpResponseProxy.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/CloseableHttpResponseProxy.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/CloseableHttpResponseProxy.java Mon Mar  3 12:10:15 2014
@@ -37,7 +37,7 @@ import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.util.EntityUtils;
+import org.apache.http.util.EntityUtilsHC4;
 
 /**
  * @since 4.3
@@ -54,7 +54,7 @@ class CloseableHttpResponseProxy impleme
 
     public void close() throws IOException {
         final HttpEntity entity = this.original.getEntity();
-        EntityUtils.consume(entity);
+        EntityUtilsHC4.consume(entity);
     }
 
     public Object invoke(

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategyHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategyHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategyHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategyHC4.java Mon Mar  3 12:10:15 2014
@@ -46,9 +46,9 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @Immutable
-public class DefaultConnectionKeepAliveStrategy implements ConnectionKeepAliveStrategy {
+public class DefaultConnectionKeepAliveStrategyHC4 implements ConnectionKeepAliveStrategy {
 
-    public static final DefaultConnectionKeepAliveStrategy INSTANCE = new DefaultConnectionKeepAliveStrategy();
+    public static final DefaultConnectionKeepAliveStrategyHC4 INSTANCE = new DefaultConnectionKeepAliveStrategyHC4();
 
     public long getKeepAliveDuration(final HttpResponse response, final HttpContext context) {
         Args.notNull(response, "HTTP response");

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandlerHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandlerHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandlerHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandlerHC4.java Mon Mar  3 12:10:15 2014
@@ -53,9 +53,9 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @Immutable
-public class DefaultHttpRequestRetryHandler implements HttpRequestRetryHandler {
+public class DefaultHttpRequestRetryHandlerHC4 implements HttpRequestRetryHandler {
 
-    public static final DefaultHttpRequestRetryHandler INSTANCE = new DefaultHttpRequestRetryHandler();
+    public static final DefaultHttpRequestRetryHandlerHC4 INSTANCE = new DefaultHttpRequestRetryHandlerHC4();
 
     /** the number of times a method will be retried */
     private final int retryCount;
@@ -73,7 +73,7 @@ public class DefaultHttpRequestRetryHand
      * @param clazzes the IOException types that should not be retried
      * @since 4.3
      */
-    protected DefaultHttpRequestRetryHandler(
+    protected DefaultHttpRequestRetryHandlerHC4(
             final int retryCount,
             final boolean requestSentRetryEnabled,
             final Collection<Class<? extends IOException>> clazzes) {
@@ -99,7 +99,7 @@ public class DefaultHttpRequestRetryHand
      * @param requestSentRetryEnabled true if it's OK to retry requests that have been sent
      */
     @SuppressWarnings("unchecked")
-    public DefaultHttpRequestRetryHandler(final int retryCount, final boolean requestSentRetryEnabled) {
+    public DefaultHttpRequestRetryHandlerHC4(final int retryCount, final boolean requestSentRetryEnabled) {
         this(retryCount, requestSentRetryEnabled, Arrays.asList(
                 InterruptedIOException.class,
                 UnknownHostException.class,
@@ -117,7 +117,7 @@ public class DefaultHttpRequestRetryHand
      * <li>SSLException</li>
      * </ul>
      */
-    public DefaultHttpRequestRetryHandler() {
+    public DefaultHttpRequestRetryHandlerHC4() {
         this(3, false);
     }
     /**

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java Mon Mar  3 12:10:15 2014
@@ -43,13 +43,13 @@ import org.apache.http.annotation.Immuta
 import org.apache.http.client.CircularRedirectException;
 import org.apache.http.client.RedirectStrategy;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpHead;
+import org.apache.http.client.methods.HttpGetHC4;
+import org.apache.http.client.methods.HttpHeadHC4;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.methods.RequestBuilder;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.client.utils.URIUtils;
+import org.apache.http.client.utils.URIUtilsHC4;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.Args;
 import org.apache.http.util.Asserts;
@@ -86,8 +86,8 @@ public class DefaultRedirectStrategy imp
      * Redirectable methods.
      */
     private static final String[] REDIRECT_METHODS = new String[] {
-        HttpGet.METHOD_NAME,
-        HttpHead.METHOD_NAME
+        HttpGetHC4.METHOD_NAME,
+        HttpHeadHC4.METHOD_NAME
     };
 
     public DefaultRedirectStrategy() {
@@ -156,17 +156,17 @@ public class DefaultRedirectStrategy imp
                 final HttpHost target = clientContext.getTargetHost();
                 Asserts.notNull(target, "Target host");
                 final URI requestURI = new URI(request.getRequestLine().getUri());
-                final URI absoluteRequestURI = URIUtils.rewriteURI(requestURI, target, false);
-                uri = URIUtils.resolve(absoluteRequestURI, uri);
+                final URI absoluteRequestURI = URIUtilsHC4.rewriteURI(requestURI, target, false);
+                uri = URIUtilsHC4.resolve(absoluteRequestURI, uri);
             }
         } catch (final URISyntaxException ex) {
             throw new ProtocolException(ex.getMessage(), ex);
         }
 
-        RedirectLocations redirectLocations = (RedirectLocations) clientContext.getAttribute(
+        RedirectLocationsHC4 redirectLocations = (RedirectLocationsHC4) clientContext.getAttribute(
                 HttpClientContext.REDIRECT_LOCATIONS);
         if (redirectLocations == null) {
-            redirectLocations = new RedirectLocations();
+            redirectLocations = new RedirectLocationsHC4();
             context.setAttribute(HttpClientContext.REDIRECT_LOCATIONS, redirectLocations);
         }
         if (!config.isCircularRedirectsAllowed()) {
@@ -216,16 +216,16 @@ public class DefaultRedirectStrategy imp
             final HttpContext context) throws ProtocolException {
         final URI uri = getLocationURI(request, response, context);
         final String method = request.getRequestLine().getMethod();
-        if (method.equalsIgnoreCase(HttpHead.METHOD_NAME)) {
-            return new HttpHead(uri);
-        } else if (method.equalsIgnoreCase(HttpGet.METHOD_NAME)) {
-            return new HttpGet(uri);
+        if (method.equalsIgnoreCase(HttpHeadHC4.METHOD_NAME)) {
+            return new HttpHeadHC4(uri);
+        } else if (method.equalsIgnoreCase(HttpGetHC4.METHOD_NAME)) {
+            return new HttpGetHC4(uri);
         } else {
             final int status = response.getStatusLine().getStatusCode();
             if (status == HttpStatus.SC_TEMPORARY_REDIRECT) {
                 return RequestBuilder.copy(request).setUri(uri).build();
             } else {
-                return new HttpGet(uri);
+                return new HttpGetHC4(uri);
             }
         }
     }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandlerHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandlerHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandlerHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandlerHC4.java Mon Mar  3 12:10:15 2014
@@ -33,7 +33,7 @@ import javax.net.ssl.SSLSession;
 import org.apache.http.HttpConnection;
 import org.apache.http.annotation.Immutable;
 import org.apache.http.auth.AuthScheme;
-import org.apache.http.auth.AuthState;
+import org.apache.http.auth.AuthStateHC4;
 import org.apache.http.auth.Credentials;
 import org.apache.http.client.UserTokenHandler;
 import org.apache.http.client.protocol.HttpClientContext;
@@ -47,7 +47,7 @@ import org.apache.http.protocol.HttpCont
  * persistent connections created with a particular user identity within
  * a particular security context can be reused by the same user only.
  * <p>
- * DefaultUserTokenHandler will use the user principle of connection
+ * DefaultUserTokenHandlerHC4 will use the user principle of connection
  * based authentication schemes such as NTLM or that of the SSL session
  * with the client authentication turned on. If both are unavailable,
  * <code>null</code> token will be returned.
@@ -55,9 +55,9 @@ import org.apache.http.protocol.HttpCont
  * @since 4.0
  */
 @Immutable
-public class DefaultUserTokenHandler implements UserTokenHandler {
+public class DefaultUserTokenHandlerHC4 implements UserTokenHandler {
 
-    public static final DefaultUserTokenHandler INSTANCE = new DefaultUserTokenHandler();
+    public static final DefaultUserTokenHandlerHC4 INSTANCE = new DefaultUserTokenHandlerHC4();
 
     public Object getUserToken(final HttpContext context) {
 
@@ -65,11 +65,11 @@ public class DefaultUserTokenHandler imp
 
         Principal userPrincipal = null;
 
-        final AuthState targetAuthState = clientContext.getTargetAuthState();
+        final AuthStateHC4 targetAuthState = clientContext.getTargetAuthState();
         if (targetAuthState != null) {
             userPrincipal = getAuthPrincipal(targetAuthState);
             if (userPrincipal == null) {
-                final AuthState proxyAuthState = clientContext.getProxyAuthState();
+                final AuthStateHC4 proxyAuthState = clientContext.getProxyAuthState();
                 userPrincipal = getAuthPrincipal(proxyAuthState);
             }
         }
@@ -87,7 +87,7 @@ public class DefaultUserTokenHandler imp
         return userPrincipal;
     }
 
-    private static Principal getAuthPrincipal(final AuthState authState) {
+    private static Principal getAuthPrincipal(final AuthStateHC4 authState) {
         final AuthScheme scheme = authState.getAuthScheme();
         if (scheme != null && scheme.isComplete() && scheme.isConnectionBased()) {
             final Credentials creds = authState.getCredentials();

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapperHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapperHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapperHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapperHC4.java Mon Mar  3 12:10:15 2014
@@ -36,7 +36,7 @@ import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.ProtocolException;
 import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.entity.HttpEntityWrapper;
+import org.apache.http.entity.HttpEntityWrapperHC4;
 import org.apache.http.protocol.HTTP;
 
 /**
@@ -53,13 +53,13 @@ import org.apache.http.protocol.HTTP;
  */
 @Deprecated
 @NotThreadSafe // e.g. [gs]etEntity()
-public class EntityEnclosingRequestWrapper extends RequestWrapper
+public class EntityEnclosingRequestWrapperHC4 extends RequestWrapper
     implements HttpEntityEnclosingRequest {
 
     private HttpEntity entity;
     private boolean consumed;
 
-    public EntityEnclosingRequestWrapper(final HttpEntityEnclosingRequest request)
+    public EntityEnclosingRequestWrapperHC4(final HttpEntityEnclosingRequest request)
         throws ProtocolException {
         super(request);
         setEntity(request.getEntity());
@@ -84,7 +84,7 @@ public class EntityEnclosingRequestWrapp
         return this.entity == null || this.entity.isRepeatable() || !this.consumed;
     }
 
-    class EntityWrapper extends HttpEntityWrapper {
+    class EntityWrapper extends HttpEntityWrapperHC4 {
 
         EntityWrapper(final HttpEntity entity) {
             super(entity);



Mime
View raw message