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 2015/11/21 17:53:03 UTC

svn commit: r1715545 [8/10] - in /httpcomponents/httpcore/trunk: httpcore-ab/ httpcore-ab/src/main/java/org/apache/hc/ httpcore-ab/src/main/java/org/apache/hc/core5/ httpcore-ab/src/main/java/org/apache/hc/core5/http/ httpcore-ab/src/main/java/org/apac...

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/ContentLengthOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/ContentLengthOutputStream.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/ContentLengthOutputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/ContentLengthOutputStream.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.io.SessionOutputBuffer;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.io.SessionOutputBuffer;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Output stream that cuts off after a defined number of bytes. This class

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParser.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParser.java Sat Nov 21 16:52:56 2015
@@ -25,27 +25,27 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestFactory;
-import org.apache.http.HttpVersion;
-import org.apache.http.ProtocolVersion;
-import org.apache.http.RequestLine;
-import org.apache.http.UnsupportedHttpVersionException;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.impl.DefaultHttpRequestFactory;
-import org.apache.http.message.LineParser;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestFactory;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.ProtocolVersion;
+import org.apache.hc.core5.http.RequestLine;
+import org.apache.hc.core5.http.UnsupportedHttpVersionException;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.impl.DefaultHttpRequestFactory;
+import org.apache.hc.core5.http.message.LineParser;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * HTTP request parser that obtain its input from an instance
- * of {@link org.apache.http.io.SessionInputBuffer}.
+ * of {@link org.apache.hc.core5.http.io.SessionInputBuffer}.
  *
  * @since 4.2
  */
@@ -58,7 +58,7 @@ public class DefaultHttpRequestParser ex
      * Creates new instance of DefaultHttpRequestParser.
      *
      * @param lineParser the line parser. If {@code null}
