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 [3/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-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpResponseParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpResponseParserFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpResponseParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpResponseParserFactory.java Sat Nov 21 16:52:56 2015
@@ -25,17 +25,17 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
-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.message.LazyLaxLineParser;
-import org.apache.http.message.LineParser;
-import org.apache.http.nio.NHttpMessageParser;
-import org.apache.http.nio.NHttpMessageParserFactory;
+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.message.LazyLaxLineParser;
+import org.apache.hc.core5.http.message.LineParser;
+import org.apache.hc.core5.http.nio.NHttpMessageParser;
+import org.apache.hc.core5.http.nio.NHttpMessageParserFactory;
 
 /**
  * Default factory for response message parsers.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpResponseWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpResponseWriter.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpResponseWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpResponseWriter.java Sat Nov 21 16:52:56 2015
@@ -25,17 +25,17 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 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;
 
 /**
- * Default {@link org.apache.http.nio.NHttpMessageWriter} implementation
+ * Default {@link org.apache.hc.core5.http.nio.NHttpMessageWriter} implementation
  * for {@link HttpResponse}s.
  *
  * @since 4.1
@@ -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} will be used.
+     *   {@link org.apache.hc.core5.http.message.BasicLineFormatter#INSTANCE} will be used.
      *
      * @since 4.3
      */

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

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/IdentityDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/IdentityDecoder.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/IdentityDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/IdentityDecoder.java Sat Nov 21 16:52:56 2015
@@ -25,18 +25,18 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.nio.FileContentDecoder;
-import org.apache.http.nio.reactor.SessionInputBuffer;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
+import org.apache.hc.core5.http.nio.FileContentDecoder;
+import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Content decoder that reads data without any transformation. The end of the

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/IdentityEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/IdentityEncoder.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/IdentityEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/IdentityEncoder.java Sat Nov 21 16:52:56 2015
@@ -25,17 +25,17 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.channels.WritableByteChannel;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.nio.FileContentEncoder;
-import org.apache.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
+import org.apache.hc.core5.http.nio.FileContentEncoder;
+import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
 
 /**
  * Content encoder that writes data without any transformation. The end of

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/LengthDelimitedDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/LengthDelimitedDecoder.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/LengthDelimitedDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/LengthDelimitedDecoder.java Sat Nov 21 16:52:56 2015
@@ -25,19 +25,19 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
 
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.nio.FileContentDecoder;
-import org.apache.http.nio.reactor.SessionInputBuffer;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
+import org.apache.hc.core5.http.nio.FileContentDecoder;
+import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Content decoder that cuts off after a defined number of bytes. This class

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/LengthDelimitedEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/LengthDelimitedEncoder.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/LengthDelimitedEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/LengthDelimitedEncoder.java Sat Nov 21 16:52:56 2015
@@ -25,18 +25,18 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.channels.WritableByteChannel;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.nio.FileContentEncoder;
-import org.apache.http.nio.reactor.SessionOutputBuffer;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
+import org.apache.hc.core5.http.nio.FileContentEncoder;
+import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Content encoder that cuts off after a defined number of bytes. This class

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

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

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/pool/BasicNIOConnFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/pool/BasicNIOConnFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/pool/BasicNIOConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/pool/BasicNIOConnFactory.java Sat Nov 21 16:52:56 2015
@@ -24,29 +24,29 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio.pool;
+package org.apache.hc.core5.http.impl.nio.pool;
 
 import java.io.IOException;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory;
-import org.apache.http.impl.nio.SSLNHttpClientConnectionFactory;
-import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.nio.NHttpConnectionFactory;
-import org.apache.http.nio.NHttpMessageParserFactory;
-import org.apache.http.nio.NHttpMessageWriterFactory;
-import org.apache.http.nio.pool.NIOConnFactory;
-import org.apache.http.nio.reactor.IOEventDispatch;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
-import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.impl.nio.DefaultNHttpClientConnectionFactory;
+import org.apache.hc.core5.http.impl.nio.SSLNHttpClientConnectionFactory;
+import org.apache.hc.core5.http.nio.NHttpClientConnection;
+import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
+import org.apache.hc.core5.http.nio.NHttpMessageParserFactory;
+import org.apache.hc.core5.http.nio.NHttpMessageWriterFactory;
+import org.apache.hc.core5.http.nio.pool.NIOConnFactory;
+import org.apache.hc.core5.http.nio.reactor.IOEventDispatch;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.nio.reactor.ssl.SSLSetupHandler;
+import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * A basic {@link NIOConnFactory} implementation that creates

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/pool/BasicNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/pool/BasicNIOConnPool.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/pool/BasicNIOConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/pool/BasicNIOConnPool.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio.pool;
+package org.apache.hc.core5.http.impl.nio.pool;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -32,18 +32,18 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.http.HttpHost;
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.nio.pool.AbstractNIOConnPool;
-import org.apache.http.nio.pool.NIOConnFactory;
-import org.apache.http.nio.pool.SocketAddressResolver;
-import org.apache.http.nio.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.concurrent.FutureCallback;
+import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.nio.NHttpClientConnection;
+import org.apache.hc.core5.http.nio.pool.AbstractNIOConnPool;
+import org.apache.hc.core5.http.nio.pool.NIOConnFactory;
+import org.apache.hc.core5.http.nio.pool.SocketAddressResolver;
+import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
 
 /**
- * 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 non-blocking {@link NHttpClientConnection} 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-nio/src/main/java/org/apache/hc/core5/http/impl/nio/pool/BasicNIOPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/pool/BasicNIOPoolEntry.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/pool/BasicNIOPoolEntry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/pool/BasicNIOPoolEntry.java Sat Nov 21 16:52:56 2015
@@ -24,14 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio.pool;
+package org.apache.hc.core5.http.impl.nio.pool;
 
 import java.io.IOException;
 
-import org.apache.http.HttpHost;
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.pool.PoolEntry;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.nio.NHttpClientConnection;
+import org.apache.hc.core5.http.pool.PoolEntry;
 
 /**
  * A basic {@link PoolEntry} implementation that represents an entry

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

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/AbstractIODispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/AbstractIODispatch.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/AbstractIODispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/AbstractIODispatch.java Sat Nov 21 16:52:56 2015
@@ -25,15 +25,15 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.io.IOException;
 
-import org.apache.http.annotation.Immutable;
-import org.apache.http.nio.reactor.IOEventDispatch;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.ssl.SSLIOSession;
-import org.apache.http.util.Asserts;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.nio.reactor.IOEventDispatch;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.nio.reactor.ssl.SSLIOSession;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
  * Abstract {@link IOEventDispatch} implementation that supports both plain (non-encrypted)

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/AbstractIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/AbstractIOReactor.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/AbstractIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/AbstractIOReactor.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -41,13 +41,13 @@ import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.reactor.IOReactor;
-import org.apache.http.nio.reactor.IOReactorException;
-import org.apache.http.nio.reactor.IOReactorStatus;
-import org.apache.http.nio.reactor.IOSession;
-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.nio.reactor.IOReactor;
+import org.apache.hc.core5.http.nio.reactor.IOReactorException;
+import org.apache.hc.core5.http.nio.reactor.IOReactorStatus;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
  * Generic implementation of {@link IOReactor} that can used as a subclass

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -42,14 +42,14 @@ import java.util.List;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.reactor.IOEventDispatch;
-import org.apache.http.nio.reactor.IOReactor;
-import org.apache.http.nio.reactor.IOReactorException;
-import org.apache.http.nio.reactor.IOReactorExceptionHandler;
-import org.apache.http.nio.reactor.IOReactorStatus;
-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.nio.reactor.IOEventDispatch;
+import org.apache.hc.core5.http.nio.reactor.IOReactor;
+import org.apache.hc.core5.http.nio.reactor.IOReactorException;
+import org.apache.hc.core5.http.nio.reactor.IOReactorExceptionHandler;
+import org.apache.hc.core5.http.nio.reactor.IOReactorStatus;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
  * Generic implementation of {@link IOReactor} that can run multiple

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/BaseIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/BaseIOReactor.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/BaseIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/BaseIOReactor.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.io.InterruptedIOException;
 import java.nio.channels.CancelledKeyException;
@@ -34,17 +34,17 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.reactor.EventMask;
-import org.apache.http.nio.reactor.IOEventDispatch;
-import org.apache.http.nio.reactor.IOReactorException;
-import org.apache.http.nio.reactor.IOReactorExceptionHandler;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.nio.reactor.EventMask;
+import org.apache.hc.core5.http.nio.reactor.IOEventDispatch;
+import org.apache.hc.core5.http.nio.reactor.IOReactorException;
+import org.apache.hc.core5.http.nio.reactor.IOReactorExceptionHandler;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Default implementation of {@link AbstractIOReactor} that serves as a base
- * for more advanced {@link org.apache.http.nio.reactor.IOReactor}
+ * for more advanced {@link org.apache.hc.core5.http.nio.reactor.IOReactor}
  * implementations. This class adds support for the I/O event dispatching
  * using {@link IOEventDispatch}, management of buffering sessions, and
  * session timeout handling.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ChannelEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ChannelEntry.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ChannelEntry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ChannelEntry.java Sat Nov 21 16:52:56 2015
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.nio.channels.SocketChannel;
 
-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;
 
 /**
  * {@link SocketChannel} entry maintained by the I/O reactor. If the channel

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/DefaultConnectingIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/DefaultConnectingIOReactor.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/DefaultConnectingIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/DefaultConnectingIOReactor.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -40,13 +40,13 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ThreadFactory;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.reactor.ConnectingIOReactor;
-import org.apache.http.nio.reactor.IOReactorException;
-import org.apache.http.nio.reactor.IOReactorStatus;
-import org.apache.http.nio.reactor.SessionRequest;
-import org.apache.http.nio.reactor.SessionRequestCallback;
-import org.apache.http.util.Asserts;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.http.nio.reactor.IOReactorException;
+import org.apache.hc.core5.http.nio.reactor.IOReactorStatus;
+import org.apache.hc.core5.http.nio.reactor.SessionRequest;
+import org.apache.hc.core5.http.nio.reactor.SessionRequestCallback;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
  * Default implementation of {@link ConnectingIOReactor}. This class extends

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/DefaultListeningIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/DefaultListeningIOReactor.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/DefaultListeningIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/DefaultListeningIOReactor.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.io.IOException;
 import java.net.ServerSocket;
@@ -42,12 +42,12 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ThreadFactory;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.reactor.IOReactorException;
-import org.apache.http.nio.reactor.IOReactorStatus;
-import org.apache.http.nio.reactor.ListenerEndpoint;
-import org.apache.http.nio.reactor.ListeningIOReactor;
-import org.apache.http.util.Asserts;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.nio.reactor.IOReactorException;
+import org.apache.hc.core5.http.nio.reactor.IOReactorStatus;
+import org.apache.hc.core5.http.nio.reactor.ListenerEndpoint;
+import org.apache.hc.core5.http.nio.reactor.ListeningIOReactor;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
  * Default implementation of {@link ListeningIOReactor}. This class extends

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ExceptionEvent.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ExceptionEvent.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ExceptionEvent.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ExceptionEvent.java Sat Nov 21 16:52:56 2015
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.util.Date;
 
-import org.apache.http.annotation.Immutable;
+import org.apache.hc.core5.http.annotation.Immutable;
 
 /**
  * A {@link Throwable} instance along with a time stamp.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/IOReactorConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/IOReactorConfig.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/IOReactorConfig.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/IOReactorConfig.java Sat Nov 21 16:52:56 2015
@@ -25,10 +25,10 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * I/O reactor configuration parameters.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/IOSessionImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/IOSessionImpl.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/IOSessionImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/IOSessionImpl.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -38,11 +38,11 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.SessionBufferStatus;
-import org.apache.http.nio.reactor.SocketAccessor;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.nio.reactor.SessionBufferStatus;
+import org.apache.hc.core5.http.nio.reactor.SocketAccessor;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Default implementation of {@link IOSession}.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/InterestOpEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/InterestOpEntry.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/InterestOpEntry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/InterestOpEntry.java Sat Nov 21 16:52:56 2015
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.nio.channels.SelectionKey;
 
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Helper class, representing an entry on an {@link java.nio.channels.SelectionKey#interestOps(int)

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/InterestOpsCallback.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/InterestOpsCallback.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/InterestOpsCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/InterestOpsCallback.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 /**
  * Callback interface used internally by I/O session implementations to delegate execution

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ListenerEndpointClosedCallback.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ListenerEndpointClosedCallback.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ListenerEndpointClosedCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ListenerEndpointClosedCallback.java Sat Nov 21 16:52:56 2015
@@ -25,9 +25,9 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
-import org.apache.http.nio.reactor.ListenerEndpoint;
+import org.apache.hc.core5.http.nio.reactor.ListenerEndpoint;
 
 /**
  * Listener endpoint callback interface used internally by I/O reactor

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ListenerEndpointImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ListenerEndpointImpl.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ListenerEndpointImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/ListenerEndpointImpl.java Sat Nov 21 16:52:56 2015
@@ -25,16 +25,16 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.io.IOException;
 import java.net.SocketAddress;
 import java.nio.channels.Channel;
 import java.nio.channels.SelectionKey;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.reactor.ListenerEndpoint;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.nio.reactor.ListenerEndpoint;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Default implementation of {@link ListenerEndpoint}.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionClosedCallback.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionClosedCallback.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionClosedCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionClosedCallback.java Sat Nov 21 16:52:56 2015
@@ -25,9 +25,9 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
-import org.apache.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
 
 /**
  * Session callback interface used internally by I/O reactor implementations.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionInputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionInputBufferImpl.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionInputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionInputBufferImpl.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -36,16 +36,16 @@ import java.nio.charset.Charset;
 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.nio.reactor.SessionInputBuffer;
-import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.nio.util.ExpandableBuffer;
-import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.util.Args;
-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.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.http.nio.util.ExpandableBuffer;
+import org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Default implementation of {@link SessionInputBuffer} based on

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionOutputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionOutputBufferImpl.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionOutputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionOutputBufferImpl.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -37,14 +37,14 @@ import java.nio.charset.Charset;
 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.nio.reactor.SessionOutputBuffer;
-import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.nio.util.ExpandableBuffer;
-import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.util.Args;
-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.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.http.nio.util.ExpandableBuffer;
+import org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Default implementation of {@link SessionOutputBuffer} based on

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionRequestHandle.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionRequestHandle.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionRequestHandle.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionRequestHandle.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
-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;
 
 /**
  * Session request handle class used by I/O reactor implementations to keep
- * a reference to a {@link org.apache.http.nio.reactor.SessionRequest} along
+ * a reference to a {@link org.apache.hc.core5.http.nio.reactor.SessionRequest} along
  * with the time the request was made.
  *
  * @since 4.0

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionRequestImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionRequestImpl.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionRequestImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/SessionRequestImpl.java Sat Nov 21 16:52:56 2015
@@ -25,18 +25,18 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.io.IOException;
 import java.net.SocketAddress;
 import java.nio.channels.Channel;
 import java.nio.channels.SelectionKey;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.SessionRequest;
-import org.apache.http.nio.reactor.SessionRequestCallback;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.nio.reactor.SessionRequest;
+import org.apache.hc.core5.http.nio.reactor.SessionRequestCallback;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Default implementation of {@link SessionRequest}.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/package-info.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/reactor/package-info.java Sat Nov 21 16:52:56 2015
@@ -29,4 +29,4 @@
  * Default implementation of event driven network communication APIs
  * based on Java NIO.
  */
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;

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

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

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

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

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

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

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

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpClientConnection.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpClientConnection.java Sat Nov 21 16:52:56 2015
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.nio;
+package org.apache.hc.core5.http.nio;
 
 import java.io.IOException;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
 
 /**
  * Abstract non-blocking client-side HTTP connection interface. It can be used

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpClientEventHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpClientEventHandler.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpClientEventHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpClientEventHandler.java Sat Nov 21 16:52:56 2015
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.http.nio;
+package org.apache.hc.core5.http.nio;
 
 import java.io.IOException;
 
-import org.apache.http.HttpException;
+import org.apache.hc.core5.http.HttpException;
 
 /**
  * Abstract client-side HTTP protocol handler.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpConnection.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpConnection.java Sat Nov 21 16:52:56 2015
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.nio;
+package org.apache.hc.core5.http.nio;
 
-import org.apache.http.HttpConnection;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpConnection;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * Abstract non-blocking HTTP connection interface. Each connection contains an

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

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParser.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParser.java Sat Nov 21 16:52:56 2015
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.nio;
+package org.apache.hc.core5.http.nio;
 
 import java.io.IOException;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpMessage;
-import org.apache.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpMessage;
+import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
 
 /**
  * Abstract HTTP message parser for non-blocking connections.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParserFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParserFactory.java Sat Nov 21 16:52:56 2015
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.nio;
+package org.apache.hc.core5.http.nio;
 
-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 org.apache.http.nio.NHttpMessageParser} instances.
+ * Factory for {@link org.apache.hc.core5.http.nio.NHttpMessageParser} instances.
  *
  * @since 4.3
  */

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageWriter.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageWriter.java Sat Nov 21 16:52:56 2015
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.nio;
+package org.apache.hc.core5.http.nio;
 
 import java.io.IOException;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpMessage;
-import org.apache.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpMessage;
+import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
 
 /**
  * Abstract HTTP message writer for non-blocking connections.

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

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpServerConnection.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpServerConnection.java Sat Nov 21 16:52:56 2015
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.nio;
+package org.apache.hc.core5.http.nio;
 
 import java.io.IOException;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpResponse;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpResponse;
 
 /**
  * Abstract non-blocking server-side HTTP connection interface. It can be used

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpServerEventHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpServerEventHandler.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpServerEventHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/NHttpServerEventHandler.java Sat Nov 21 16:52:56 2015
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.http.nio;
+package org.apache.hc.core5.http.nio;
 
 import java.io.IOException;
 
-import org.apache.http.HttpException;
+import org.apache.hc.core5.http.HttpException;
 
 /**
  * Abstract server-side HTTP event handler.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/ContentBufferEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/ContentBufferEntity.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/ContentBufferEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/ContentBufferEntity.java Sat Nov 21 16:52:56 2015
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.nio.entity;
+package org.apache.hc.core5.http.nio.entity;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.entity.BasicHttpEntity;
-import org.apache.http.nio.util.ContentInputBuffer;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.entity.BasicHttpEntity;
+import org.apache.hc.core5.http.nio.util.ContentInputBuffer;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * HTTP entity wrapper whose content is provided by a

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/ContentInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/ContentInputStream.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/ContentInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/ContentInputStream.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.nio.entity;
+package org.apache.hc.core5.http.nio.entity;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.nio.util.ContentInputBuffer;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.nio.util.ContentInputBuffer;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * {@link InputStream} adaptor for {@link ContentInputBuffer}.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/ContentOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/ContentOutputStream.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/ContentOutputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/ContentOutputStream.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.nio.entity;
+package org.apache.hc.core5.http.nio.entity;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.nio.util.ContentOutputBuffer;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.nio.util.ContentOutputBuffer;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * {@link OutputStream} adaptor for {@link ContentOutputBuffer}.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/EntityAsyncContentProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/EntityAsyncContentProducer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/EntityAsyncContentProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/EntityAsyncContentProducer.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.entity;
+package org.apache.hc.core5.http.nio.entity;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,11 +33,11 @@ import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Basic implementation of {@link HttpAsyncContentProducer} that relies on

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/HttpAsyncContentProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/HttpAsyncContentProducer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/HttpAsyncContentProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/HttpAsyncContentProducer.java Sat Nov 21 16:52:56 2015
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.nio.entity;
+package org.apache.hc.core5.http.nio.entity;
 
 import java.io.Closeable;
 import java.io.IOException;
 
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
 
 /**
  * {@code HttpAsyncContentProducer} is a callback interface whose methods

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/NByteArrayEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/NByteArrayEntity.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/NByteArrayEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/NByteArrayEntity.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.entity;
+package org.apache.hc.core5.http.nio.entity;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -33,12 +33,12 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.AbstractHttpEntity;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.AbstractHttpEntity;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * A simple self contained, repeatable non-blocking entity that retrieves

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/NFileEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/NFileEntity.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/NFileEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/NFileEntity.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.entity;
+package org.apache.hc.core5.http.nio.entity;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -35,14 +35,14 @@ import java.io.OutputStream;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.AbstractHttpEntity;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.ContentEncoderChannel;
-import org.apache.http.nio.FileContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.AbstractHttpEntity;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.ContentEncoderChannel;
+import org.apache.hc.core5.http.nio.FileContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * A self contained, repeatable non-blocking entity that retrieves its content

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/NStringEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/NStringEntity.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/NStringEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/NStringEntity.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.entity;
+package org.apache.hc.core5.http.nio.entity;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -35,13 +35,13 @@ import java.io.UnsupportedEncodingExcept
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
-import org.apache.http.Consts;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.AbstractHttpEntity;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.AbstractHttpEntity;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * A simple, self contained, repeatable non-blocking entity that retrieves
@@ -86,7 +86,7 @@ public class NStringEntity extends Abstr
      *
      * @param s 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 org.apache.http.Consts#ISO_8859_1} is assumed
+     *   is {@link org.apache.hc.core5.http.Consts#ISO_8859_1} is assumed
      *
      * @throws IllegalArgumentException if the string parameter is null
      *

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/package-info.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/entity/package-info.java Sat Nov 21 16:52:56 2015
@@ -29,4 +29,4 @@
  * Core HTTP entity implementations with support for
  * asynchronous, event driven communication.
  */
-package org.apache.http.nio.entity;
+package org.apache.hc.core5.http.nio.entity;

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

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/AbstractNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/AbstractNIOConnPool.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/AbstractNIOConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/AbstractNIOConnPool.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.pool;
+package org.apache.hc.core5.http.nio.pool;
 
 import java.io.IOException;
 import java.net.SocketAddress;
@@ -43,21 +43,21 @@ import java.util.concurrent.atomic.Atomi
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.concurrent.BasicFuture;
-import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.nio.reactor.ConnectingIOReactor;
-import org.apache.http.nio.reactor.IOReactorStatus;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.SessionRequest;
-import org.apache.http.nio.reactor.SessionRequestCallback;
-import org.apache.http.pool.ConnPool;
-import org.apache.http.pool.ConnPoolControl;
-import org.apache.http.pool.PoolEntry;
-import org.apache.http.pool.PoolEntryCallback;
-import org.apache.http.pool.PoolStats;
-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.BasicFuture;
+import org.apache.hc.core5.http.concurrent.FutureCallback;
+import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.http.nio.reactor.IOReactorStatus;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.nio.reactor.SessionRequest;
+import org.apache.hc.core5.http.nio.reactor.SessionRequestCallback;
+import org.apache.hc.core5.http.pool.ConnPool;
+import org.apache.hc.core5.http.pool.ConnPoolControl;
+import org.apache.hc.core5.http.pool.PoolEntry;
+import org.apache.hc.core5.http.pool.PoolEntryCallback;
+import org.apache.hc.core5.http.pool.PoolStats;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
  * Abstract non-blocking connection pool.

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

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/NIOConnFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/NIOConnFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/NIOConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/NIOConnFactory.java Sat Nov 21 16:52:56 2015
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.http.nio.pool;
+package org.apache.hc.core5.http.nio.pool;
 
 import java.io.IOException;
 
-import org.apache.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
 
 /**
  * Factory for poolable non-blocking connections.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/RouteSpecificPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/RouteSpecificPool.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/RouteSpecificPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/RouteSpecificPool.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.pool;
+package org.apache.hc.core5.http.nio.pool;
 
 import java.net.ConnectException;
 import java.util.HashMap;
@@ -34,12 +34,12 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.concurrent.BasicFuture;
-import org.apache.http.nio.reactor.SessionRequest;
-import org.apache.http.pool.PoolEntry;
-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.concurrent.BasicFuture;
+import org.apache.hc.core5.http.nio.reactor.SessionRequest;
+import org.apache.hc.core5.http.pool.PoolEntry;
+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-nio/src/main/java/org/apache/hc/core5/http/nio/pool/SocketAddressResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/SocketAddressResolver.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/SocketAddressResolver.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/pool/SocketAddressResolver.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.pool;
+package org.apache.hc.core5.http.nio.pool;
 
 import java.io.IOException;
 import java.net.SocketAddress;

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