-     *   {@link org.apache.http.message.LazyLineParser#INSTANCE} will be used.
+     *   {@link org.apache.hc.core5.http.message.LazyLineParser#INSTANCE} will be used.
      * @param requestFactory the response factory. If {@code null}
      *   {@link DefaultHttpRequestFactory#INSTANCE} will be used.
      * @param constraints the message constraints. If {@code null}

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParserFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParserFactory.java Sat Nov 21 16:52:56 2015
@@ -25,17 +25,17 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestFactory;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.impl.DefaultHttpRequestFactory;
-import org.apache.http.io.HttpMessageParser;
-import org.apache.http.io.HttpMessageParserFactory;
-import org.apache.http.message.LazyLineParser;
-import org.apache.http.message.LineParser;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestFactory;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.impl.DefaultHttpRequestFactory;
+import org.apache.hc.core5.http.io.HttpMessageParser;
+import org.apache.hc.core5.http.io.HttpMessageParserFactory;
+import org.apache.hc.core5.http.message.LazyLineParser;
+import org.apache.hc.core5.http.message.LineParser;
 
 /**
  * Default factory for request message parsers.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriter.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriter.java Sat Nov 21 16:52:56 2015
@@ -25,18 +25,18 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 
-import org.apache.http.HttpRequest;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.message.LineFormatter;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.message.LineFormatter;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * HTTP request writer that serializes its output to an instance of
- * {@link org.apache.http.io.SessionOutputBuffer}.
+ * {@link org.apache.hc.core5.http.io.SessionOutputBuffer}.
  *
  * @since 4.3
  */
@@ -47,7 +47,7 @@ public class DefaultHttpRequestWriter ex
      * Creates an instance of DefaultHttpRequestWriter.
      *
      * @param formatter the line formatter If {@code null}
-     *   {@link org.apache.http.message.BasicLineFormatter#INSTANCE}
+     *   {@link org.apache.hc.core5.http.message.BasicLineFormatter#INSTANCE}
      *   will be used.
      */
     public DefaultHttpRequestWriter(final LineFormatter formatter) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriterFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriterFactory.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
-import org.apache.http.HttpRequest;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.io.HttpMessageWriter;
-import org.apache.http.io.HttpMessageWriterFactory;
-import org.apache.http.message.BasicLineFormatter;
-import org.apache.http.message.LineFormatter;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.io.HttpMessageWriter;
+import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
+import org.apache.hc.core5.http.message.BasicLineFormatter;
+import org.apache.hc.core5.http.message.LineFormatter;
 
 /**
  * Default factory for request message writers.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParser.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParser.java Sat Nov 21 16:52:56 2015
@@ -25,27 +25,27 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseFactory;
-import org.apache.http.HttpVersion;
-import org.apache.http.NoHttpResponseException;
-import org.apache.http.ProtocolVersion;
-import org.apache.http.StatusLine;
-import org.apache.http.UnsupportedHttpVersionException;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.message.LineParser;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpResponseFactory;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.NoHttpResponseException;
+import org.apache.hc.core5.http.ProtocolVersion;
+import org.apache.hc.core5.http.StatusLine;
+import org.apache.hc.core5.http.UnsupportedHttpVersionException;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
+import org.apache.hc.core5.http.message.LineParser;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * HTTP response parser that obtain its input from an instance
- * of {@link org.apache.http.io.SessionInputBuffer}.
+ * of {@link org.apache.hc.core5.http.io.SessionInputBuffer}.
  *
  * @since 4.2
  */
@@ -58,7 +58,7 @@ public class DefaultHttpResponseParser e
      * Creates new instance of DefaultHttpResponseParser.
      *
      * @param lineParser the line parser. If {@code null}
-     *   {@link org.apache.http.message.LazyLineParser#INSTANCE} will be used
+     *   {@link org.apache.hc.core5.http.message.LazyLineParser#INSTANCE} will be used
      * @param responseFactory the response factory. If {@code null}
      *   {@link DefaultHttpResponseFactory#INSTANCE} will be used.
      * @param constraints the message constraints. If {@code null}

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParserFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParserFactory.java Sat Nov 21 16:52:56 2015
@@ -25,17 +25,17 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseFactory;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.io.HttpMessageParser;
-import org.apache.http.io.HttpMessageParserFactory;
-import org.apache.http.message.LazyLaxLineParser;
-import org.apache.http.message.LineParser;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpResponseFactory;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
+import org.apache.hc.core5.http.io.HttpMessageParser;
+import org.apache.hc.core5.http.io.HttpMessageParserFactory;
+import org.apache.hc.core5.http.message.LazyLaxLineParser;
+import org.apache.hc.core5.http.message.LineParser;
 
 /**
  * Default factory for response message parsers.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriter.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriter.java Sat Nov 21 16:52:56 2015
@@ -25,18 +25,18 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.message.LineFormatter;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.message.LineFormatter;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * HTTP response writer that serializes its output to an instance of
- * {@link org.apache.http.io.SessionOutputBuffer}.
+ * {@link org.apache.hc.core5.http.io.SessionOutputBuffer}.
  *
  * @since 4.3
  */
@@ -47,7 +47,7 @@ public class DefaultHttpResponseWriter e
      * Creates an instance of DefaultHttpResponseWriter.
      *
      * @param formatter the line formatter If {@code null}
-     *  {@link org.apache.http.message.BasicLineFormatter#INSTANCE}
+     *  {@link org.apache.hc.core5.http.message.BasicLineFormatter#INSTANCE}
      *   will be used.
      */
     public DefaultHttpResponseWriter(final LineFormatter formatter) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriterFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriterFactory.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.io.HttpMessageWriter;
-import org.apache.http.io.HttpMessageWriterFactory;
-import org.apache.http.message.BasicLineFormatter;
-import org.apache.http.message.LineFormatter;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.io.HttpMessageWriter;
+import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
+import org.apache.hc.core5.http.message.BasicLineFormatter;
+import org.apache.hc.core5.http.message.LineFormatter;
 
 /**
  * Default factory for response message writers.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/EmptyInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/EmptyInputStream.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/EmptyInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/EmptyInputStream.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.InputStream;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpTransportMetricsImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpTransportMetricsImpl.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpTransportMetricsImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpTransportMetricsImpl.java Sat Nov 21 16:52:56 2015
@@ -25,10 +25,10 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.io.HttpTransportMetrics;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.io.HttpTransportMetrics;
 
 /**
  * Default implementation of {@link HttpTransportMetrics}.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/IdentityInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/IdentityInputStream.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/IdentityInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/IdentityInputStream.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.io.SessionInputBuffer;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.io.SessionInputBuffer;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Input stream that reads data without any transformation. The end of the

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/IdentityOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/IdentityOutputStream.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/IdentityOutputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/IdentityOutputStream.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.io.SessionOutputBuffer;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.io.SessionOutputBuffer;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Output stream that writes data without any transformation. The end of

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionInputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionInputBufferImpl.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionInputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionInputBufferImpl.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,16 +34,16 @@ import java.nio.CharBuffer;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CoderResult;
 
-import org.apache.http.Consts;
-import org.apache.http.MessageConstraintException;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.io.HttpTransportMetrics;
-import org.apache.http.io.SessionInputBuffer;
-import org.apache.http.util.Args;
-import org.apache.http.util.Asserts;
-import org.apache.http.util.ByteArrayBuffer;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.MessageConstraintException;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.io.HttpTransportMetrics;
+import org.apache.hc.core5.http.io.SessionInputBuffer;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.Asserts;
+import org.apache.hc.core5.http.util.ByteArrayBuffer;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Abstract base class for session input buffers that stream data from

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferImpl.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferImpl.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -34,14 +34,14 @@ import java.nio.CharBuffer;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CoderResult;
 
-import org.apache.http.Consts;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.io.HttpTransportMetrics;
-import org.apache.http.io.SessionOutputBuffer;
-import org.apache.http.util.Args;
-import org.apache.http.util.Asserts;
-import org.apache.http.util.ByteArrayBuffer;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.io.HttpTransportMetrics;
+import org.apache.hc.core5.http.io.SessionOutputBuffer;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.Asserts;
+import org.apache.hc.core5.http.util.ByteArrayBuffer;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Abstract base class for session output buffers that stream data to

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/package-info.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/package-info.java Sat Nov 21 16:52:56 2015
@@ -29,4 +29,4 @@
  * Default implementations of message parses and writers
  * for synchronous, blocking communication.
  */
-package org.apache.http.impl.io;
+package org.apache.hc.core5.http.impl.io;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/package-info.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/package-info.java Sat Nov 21 16:52:56 2015
@@ -29,4 +29,4 @@
  * Default implementations of HTTP connections for synchronous,
  * blocking communication.
  */
-package org.apache.http.impl;
+package org.apache.hc.core5.http.impl;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnFactory.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.pool;
+package org.apache.hc.core5.http.impl.pool;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -33,14 +33,14 @@ import java.net.Socket;
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLSocketFactory;
 
-import org.apache.http.HttpClientConnection;
-import org.apache.http.HttpConnectionFactory;
-import org.apache.http.HttpHost;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.config.SocketConfig;
-import org.apache.http.impl.DefaultBHttpClientConnectionFactory;
-import org.apache.http.pool.ConnFactory;
+import org.apache.hc.core5.http.HttpClientConnection;
+import org.apache.hc.core5.http.HttpConnectionFactory;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.config.SocketConfig;
+import org.apache.hc.core5.http.impl.DefaultBHttpClientConnectionFactory;
+import org.apache.hc.core5.http.pool.ConnFactory;
 
 /**
  * A very basic {@link ConnFactory} implementation that creates

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnPool.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnPool.java Sat Nov 21 16:52:56 2015
@@ -24,20 +24,20 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.pool;
+package org.apache.hc.core5.http.impl.pool;
 
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.http.HttpClientConnection;
-import org.apache.http.HttpHost;
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.config.SocketConfig;
-import org.apache.http.pool.AbstractConnPool;
-import org.apache.http.pool.ConnFactory;
+import org.apache.hc.core5.http.HttpClientConnection;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.config.SocketConfig;
+import org.apache.hc.core5.http.pool.AbstractConnPool;
+import org.apache.hc.core5.http.pool.ConnFactory;
 
 /**
- * A very basic {@link org.apache.http.pool.ConnPool} implementation that
+ * A very basic {@link org.apache.hc.core5.http.pool.ConnPool} implementation that
  * represents a pool of blocking {@link HttpClientConnection} connections
  * identified by an {@link HttpHost} instance. Please note this pool
  * implementation does not support complex routes via a proxy cannot

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicPoolEntry.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicPoolEntry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicPoolEntry.java Sat Nov 21 16:52:56 2015
@@ -24,14 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.pool;
+package org.apache.hc.core5.http.impl.pool;
 
 import java.io.IOException;
 
-import org.apache.http.HttpClientConnection;
-import org.apache.http.HttpHost;
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.pool.PoolEntry;
+import org.apache.hc.core5.http.HttpClientConnection;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.pool.PoolEntry;
 
 /**
  * A very basic {@link PoolEntry} implementation that represents an entry

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/package-info.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/package-info.java Sat Nov 21 16:52:56 2015
@@ -29,4 +29,4 @@
  * Default implementations of client side connection pools
  * for synchronous, blocking communication.
  */
-package org.apache.http.impl.pool;
+package org.apache.hc.core5.http.impl.pool;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageParser.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageParser.java Sat Nov 21 16:52:56 2015
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.io;
+package org.apache.hc.core5.http.io;
 
 import java.io.IOException;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpMessage;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpMessage;
 
 /**
  * Abstract message parser intended to build HTTP messages from an arbitrary data source.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageParserFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageParserFactory.java Sat Nov 21 16:52:56 2015
@@ -25,10 +25,10 @@
  *
  */
 
-package org.apache.http.io;
+package org.apache.hc.core5.http.io;
 
-import org.apache.http.HttpMessage;
-import org.apache.http.config.MessageConstraints;
+import org.apache.hc.core5.http.HttpMessage;
+import org.apache.hc.core5.http.config.MessageConstraints;
 
 /**
  * Factory for {@link HttpMessageParser} instances.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriter.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriter.java Sat Nov 21 16:52:56 2015
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.io;
+package org.apache.hc.core5.http.io;
 
 import java.io.IOException;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpMessage;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpMessage;
 
 /**
  * Abstract message writer intended to serialize HTTP messages to an arbitrary

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriterFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriterFactory.java Sat Nov 21 16:52:56 2015
@@ -25,9 +25,9 @@
  *
  */
 
-package org.apache.http.io;
+package org.apache.hc.core5.http.io;
 
-import org.apache.http.HttpMessage;
+import org.apache.hc.core5.http.HttpMessage;
 
 /**
  * Factory for {@link HttpMessageWriter} instances.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpTransportMetrics.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpTransportMetrics.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpTransportMetrics.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpTransportMetrics.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.io;
+package org.apache.hc.core5.http.io;
 
 /**
  * The point of access to the statistics of {@link SessionInputBuffer} or

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/SessionInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/SessionInputBuffer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/SessionInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/SessionInputBuffer.java Sat Nov 21 16:52:56 2015
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.http.io;
+package org.apache.hc.core5.http.io;
 
 import java.io.IOException;
 
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Session input buffer for blocking connections. This interface is similar to

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/SessionOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/SessionOutputBuffer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/SessionOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/SessionOutputBuffer.java Sat Nov 21 16:52:56 2015
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.http.io;
+package org.apache.hc.core5.http.io;
 
 import java.io.IOException;
 
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Session output buffer for blocking connections. This interface is similar to

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/package-info.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/package-info.java Sat Nov 21 16:52:56 2015
@@ -29,4 +29,4 @@
  * HTTP message parser and writer APIs for synchronous, blocking
  * communication.
  */
-package org.apache.http.io;
+package org.apache.hc.core5.http.io;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/AbstractHeaderElementIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/AbstractHeaderElementIterator.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/AbstractHeaderElementIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/AbstractHeaderElementIterator.java Sat Nov 21 16:52:56 2015
@@ -25,18 +25,18 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.http.FormattedHeader;
-import org.apache.http.Header;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.FormattedHeader;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.util.Args;
 
 /**
- * {@link java.util.Iterator} of {@link org.apache.http.HeaderElement}s.
+ * {@link java.util.Iterator} of {@link org.apache.hc.core5.http.HeaderElement}s.
  *
  * @since 5.0
  */

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/AbstractHttpMessage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/AbstractHttpMessage.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/AbstractHttpMessage.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/AbstractHttpMessage.java Sat Nov 21 16:52:56 2015
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpMessage;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpMessage;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Basic implementation of {@link HttpMessage}.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeader.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeader.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeader.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeader.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.io.Serializable;
 
-import org.apache.http.Header;
-import org.apache.http.HeaderElement;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HeaderElement;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Basic implementation of {@link Header}.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderElement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderElement.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderElement.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderElement.java Sat Nov 21 16:52:56 2015
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
-import org.apache.http.HeaderElement;
-import org.apache.http.NameValuePair;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.HeaderElement;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Basic implementation of {@link HeaderElement}

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderElementIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderElementIterator.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderElementIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderElementIterator.java Sat Nov 21 16:52:56 2015
@@ -25,17 +25,17 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.util.Iterator;
 
-import org.apache.http.Header;
-import org.apache.http.HeaderElement;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HeaderElement;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.util.Args;
 
 /**
- * {@link java.util.Iterator} of {@link org.apache.http.HeaderElement}s.
+ * {@link java.util.Iterator} of {@link org.apache.hc.core5.http.HeaderElement}s.
  *
  * @since 4.0
  */

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderIterator.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderIterator.java Sat Nov 21 16:52:56 2015
@@ -25,17 +25,17 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.http.Header;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.util.Args;
 
 /**
- * {@link java.util.Iterator} of {@link org.apache.http.Header}s.
+ * {@link java.util.Iterator} of {@link org.apache.hc.core5.http.Header}s.
  *
  * @since 4.0
  */

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderValueFormatter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderValueFormatter.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderValueFormatter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderValueFormatter.java Sat Nov 21 16:52:56 2015
@@ -25,16 +25,16 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
-import org.apache.http.HeaderElement;
-import org.apache.http.NameValuePair;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.util.Args;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.HeaderElement;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
- * Default {@link org.apache.http.message.HeaderValueFormatter} implementation.
+ * Default {@link org.apache.hc.core5.http.message.HeaderValueFormatter} implementation.
  *
  * @since 4.0
  */

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderValueParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderValueParser.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderValueParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHeaderValueParser.java Sat Nov 21 16:52:56 2015
@@ -25,19 +25,19 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.List;
 
-import org.apache.http.HeaderElement;
-import org.apache.http.NameValuePair;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.HeaderElement;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.util.Args;
 
 /**
- * Default {@link org.apache.http.message.HeaderValueParser} implementation.
+ * Default {@link org.apache.hc.core5.http.message.HeaderValueParser} implementation.
  *
  * @since 4.0
  */

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHttpRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHttpRequest.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHttpRequest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHttpRequest.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpVersion;
-import org.apache.http.ProtocolVersion;
-import org.apache.http.RequestLine;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.ProtocolVersion;
+import org.apache.hc.core5.http.RequestLine;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Basic implementation of {@link HttpRequest}.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHttpResponse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHttpResponse.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHttpResponse.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicHttpResponse.java Sat Nov 21 16:52:56 2015
@@ -25,22 +25,22 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.util.Locale;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpVersion;
-import org.apache.http.ProtocolVersion;
-import org.apache.http.ReasonPhraseCatalog;
-import org.apache.http.StatusLine;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.ProtocolVersion;
+import org.apache.hc.core5.http.ReasonPhraseCatalog;
+import org.apache.hc.core5.http.StatusLine;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Basic implementation of {@link HttpResponse}.
  *
- * @see org.apache.http.impl.DefaultHttpResponseFactory
+ * @see org.apache.hc.core5.http.impl.DefaultHttpResponseFactory
  *
  * @since 4.0
  */

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicLineFormatter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicLineFormatter.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicLineFormatter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicLineFormatter.java Sat Nov 21 16:52:56 2015
@@ -25,18 +25,18 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
-import org.apache.http.Header;
-import org.apache.http.ProtocolVersion;
-import org.apache.http.RequestLine;
-import org.apache.http.StatusLine;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.util.Args;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.ProtocolVersion;
+import org.apache.hc.core5.http.RequestLine;
+import org.apache.hc.core5.http.StatusLine;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
- * Default {@link org.apache.http.message.LineFormatter} implementation.
+ * Default {@link org.apache.hc.core5.http.message.LineFormatter} implementation.
  *
  * @since 4.0
  */

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicLineParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicLineParser.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicLineParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicLineParser.java Sat Nov 21 16:52:56 2015
@@ -25,23 +25,23 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.util.BitSet;
 
-import org.apache.http.Header;
-import org.apache.http.HttpVersion;
-import org.apache.http.ParseException;
-import org.apache.http.ProtocolVersion;
-import org.apache.http.RequestLine;
-import org.apache.http.StatusLine;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.util.Args;
-import org.apache.http.util.CharArrayBuffer;
-import org.apache.http.util.TextUtils;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.ProtocolVersion;
+import org.apache.hc.core5.http.RequestLine;
+import org.apache.hc.core5.http.StatusLine;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.util.TextUtils;
 
 /**
- * Default {@link org.apache.http.message.LineParser} implementation.
+ * Default {@link org.apache.hc.core5.http.message.LineParser} implementation.
  *
  * @since 4.0
  */

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicListHeaderIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicListHeaderIterator.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicListHeaderIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicListHeaderIterator.java Sat Nov 21 16:52:56 2015
@@ -25,19 +25,19 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import org.apache.http.Header;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.util.Args;
-import org.apache.http.util.Asserts;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
- * {@link java.util.Iterator} of {@link org.apache.http.Header}s. For use by {@link HeaderGroup}.
+ * {@link java.util.Iterator} of {@link org.apache.hc.core5.http.Header}s. For use by {@link HeaderGroup}.
  *
  * @since 4.0
  */

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicNameValuePair.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicNameValuePair.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicNameValuePair.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicNameValuePair.java Sat Nov 21 16:52:56 2015
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.io.Serializable;
 
-import org.apache.http.NameValuePair;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Basic implementation of {@link NameValuePair}.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicRequestLine.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicRequestLine.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicRequestLine.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicRequestLine.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.io.Serializable;
 
-import org.apache.http.ProtocolVersion;
-import org.apache.http.RequestLine;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.ProtocolVersion;
+import org.apache.hc.core5.http.RequestLine;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Basic implementation of {@link RequestLine}.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicStatusLine.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicStatusLine.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicStatusLine.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicStatusLine.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.io.Serializable;
 
-import org.apache.http.ProtocolVersion;
-import org.apache.http.StatusLine;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.ProtocolVersion;
+import org.apache.hc.core5.http.StatusLine;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Basic implementation of {@link StatusLine}

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicTokenIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicTokenIterator.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicTokenIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BasicTokenIterator.java Sat Nov 21 16:52:56 2015
@@ -25,17 +25,17 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.util.BitSet;
 import java.util.Iterator;
 
-import org.apache.http.Header;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.util.TextUtils;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.util.TextUtils;
 
 /**
- * {@link java.util.Iterator} of {@link org.apache.http.Header} tokens..
+ * {@link java.util.Iterator} of {@link org.apache.hc.core5.http.Header} tokens..
  *
  * @since 4.0
  */

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BufferedHeader.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BufferedHeader.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BufferedHeader.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/BufferedHeader.java Sat Nov 21 16:52:56 2015
@@ -25,16 +25,16 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.io.Serializable;
 
-import org.apache.http.FormattedHeader;
-import org.apache.http.HeaderElement;
-import org.apache.http.ParseException;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.util.Args;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.FormattedHeader;
+import org.apache.hc.core5.http.HeaderElement;
+import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * This class represents a raw HTTP header whose content is parsed 'on demand'

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -34,9 +34,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 
-import org.apache.http.Header;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * A class for combining a set of headers.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/HeaderValueFormatter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/HeaderValueFormatter.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/HeaderValueFormatter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/HeaderValueFormatter.java Sat Nov 21 16:52:56 2015
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
-import org.apache.http.HeaderElement;
-import org.apache.http.NameValuePair;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.HeaderElement;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Interface for formatting elements of a header value.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/HeaderValueParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/HeaderValueParser.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/HeaderValueParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/HeaderValueParser.java Sat Nov 21 16:52:56 2015
@@ -25,10 +25,10 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
-import org.apache.http.HeaderElement;
-import org.apache.http.NameValuePair;
+import org.apache.hc.core5.http.HeaderElement;
+import org.apache.hc.core5.http.NameValuePair;
 
 /**
  * Interface for parsing header values into elements.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LazyLaxLineParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LazyLaxLineParser.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LazyLaxLineParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LazyLaxLineParser.java Sat Nov 21 16:52:56 2015
@@ -25,18 +25,18 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
-import org.apache.http.Header;
-import org.apache.http.ParseException;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.util.Args;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
- * Extension of {@link org.apache.http.message.BasicLineParser} that defers parsing of
+ * Extension of {@link org.apache.hc.core5.http.message.BasicLineParser} that defers parsing of
  * header values. Header value is parsed only if accessed with
- * {@link org.apache.http.Header#getValue()} or {@link org.apache.http.Header#getElements()}
+ * {@link org.apache.hc.core5.http.Header#getValue()} or {@link org.apache.hc.core5.http.Header#getElements()}
  * methods.
  * <p>
  * This parser unlike {@link BasicLineParser} and {@link LazyLineParser}

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LazyLineParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LazyLineParser.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LazyLineParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LazyLineParser.java Sat Nov 21 16:52:56 2015
@@ -25,18 +25,18 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
-import org.apache.http.Header;
-import org.apache.http.ParseException;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.util.Args;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
- * Extension of {@link org.apache.http.message.BasicLineParser} that defers parsing of
+ * Extension of {@link org.apache.hc.core5.http.message.BasicLineParser} that defers parsing of
  * header values. Header value is parsed only if accessed with
- * {@link org.apache.http.Header#getValue()} or {@link org.apache.http.Header#getElements()}
+ * {@link org.apache.hc.core5.http.Header#getValue()} or {@link org.apache.hc.core5.http.Header#getElements()}
  * methods.
  * <p>
  * This parser should be used to parse request messages on the server server.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LineFormatter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LineFormatter.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LineFormatter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LineFormatter.java Sat Nov 21 16:52:56 2015
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
-import org.apache.http.Header;
-import org.apache.http.RequestLine;
-import org.apache.http.StatusLine;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.RequestLine;
+import org.apache.hc.core5.http.StatusLine;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Interface for formatting elements of the HEAD section of an HTTP message.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LineParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LineParser.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LineParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/LineParser.java Sat Nov 21 16:52:56 2015
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
-import org.apache.http.Header;
-import org.apache.http.ParseException;
-import org.apache.http.RequestLine;
-import org.apache.http.StatusLine;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.RequestLine;
+import org.apache.hc.core5.http.StatusLine;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Interface for parsing lines in the HEAD section of an HTTP message.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/ParserCursor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/ParserCursor.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/ParserCursor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/ParserCursor.java Sat Nov 21 16:52:56 2015
@@ -25,9 +25,9 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
-import org.apache.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
 
 /**
  * This class represents a context of a parsing operation:

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/TokenParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/TokenParser.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/TokenParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/TokenParser.java Sat Nov 21 16:52:56 2015
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;
 
 import java.util.BitSet;
 
-import org.apache.http.annotation.Immutable;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Low level parser for header field elements. The parsing routines of this class are designed

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/package-info.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/message/package-info.java Sat Nov 21 16:52:56 2015
@@ -29,4 +29,4 @@
  * Core HTTP message components, message element parser
  * and writer APIs and their default implementations.
  */
-package org.apache.http.message;
+package org.apache.hc.core5.http.message;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/package-info.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/package-info.java Sat Nov 21 16:52:56 2015
@@ -30,14 +30,14 @@
  * <p>
  * These deal with the fundamental things required for using the
  * HTTP protocol, such as representing a
- * {@link org.apache.http.HttpMessage message} including it's
- * {@link org.apache.http.Header headers} and optional
- * {@link org.apache.http.HttpEntity entity}, and
- * {@link org.apache.http.HttpConnection connections}
+ * {@link org.apache.hc.core5.http.HttpMessage message} including it's
+ * {@link org.apache.hc.core5.http.Header headers} and optional
+ * {@link org.apache.hc.core5.http.HttpEntity entity}, and
+ * {@link org.apache.hc.core5.http.HttpConnection connections}
  * over which messages are sent. In order to prepare messages
  * before sending or after receiving, there are interceptors for
- * {@link org.apache.http.HttpRequestInterceptor requests} and
- * {@link org.apache.http.HttpResponseInterceptor responses}.
+ * {@link org.apache.hc.core5.http.HttpRequestInterceptor requests} and
+ * {@link org.apache.hc.core5.http.HttpResponseInterceptor responses}.
  * </p>
  */
-package org.apache.http;
+package org.apache.hc.core5.http;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/AbstractConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/AbstractConnPool.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/AbstractConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/AbstractConnPool.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.pool;
+package org.apache.hc.core5.http.pool;
 
 import java.io.IOException;
 import java.util.Date;
@@ -40,10 +40,10 @@ import java.util.concurrent.TimeoutExcep
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.util.Args;
-import org.apache.http.util.Asserts;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.concurrent.FutureCallback;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
  * Abstract synchronous (blocking) pool of connections.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnFactory.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.pool;
+package org.apache.hc.core5.http.pool;
 
 import java.io.IOException;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPool.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPool.java Sat Nov 21 16:52:56 2015
@@ -24,11 +24,11 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.pool;
+package org.apache.hc.core5.http.pool;
 
 import java.util.concurrent.Future;
 
-import org.apache.http.concurrent.FutureCallback;
+import org.apache.hc.core5.http.concurrent.FutureCallback;
 
 /**
  * {@code ConnPool} represents a shared pool connections can be leased from

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPoolControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPoolControl.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPoolControl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPoolControl.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.pool;
+package org.apache.hc.core5.http.pool;
 
 /**
  * Interface to control runtime properties of a {@link ConnPool} such as

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntry.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntry.java Sat Nov 21 16:52:56 2015
@@ -24,13 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.pool;
+package org.apache.hc.core5.http.pool;
 
 import java.util.concurrent.TimeUnit;
 
-import org.apache.http.annotation.GuardedBy;
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.GuardedBy;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Pool entry containing a pool connection object along with its route.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryCallback.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryCallback.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryCallback.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.pool;
+package org.apache.hc.core5.http.pool;
 
 /**
  * Pool entry callabck.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryFuture.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryFuture.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryFuture.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryFuture.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.pool;
+package org.apache.hc.core5.http.pool;
 
 import java.io.IOException;
 import java.util.Date;
@@ -35,9 +35,9 @@ import java.util.concurrent.TimeoutExcep
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.concurrent.FutureCallback;
+import org.apache.hc.core5.http.util.Args;
 
 @ThreadSafe
 abstract class PoolEntryFuture<T> implements Future<T> {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolStats.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolStats.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolStats.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolStats.java Sat Nov 21 16:52:56 2015
@@ -24,11 +24,11 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.pool;
+package org.apache.hc.core5.http.pool;
 
 import java.io.Serializable;
 
-import org.apache.http.annotation.Immutable;
+import org.apache.hc.core5.http.annotation.Immutable;
 
 /**
  * Pool statistics.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/RouteSpecificPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/RouteSpecificPool.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/RouteSpecificPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/RouteSpecificPool.java Sat Nov 21 16:52:56 2015
@@ -24,16 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.pool;
+package org.apache.hc.core5.http.pool;
 
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Set;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.util.Args;
-import org.apache.http.util.Asserts;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.Asserts;
 
 @NotThreadSafe
 abstract class RouteSpecificPool<T, C, E extends PoolEntry<T, C>> {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/package-info.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/package-info.java Sat Nov 21 16:52:56 2015
@@ -29,4 +29,4 @@
  * Client side connection pools APIs for synchronous, blocking
  * communication.
  */
-package org.apache.http.pool;
+package org.apache.hc.core5.http.pool;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/BasicHttpContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/BasicHttpContext.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/BasicHttpContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/BasicHttpContext.java Sat Nov 21 16:52:56 2015
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.protocol;
+package org.apache.hc.core5.http.protocol;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Default implementation of {@link HttpContext}.