hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1715545 [2/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...
Date Sat, 21 Nov 2015 16:53:03 GMT
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/ElementalEchoServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/ElementalEchoServer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/ElementalEchoServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/ElementalEchoServer.java Sat Nov 21 16:52:56 2015
@@ -24,18 +24,18 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.examples.nio;
+package org.apache.hc.core5.http.examples.nio;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 
-import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor;
-import org.apache.http.nio.reactor.EventMask;
-import org.apache.http.nio.reactor.IOEventDispatch;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.ListeningIOReactor;
+import org.apache.hc.core5.http.impl.nio.reactor.DefaultListeningIOReactor;
+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.IOSession;
+import org.apache.hc.core5.http.nio.reactor.ListeningIOReactor;
 
 public class ElementalEchoServer {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/NHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/NHttpClient.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/NHttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/NHttpClient.java Sat Nov 21 16:52:56 2015
@@ -24,34 +24,34 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.examples.nio;
+package org.apache.hc.core5.http.examples.nio;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.impl.nio.DefaultHttpClientIODispatch;
-import org.apache.http.impl.nio.pool.BasicNIOConnPool;
-import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.nio.protocol.BasicAsyncRequestProducer;
-import org.apache.http.nio.protocol.BasicAsyncResponseConsumer;
-import org.apache.http.nio.protocol.HttpAsyncRequestExecutor;
-import org.apache.http.nio.protocol.HttpAsyncRequester;
-import org.apache.http.nio.reactor.ConnectingIOReactor;
-import org.apache.http.nio.reactor.IOEventDispatch;
-import org.apache.http.protocol.HttpCoreContext;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.protocol.HttpProcessorBuilder;
-import org.apache.http.protocol.RequestConnControl;
-import org.apache.http.protocol.RequestContent;
-import org.apache.http.protocol.RequestExpectContinue;
-import org.apache.http.protocol.RequestTargetHost;
-import org.apache.http.protocol.RequestUserAgent;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.concurrent.FutureCallback;
+import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.impl.nio.DefaultHttpClientIODispatch;
+import org.apache.hc.core5.http.impl.nio.pool.BasicNIOConnPool;
+import org.apache.hc.core5.http.impl.nio.reactor.DefaultConnectingIOReactor;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestProducer;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseConsumer;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestExecutor;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequester;
+import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.http.nio.reactor.IOEventDispatch;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;
+import org.apache.hc.core5.http.protocol.RequestConnControl;
+import org.apache.hc.core5.http.protocol.RequestContent;
+import org.apache.hc.core5.http.protocol.RequestExpectContinue;
+import org.apache.hc.core5.http.protocol.RequestTargetHost;
+import org.apache.hc.core5.http.protocol.RequestUserAgent;
 
 /**
  * Minimal asynchronous HTTP/1.1 client.
@@ -61,9 +61,9 @@ import org.apache.http.protocol.RequestU
  * You either need to provide BasicNIOConnPool with a connection factory
  * that supports SSL or use a more complex HttpAsyncClient.
  *
- * @see BasicNIOConnPool#BasicNIOConnPool(org.apache.http.nio.reactor.ConnectingIOReactor,
- *   org.apache.http.nio.pool.NIOConnFactory, int)
- * @see org.apache.http.impl.nio.pool.BasicNIOConnFactory
+ * @see BasicNIOConnPool#BasicNIOConnPool(org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor,
+ *   org.apache.hc.core5.http.nio.pool.NIOConnFactory, int)
+ * @see org.apache.hc.core5.http.impl.nio.pool.BasicNIOConnFactory
  */
 public class NHttpClient {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/NHttpFileServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/NHttpFileServer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/NHttpFileServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/NHttpFileServer.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.examples.nio;
+package org.apache.hc.core5.http.examples.nio;
 
 import java.io.File;
 import java.io.IOException;
@@ -35,27 +35,27 @@ import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.http.ExceptionLogger;
-import org.apache.http.HttpConnection;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.MethodNotSupportedException;
-import org.apache.http.entity.ContentType;
-import org.apache.http.impl.nio.bootstrap.HttpServer;
-import org.apache.http.impl.nio.bootstrap.ServerBootstrap;
-import org.apache.http.impl.nio.reactor.IOReactorConfig;
-import org.apache.http.nio.entity.NFileEntity;
-import org.apache.http.nio.entity.NStringEntity;
-import org.apache.http.nio.protocol.BasicAsyncRequestConsumer;
-import org.apache.http.nio.protocol.BasicAsyncResponseProducer;
-import org.apache.http.nio.protocol.HttpAsyncExchange;
-import org.apache.http.nio.protocol.HttpAsyncRequestConsumer;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpCoreContext;
-import org.apache.http.ssl.SSLContexts;
+import org.apache.hc.core5.http.ExceptionLogger;
+import org.apache.hc.core5.http.HttpConnection;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.MethodNotSupportedException;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.impl.nio.bootstrap.HttpServer;
+import org.apache.hc.core5.http.impl.nio.bootstrap.ServerBootstrap;
+import org.apache.hc.core5.http.impl.nio.reactor.IOReactorConfig;
+import org.apache.hc.core5.http.nio.entity.NFileEntity;
+import org.apache.hc.core5.http.nio.entity.NStringEntity;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestConsumer;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseProducer;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncExchange;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestConsumer;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandler;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.ssl.SSLContexts;
 
 /**
  * Embedded HTTP/1.1 file server based on a non-blocking I/O model and capable of direct channel

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/NHttpReverseProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/NHttpReverseProxy.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/NHttpReverseProxy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/NHttpReverseProxy.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.examples.nio;
+package org.apache.hc.core5.http.examples.nio;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -34,64 +34,64 @@ import java.nio.ByteBuffer;
 import java.util.Locale;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.http.ConnectionReuseStrategy;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.HttpVersion;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.entity.ContentType;
-import org.apache.http.impl.DefaultConnectionReuseStrategy;
-import org.apache.http.impl.EnglishReasonPhraseCatalog;
-import org.apache.http.impl.nio.DefaultHttpClientIODispatch;
-import org.apache.http.impl.nio.DefaultHttpServerIODispatch;
-import org.apache.http.impl.nio.pool.BasicNIOConnPool;
-import org.apache.http.impl.nio.pool.BasicNIOPoolEntry;
-import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
-import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor;
-import org.apache.http.impl.nio.reactor.IOReactorConfig;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.message.BasicHttpResponse;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.nio.NHttpConnection;
-import org.apache.http.nio.NHttpServerConnection;
-import org.apache.http.nio.entity.NStringEntity;
-import org.apache.http.nio.pool.NIOConnFactory;
-import org.apache.http.nio.protocol.BasicAsyncResponseProducer;
-import org.apache.http.nio.protocol.HttpAsyncExchange;
-import org.apache.http.nio.protocol.HttpAsyncRequestConsumer;
-import org.apache.http.nio.protocol.HttpAsyncRequestExecutor;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandlerMapper;
-import org.apache.http.nio.protocol.HttpAsyncRequestProducer;
-import org.apache.http.nio.protocol.HttpAsyncRequester;
-import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
-import org.apache.http.nio.protocol.HttpAsyncResponseProducer;
-import org.apache.http.nio.protocol.HttpAsyncService;
-import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
-import org.apache.http.nio.reactor.ConnectingIOReactor;
-import org.apache.http.nio.reactor.IOEventDispatch;
-import org.apache.http.nio.reactor.ListeningIOReactor;
-import org.apache.http.pool.PoolStats;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpCoreContext;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.protocol.ImmutableHttpProcessor;
-import org.apache.http.protocol.RequestConnControl;
-import org.apache.http.protocol.RequestContent;
-import org.apache.http.protocol.RequestExpectContinue;
-import org.apache.http.protocol.RequestTargetHost;
-import org.apache.http.protocol.RequestUserAgent;
-import org.apache.http.protocol.ResponseConnControl;
-import org.apache.http.protocol.ResponseContent;
-import org.apache.http.protocol.ResponseDate;
-import org.apache.http.protocol.ResponseServer;
+import org.apache.hc.core5.http.ConnectionReuseStrategy;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
+import org.apache.hc.core5.http.impl.EnglishReasonPhraseCatalog;
+import org.apache.hc.core5.http.impl.nio.DefaultHttpClientIODispatch;
+import org.apache.hc.core5.http.impl.nio.DefaultHttpServerIODispatch;
+import org.apache.hc.core5.http.impl.nio.pool.BasicNIOConnPool;
+import org.apache.hc.core5.http.impl.nio.pool.BasicNIOPoolEntry;
+import org.apache.hc.core5.http.impl.nio.reactor.DefaultConnectingIOReactor;
+import org.apache.hc.core5.http.impl.nio.reactor.DefaultListeningIOReactor;
+import org.apache.hc.core5.http.impl.nio.reactor.IOReactorConfig;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.NHttpClientConnection;
+import org.apache.hc.core5.http.nio.NHttpConnection;
+import org.apache.hc.core5.http.nio.NHttpServerConnection;
+import org.apache.hc.core5.http.nio.entity.NStringEntity;
+import org.apache.hc.core5.http.nio.pool.NIOConnFactory;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseProducer;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncExchange;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestConsumer;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestExecutor;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandler;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandlerMapper;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestProducer;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequester;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncResponseConsumer;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncResponseProducer;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncService;
+import org.apache.hc.core5.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
+import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.http.nio.reactor.IOEventDispatch;
+import org.apache.hc.core5.http.nio.reactor.ListeningIOReactor;
+import org.apache.hc.core5.http.pool.PoolStats;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
+import org.apache.hc.core5.http.protocol.RequestConnControl;
+import org.apache.hc.core5.http.protocol.RequestContent;
+import org.apache.hc.core5.http.protocol.RequestExpectContinue;
+import org.apache.hc.core5.http.protocol.RequestTargetHost;
+import org.apache.hc.core5.http.protocol.RequestUserAgent;
+import org.apache.hc.core5.http.protocol.ResponseConnControl;
+import org.apache.hc.core5.http.protocol.ResponseContent;
+import org.apache.hc.core5.http.protocol.ResponseDate;
+import org.apache.hc.core5.http.protocol.ResponseServer;
 
 /**
  * Asynchronous, fully streaming HTTP/1.1 reverse proxy.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/PipeliningHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/PipeliningHttpClient.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/PipeliningHttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/hc/core5/http/examples/nio/PipeliningHttpClient.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.examples.nio;
+package org.apache.hc.core5.http.examples.nio;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -32,28 +32,28 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.impl.nio.DefaultHttpClientIODispatch;
-import org.apache.http.impl.nio.pool.BasicNIOConnPool;
-import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.nio.protocol.BasicAsyncRequestProducer;
-import org.apache.http.nio.protocol.BasicAsyncResponseConsumer;
-import org.apache.http.nio.protocol.HttpAsyncRequestExecutor;
-import org.apache.http.nio.protocol.HttpAsyncRequester;
-import org.apache.http.nio.reactor.ConnectingIOReactor;
-import org.apache.http.nio.reactor.IOEventDispatch;
-import org.apache.http.protocol.HttpCoreContext;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.protocol.HttpProcessorBuilder;
-import org.apache.http.protocol.RequestConnControl;
-import org.apache.http.protocol.RequestContent;
-import org.apache.http.protocol.RequestExpectContinue;
-import org.apache.http.protocol.RequestTargetHost;
-import org.apache.http.protocol.RequestUserAgent;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.concurrent.FutureCallback;
+import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.impl.nio.DefaultHttpClientIODispatch;
+import org.apache.hc.core5.http.impl.nio.pool.BasicNIOConnPool;
+import org.apache.hc.core5.http.impl.nio.reactor.DefaultConnectingIOReactor;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestProducer;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseConsumer;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestExecutor;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequester;
+import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.http.nio.reactor.IOEventDispatch;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;
+import org.apache.hc.core5.http.protocol.RequestConnControl;
+import org.apache.hc.core5.http.protocol.RequestContent;
+import org.apache.hc.core5.http.protocol.RequestExpectContinue;
+import org.apache.hc.core5.http.protocol.RequestTargetHost;
+import org.apache.hc.core5.http.protocol.RequestUserAgent;
 
 /**
  * Minimal pipelining HTTP/1.1 client.
@@ -63,9 +63,9 @@ import org.apache.http.protocol.RequestU
  * You either need to provide BasicNIOConnPool with a connection factory
  * that supports SSL or use a more complex HttpAsyncClient.
  *
- * @see org.apache.http.impl.nio.pool.BasicNIOConnPool#BasicNIOConnPool(org.apache.http.nio.reactor.ConnectingIOReactor,
- *   org.apache.http.nio.pool.NIOConnFactory, int)
- * @see org.apache.http.impl.nio.pool.BasicNIOConnFactory
+ * @see org.apache.hc.core5.http.impl.nio.pool.BasicNIOConnPool#BasicNIOConnPool(org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor,
+ *   org.apache.hc.core5.http.nio.pool.NIOConnFactory, int)
+ * @see org.apache.hc.core5.http.impl.nio.pool.BasicNIOConnFactory
  */
 public class PipeliningHttpClient {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpClientIODispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpClientIODispatch.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpClientIODispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpClientIODispatch.java Sat Nov 21 16:52:56 2015
@@ -25,23 +25,23 @@
  *
  */
 
-package org.apache.http.impl.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.http.annotation.Immutable;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.impl.nio.reactor.AbstractIODispatch;
-import org.apache.http.nio.NHttpClientEventHandler;
-import org.apache.http.nio.NHttpConnectionFactory;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.impl.nio.reactor.AbstractIODispatch;
+import org.apache.hc.core5.http.nio.NHttpClientEventHandler;
+import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
+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.util.Args;
 
 /**
- * Default {@link org.apache.http.nio.reactor.IOEventDispatch} implementation
+ * Default {@link org.apache.hc.core5.http.nio.reactor.IOEventDispatch} implementation
  * that supports both plain (non-encrypted) and SSL encrypted client side HTTP
  * connections.
  *

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpServerIODispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpServerIODispatch.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpServerIODispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpServerIODispatch.java Sat Nov 21 16:52:56 2015
@@ -25,23 +25,23 @@
  *
  */
 
-package org.apache.http.impl.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.http.annotation.Immutable;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.impl.nio.reactor.AbstractIODispatch;
-import org.apache.http.nio.NHttpConnectionFactory;
-import org.apache.http.nio.NHttpServerEventHandler;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.impl.nio.reactor.AbstractIODispatch;
+import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
+import org.apache.hc.core5.http.nio.NHttpServerEventHandler;
+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.util.Args;
 
 /**
- * Default {@link org.apache.http.nio.reactor.IOEventDispatch} implementation
+ * Default {@link org.apache.hc.core5.http.nio.reactor.IOEventDispatch} implementation
  * that supports both plain (non-encrypted) and SSL encrypted server side HTTP
  * connections.
  *

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java Sat Nov 21 16:52:56 2015
@@ -25,37 +25,37 @@
  *
  */
 
-package org.apache.http.impl.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.nio.channels.SelectionKey;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.LengthRequiredException;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.impl.entity.DefaultContentLengthStrategy;
-import org.apache.http.impl.nio.codecs.DefaultHttpRequestWriterFactory;
-import org.apache.http.impl.nio.codecs.DefaultHttpResponseParserFactory;
-import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.nio.NHttpClientEventHandler;
-import org.apache.http.nio.NHttpMessageParser;
-import org.apache.http.nio.NHttpMessageParserFactory;
-import org.apache.http.nio.NHttpMessageWriter;
-import org.apache.http.nio.NHttpMessageWriterFactory;
-import org.apache.http.nio.reactor.EventMask;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.LengthRequiredException;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.entity.ContentLengthStrategy;
+import org.apache.hc.core5.http.impl.entity.DefaultContentLengthStrategy;
+import org.apache.hc.core5.http.impl.nio.codecs.DefaultHttpRequestWriterFactory;
+import org.apache.hc.core5.http.impl.nio.codecs.DefaultHttpResponseParserFactory;
+import org.apache.hc.core5.http.nio.NHttpClientConnection;
+import org.apache.hc.core5.http.nio.NHttpClientEventHandler;
+import org.apache.hc.core5.http.nio.NHttpMessageParser;
+import org.apache.hc.core5.http.nio.NHttpMessageParserFactory;
+import org.apache.hc.core5.http.nio.NHttpMessageWriter;
+import org.apache.hc.core5.http.nio.NHttpMessageWriterFactory;
+import org.apache.hc.core5.http.nio.reactor.EventMask;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.http.util.Args;
 
 /**
- * Default implementation of the {@link org.apache.http.nio.NHttpClientConnection}
+ * Default implementation of the {@link org.apache.hc.core5.http.nio.NHttpClientConnection}
  * interface.
  *
  * @since 4.0
@@ -77,7 +77,7 @@ public class DefaultNHttpClientConnectio
      * @param buffersize buffer size. Must be a positive number.
      * @param fragmentSizeHint fragment size hint.
      * @param allocator memory allocator.
-     *   If {@code null} {@link org.apache.http.nio.util.HeapByteBufferAllocator#INSTANCE}
+     *   If {@code null} {@link org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator#INSTANCE}
      *   will be used.
      * @param chardecoder decoder to be used for decoding HTTP protocol elements.
      *   If {@code null} simple type cast will be used for byte to char conversion.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java Sat Nov 21 16:52:56 2015
@@ -24,23 +24,23 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio;
+package org.apache.hc.core5.http.impl.nio;
 
-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.entity.ContentLengthStrategy;
-import org.apache.http.impl.ConnSupport;
-import org.apache.http.nio.NHttpConnectionFactory;
-import org.apache.http.nio.NHttpMessageParserFactory;
-import org.apache.http.nio.NHttpMessageWriterFactory;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.util.ByteBufferAllocator;
+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.entity.ContentLengthStrategy;
+import org.apache.hc.core5.http.impl.ConnSupport;
+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.reactor.IOSession;
+import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
 
 /**
  * Default factory for plain (non-encrypted), non-blocking
- * {@link org.apache.http.nio.NHttpClientConnection}s.
+ * {@link org.apache.hc.core5.http.nio.NHttpClientConnection}s.
  *
  * @since 4.2
  */

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java Sat Nov 21 16:52:56 2015
@@ -25,36 +25,36 @@
  *
  */
 
-package org.apache.http.impl.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.nio.channels.SelectionKey;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.impl.entity.DefaultContentLengthStrategy;
-import org.apache.http.impl.nio.codecs.DefaultHttpRequestParserFactory;
-import org.apache.http.impl.nio.codecs.DefaultHttpResponseWriterFactory;
-import org.apache.http.nio.NHttpMessageParser;
-import org.apache.http.nio.NHttpMessageParserFactory;
-import org.apache.http.nio.NHttpMessageWriter;
-import org.apache.http.nio.NHttpMessageWriterFactory;
-import org.apache.http.nio.NHttpServerConnection;
-import org.apache.http.nio.NHttpServerEventHandler;
-import org.apache.http.nio.reactor.EventMask;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.entity.ContentLengthStrategy;
+import org.apache.hc.core5.http.impl.entity.DefaultContentLengthStrategy;
+import org.apache.hc.core5.http.impl.nio.codecs.DefaultHttpRequestParserFactory;
+import org.apache.hc.core5.http.impl.nio.codecs.DefaultHttpResponseWriterFactory;
+import org.apache.hc.core5.http.nio.NHttpMessageParser;
+import org.apache.hc.core5.http.nio.NHttpMessageParserFactory;
+import org.apache.hc.core5.http.nio.NHttpMessageWriter;
+import org.apache.hc.core5.http.nio.NHttpMessageWriterFactory;
+import org.apache.hc.core5.http.nio.NHttpServerConnection;
+import org.apache.hc.core5.http.nio.NHttpServerEventHandler;
+import org.apache.hc.core5.http.nio.reactor.EventMask;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.http.util.Args;
 
 /**
- * Default implementation of the {@link org.apache.http.nio.NHttpServerConnection}
+ * Default implementation of the {@link org.apache.hc.core5.http.nio.NHttpServerConnection}
  * interface.
  *
  * @since 4.0
@@ -75,7 +75,7 @@ public class DefaultNHttpServerConnectio
      * @param buffersize buffer size. Must be a positive number.
      * @param fragmentSizeHint fragment size hint.
      * @param allocator memory allocator.
-     *   If {@code null} {@link org.apache.http.nio.util.HeapByteBufferAllocator#INSTANCE}
+     *   If {@code null} {@link org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator#INSTANCE}
      *   will be used.
      * @param chardecoder decoder to be used for decoding HTTP protocol elements.
      *   If {@code null} simple type cast will be used for byte to char conversion.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java Sat Nov 21 16:52:56 2015
@@ -24,23 +24,23 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio;
+package org.apache.hc.core5.http.impl.nio;
 
-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.entity.ContentLengthStrategy;
-import org.apache.http.impl.ConnSupport;
-import org.apache.http.nio.NHttpConnectionFactory;
-import org.apache.http.nio.NHttpMessageParserFactory;
-import org.apache.http.nio.NHttpMessageWriterFactory;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.util.ByteBufferAllocator;
+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.entity.ContentLengthStrategy;
+import org.apache.hc.core5.http.impl.ConnSupport;
+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.reactor.IOSession;
+import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
 
 /**
  * Default factory for plain (non-encrypted), non-blocking
- * {@link org.apache.http.nio.NHttpServerConnection}s.
+ * {@link org.apache.hc.core5.http.nio.NHttpServerConnection}s.
  *
  * @since 4.2
  */

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/NHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/NHttpConnectionBase.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/NHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/NHttpConnectionBase.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.net.Socket;
@@ -35,41 +35,41 @@ import java.nio.channels.WritableByteCha
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.HttpConnectionMetrics;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpMessage;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.TrailerSupplier;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.impl.HttpConnectionMetricsImpl;
-import org.apache.http.impl.IncomingHttpEntity;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.impl.nio.codecs.ChunkDecoder;
-import org.apache.http.impl.nio.codecs.ChunkEncoder;
-import org.apache.http.impl.nio.codecs.IdentityDecoder;
-import org.apache.http.impl.nio.codecs.IdentityEncoder;
-import org.apache.http.impl.nio.codecs.LengthDelimitedDecoder;
-import org.apache.http.impl.nio.codecs.LengthDelimitedEncoder;
-import org.apache.http.impl.nio.reactor.SessionInputBufferImpl;
-import org.apache.http.impl.nio.reactor.SessionOutputBufferImpl;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.NHttpConnection;
-import org.apache.http.nio.reactor.EventMask;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.SessionBufferStatus;
-import org.apache.http.nio.reactor.SessionInputBuffer;
-import org.apache.http.nio.reactor.SessionOutputBuffer;
-import org.apache.http.nio.reactor.SocketAccessor;
-import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.util.Args;
-import org.apache.http.util.NetUtils;
+import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.http.HttpConnectionMetrics;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpMessage;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.TrailerSupplier;
+import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.entity.ContentLengthStrategy;
+import org.apache.hc.core5.http.impl.HttpConnectionMetricsImpl;
+import org.apache.hc.core5.http.impl.IncomingHttpEntity;
+import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
+import org.apache.hc.core5.http.impl.nio.codecs.ChunkDecoder;
+import org.apache.hc.core5.http.impl.nio.codecs.ChunkEncoder;
+import org.apache.hc.core5.http.impl.nio.codecs.IdentityDecoder;
+import org.apache.hc.core5.http.impl.nio.codecs.IdentityEncoder;
+import org.apache.hc.core5.http.impl.nio.codecs.LengthDelimitedDecoder;
+import org.apache.hc.core5.http.impl.nio.codecs.LengthDelimitedEncoder;
+import org.apache.hc.core5.http.impl.nio.reactor.SessionInputBufferImpl;
+import org.apache.hc.core5.http.impl.nio.reactor.SessionOutputBufferImpl;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.NHttpConnection;
+import org.apache.hc.core5.http.nio.reactor.EventMask;
+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.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.nio.reactor.SocketAccessor;
+import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.NetUtils;
 
 class NHttpConnectionBase implements NHttpConnection, SessionBufferStatus, SocketAccessor {
 
@@ -226,8 +226,8 @@ class NHttpConnectionBase implements NHt
     /**
      * Factory method for {@link ContentEncoder} instances.
      *
-     * @param len content length, if known, {@link org.apache.http.entity.ContentLengthStrategy#CHUNKED} or
-     *   {@link org.apache.http.entity.ContentLengthStrategy#UNDEFINED}, if unknown.
+     * @param len content length, if known, {@link org.apache.hc.core5.http.entity.ContentLengthStrategy#CHUNKED} or
+     *   {@link org.apache.hc.core5.http.entity.ContentLengthStrategy#UNDEFINED}, if unknown.
      * @param channel the session channel.
      * @param buffer the session buffer.
      * @param metrics transport metrics.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpClientConnectionFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpClientConnectionFactory.java Sat Nov 21 16:52:56 2015
@@ -24,29 +24,29 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import javax.net.ssl.SSLContext;
 
-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.entity.ContentLengthStrategy;
-import org.apache.http.impl.ConnSupport;
-import org.apache.http.nio.NHttpConnectionFactory;
-import org.apache.http.nio.NHttpMessageParserFactory;
-import org.apache.http.nio.NHttpMessageWriterFactory;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.ssl.SSLIOSession;
-import org.apache.http.nio.reactor.ssl.SSLMode;
-import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
-import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.ssl.SSLContexts;
+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.entity.ContentLengthStrategy;
+import org.apache.hc.core5.http.impl.ConnSupport;
+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.reactor.IOSession;
+import org.apache.hc.core5.http.nio.reactor.ssl.SSLIOSession;
+import org.apache.hc.core5.http.nio.reactor.ssl.SSLMode;
+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.ssl.SSLContexts;
 
 /**
  * Default factory for SSL encrypted, non-blocking
- * {@link org.apache.http.nio.NHttpClientConnection}s.
+ * {@link org.apache.hc.core5.http.nio.NHttpClientConnection}s.
  *
  * @since 4.2
  */

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpServerConnectionFactory.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpServerConnectionFactory.java Sat Nov 21 16:52:56 2015
@@ -24,29 +24,29 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import javax.net.ssl.SSLContext;
 
-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.entity.ContentLengthStrategy;
-import org.apache.http.impl.ConnSupport;
-import org.apache.http.nio.NHttpConnectionFactory;
-import org.apache.http.nio.NHttpMessageParserFactory;
-import org.apache.http.nio.NHttpMessageWriterFactory;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.ssl.SSLIOSession;
-import org.apache.http.nio.reactor.ssl.SSLMode;
-import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
-import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.ssl.SSLContexts;
+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.entity.ContentLengthStrategy;
+import org.apache.hc.core5.http.impl.ConnSupport;
+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.reactor.IOSession;
+import org.apache.hc.core5.http.nio.reactor.ssl.SSLIOSession;
+import org.apache.hc.core5.http.nio.reactor.ssl.SSLMode;
+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.ssl.SSLContexts;
 
 /**
  * Default factory for SSL encrypted, non-blocking
- * {@link org.apache.http.nio.NHttpServerConnection}s.
+ * {@link org.apache.hc.core5.http.nio.NHttpServerConnection}s.
  *
  * @since 4.2
  */

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/SessionHttpContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/SessionHttpContext.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/SessionHttpContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/SessionHttpContext.java Sat Nov 21 16:52:56 2015
@@ -25,10 +25,10 @@
  *
  */
 
-package org.apache.http.impl.nio;
+package org.apache.hc.core5.http.impl.nio;
 
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 class SessionHttpContext implements HttpContext {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/HttpServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/HttpServer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/HttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/HttpServer.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio.bootstrap;
+package org.apache.hc.core5.http.impl.nio.bootstrap;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -34,17 +34,17 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.http.ExceptionLogger;
-import org.apache.http.impl.nio.DefaultHttpServerIODispatch;
-import org.apache.http.impl.nio.DefaultNHttpServerConnection;
-import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor;
-import org.apache.http.impl.nio.reactor.IOReactorConfig;
-import org.apache.http.nio.NHttpConnectionFactory;
-import org.apache.http.nio.NHttpServerEventHandler;
-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.ListenerEndpoint;
+import org.apache.hc.core5.http.ExceptionLogger;
+import org.apache.hc.core5.http.impl.nio.DefaultHttpServerIODispatch;
+import org.apache.hc.core5.http.impl.nio.DefaultNHttpServerConnection;
+import org.apache.hc.core5.http.impl.nio.reactor.DefaultListeningIOReactor;
+import org.apache.hc.core5.http.impl.nio.reactor.IOReactorConfig;
+import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
+import org.apache.hc.core5.http.nio.NHttpServerEventHandler;
+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.ListenerEndpoint;
 
 /**
  * @since 4.4

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/ServerBootstrap.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/ServerBootstrap.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/ServerBootstrap.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/ServerBootstrap.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio.bootstrap;
+package org.apache.hc.core5.http.impl.nio.bootstrap;
 
 import java.net.InetAddress;
 import java.util.HashMap;
@@ -33,32 +33,32 @@ import java.util.Map;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.http.ConnectionReuseStrategy;
-import org.apache.http.ExceptionLogger;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.HttpResponseFactory;
-import org.apache.http.HttpResponseInterceptor;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.impl.DefaultConnectionReuseStrategy;
-import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.impl.nio.DefaultNHttpServerConnection;
-import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory;
-import org.apache.http.impl.nio.SSLNHttpServerConnectionFactory;
-import org.apache.http.impl.nio.reactor.IOReactorConfig;
-import org.apache.http.nio.NHttpConnectionFactory;
-import org.apache.http.nio.protocol.HttpAsyncExpectationVerifier;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandlerMapper;
-import org.apache.http.nio.protocol.HttpAsyncService;
-import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
-import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.protocol.HttpProcessorBuilder;
-import org.apache.http.protocol.RequestValidateHost;
-import org.apache.http.protocol.ResponseConnControl;
-import org.apache.http.protocol.ResponseContent;
-import org.apache.http.protocol.ResponseDate;
-import org.apache.http.protocol.ResponseServer;
+import org.apache.hc.core5.http.ConnectionReuseStrategy;
+import org.apache.hc.core5.http.ExceptionLogger;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.HttpResponseFactory;
+import org.apache.hc.core5.http.HttpResponseInterceptor;
+import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
+import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
+import org.apache.hc.core5.http.impl.nio.DefaultNHttpServerConnection;
+import org.apache.hc.core5.http.impl.nio.DefaultNHttpServerConnectionFactory;
+import org.apache.hc.core5.http.impl.nio.SSLNHttpServerConnectionFactory;
+import org.apache.hc.core5.http.impl.nio.reactor.IOReactorConfig;
+import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncExpectationVerifier;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandler;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandlerMapper;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncService;
+import org.apache.hc.core5.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
+import org.apache.hc.core5.http.nio.reactor.ssl.SSLSetupHandler;
+import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;
+import org.apache.hc.core5.http.protocol.RequestValidateHost;
+import org.apache.hc.core5.http.protocol.ResponseConnControl;
+import org.apache.hc.core5.http.protocol.ResponseContent;
+import org.apache.hc.core5.http.protocol.ResponseDate;
+import org.apache.hc.core5.http.protocol.ResponseServer;
 
 /**
  * @since 4.4
@@ -120,7 +120,7 @@ public class ServerBootstrap {
      * Sets connection configuration.
      * <p>
      * Please note this value can be overridden by the {@link #setConnectionFactory(
-     *   org.apache.http.nio.NHttpConnectionFactory)} method.
+     *   org.apache.hc.core5.http.nio.NHttpConnectionFactory)} method.
      */
     public final ServerBootstrap setConnectionConfig(final ConnectionConfig connectionConfig) {
         this.connectionConfig = connectionConfig;
@@ -128,7 +128,7 @@ public class ServerBootstrap {
     }
 
     /**
-     * Assigns {@link org.apache.http.protocol.HttpProcessor} instance.
+     * Assigns {@link org.apache.hc.core5.http.protocol.HttpProcessor} instance.
      */
     public final ServerBootstrap setHttpProcessor(final HttpProcessor httpProcessor) {
         this.httpProcessor = httpProcessor;
@@ -139,7 +139,7 @@ public class ServerBootstrap {
      * Adds this protocol interceptor to the head of the protocol processing list.
      * <p>
      * Please note this value can be overridden by the {@link #setHttpProcessor(
-     * org.apache.http.protocol.HttpProcessor)} method.
+     * org.apache.hc.core5.http.protocol.HttpProcessor)} method.
      */
     public final ServerBootstrap addInterceptorFirst(final HttpResponseInterceptor itcp) {
         if (itcp == null) {
@@ -156,7 +156,7 @@ public class ServerBootstrap {
      * Adds this protocol interceptor to the tail of the protocol processing list.
      * <p>
      * Please note this value can be overridden by the {@link #setHttpProcessor(
-     * org.apache.http.protocol.HttpProcessor)} method.
+     * org.apache.hc.core5.http.protocol.HttpProcessor)} method.
      */
     public final ServerBootstrap addInterceptorLast(final HttpResponseInterceptor itcp) {
         if (itcp == null) {
@@ -173,7 +173,7 @@ public class ServerBootstrap {
      * Adds this protocol interceptor to the head of the protocol processing list.
      * <p>
      * Please note this value can be overridden by the {@link #setHttpProcessor(
-     * org.apache.http.protocol.HttpProcessor)} method.
+     * org.apache.hc.core5.http.protocol.HttpProcessor)} method.
      */
     public final ServerBootstrap addInterceptorFirst(final HttpRequestInterceptor itcp) {
         if (itcp == null) {
@@ -190,7 +190,7 @@ public class ServerBootstrap {
      * Adds this protocol interceptor to the tail of the protocol processing list.
      * <p>
      * Please note this value can be overridden by the {@link #setHttpProcessor(
-     * org.apache.http.protocol.HttpProcessor)} method.
+     * org.apache.hc.core5.http.protocol.HttpProcessor)} method.
      */
     public final ServerBootstrap addInterceptorLast(final HttpRequestInterceptor itcp) {
         if (itcp == null) {
@@ -207,7 +207,7 @@ public class ServerBootstrap {
      * Assigns {@code Server} response header value.
      * <p>
      * Please note this value can be overridden by the {@link #setHttpProcessor(
-     * org.apache.http.protocol.HttpProcessor)} method.
+     * org.apache.hc.core5.http.protocol.HttpProcessor)} method.
      */
     public final ServerBootstrap setServerInfo(final String serverInfo) {
         this.serverInfo = serverInfo;
@@ -215,7 +215,7 @@ public class ServerBootstrap {
     }
 
     /**
-     * Assigns {@link org.apache.http.ConnectionReuseStrategy} instance.
+     * Assigns {@link org.apache.hc.core5.http.ConnectionReuseStrategy} instance.
      */
     public final ServerBootstrap setConnectionReuseStrategy(final ConnectionReuseStrategy connStrategy) {
         this.connStrategy = connStrategy;
@@ -223,7 +223,7 @@ public class ServerBootstrap {
     }
 
     /**
-     * Assigns {@link org.apache.http.HttpResponseFactory} instance.
+     * Assigns {@link org.apache.hc.core5.http.HttpResponseFactory} instance.
      */
     public final ServerBootstrap setResponseFactory(final HttpResponseFactory responseFactory) {
         this.responseFactory = responseFactory;
@@ -231,7 +231,7 @@ public class ServerBootstrap {
     }
 
     /**
-     * Assigns {@link org.apache.http.nio.protocol.HttpAsyncRequestHandlerMapper} instance.
+     * Assigns {@link org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandlerMapper} instance.
      */
     public final ServerBootstrap setHandlerMapper(final HttpAsyncRequestHandlerMapper handlerMapper) {
         this.handlerMapper = handlerMapper;
@@ -239,11 +239,11 @@ public class ServerBootstrap {
     }
 
     /**
-     * Registers the given {@link org.apache.http.nio.protocol.HttpAsyncRequestHandler}
+     * Registers the given {@link org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandler}
      * as a handler for URIs matching the given pattern.
      * <p>
      * Please note this value can be overridden by the {@link #setHandlerMapper(
-     *   org.apache.http.nio.protocol.HttpAsyncRequestHandlerMapper)} )} method.
+     *   org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandlerMapper)} )} method.
      *
      * @param pattern the pattern to register the handler for.
      * @param handler the handler.
@@ -260,7 +260,7 @@ public class ServerBootstrap {
     }
 
     /**
-     * Assigns {@link org.apache.http.nio.protocol.HttpAsyncExpectationVerifier} instance.
+     * Assigns {@link org.apache.hc.core5.http.nio.protocol.HttpAsyncExpectationVerifier} instance.
      */
     public final ServerBootstrap setExpectationVerifier(final HttpAsyncExpectationVerifier expectationVerifier) {
         this.expectationVerifier = expectationVerifier;
@@ -268,7 +268,7 @@ public class ServerBootstrap {
     }
 
     /**
-     * Assigns {@link org.apache.http.nio.NHttpConnectionFactory} instance.
+     * Assigns {@link org.apache.hc.core5.http.nio.NHttpConnectionFactory} instance.
      */
     public final ServerBootstrap setConnectionFactory(
             final NHttpConnectionFactory<? extends DefaultNHttpServerConnection> connectionFactory) {
@@ -280,7 +280,7 @@ public class ServerBootstrap {
      * Assigns {@link javax.net.ssl.SSLContext} instance.
      * <p>
      * Please note this value can be overridden by the {@link #setConnectionFactory(
-     *   org.apache.http.nio.NHttpConnectionFactory)} method.
+     *   org.apache.hc.core5.http.nio.NHttpConnectionFactory)} method.
      */
     public final ServerBootstrap setSslContext(final SSLContext sslContext) {
         this.sslContext = sslContext;
@@ -288,10 +288,10 @@ public class ServerBootstrap {
     }
 
     /**
-     * Assigns {@link org.apache.http.nio.reactor.ssl.SSLSetupHandler} instance.
+     * Assigns {@link org.apache.hc.core5.http.nio.reactor.ssl.SSLSetupHandler} instance.
      * <p>
      * Please note this value can be overridden by the {@link #setConnectionFactory(
-     *   org.apache.http.nio.NHttpConnectionFactory)} method.
+     *   org.apache.hc.core5.http.nio.NHttpConnectionFactory)} method.
      */
     public ServerBootstrap setSslSetupHandler(final SSLSetupHandler sslSetupHandler) {
         this.sslSetupHandler = sslSetupHandler;
@@ -299,7 +299,7 @@ public class ServerBootstrap {
     }
 
     /**
-     * Assigns {@link org.apache.http.ExceptionLogger} instance.
+     * Assigns {@link org.apache.hc.core5.http.ExceptionLogger} instance.
      */
     public final ServerBootstrap setExceptionLogger(final ExceptionLogger exceptionLogger) {
         this.exceptionLogger = exceptionLogger;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/ThreadFactoryImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/ThreadFactoryImpl.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/ThreadFactoryImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/ThreadFactoryImpl.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio.bootstrap;
+package org.apache.hc.core5.http.impl.nio.bootstrap;
 
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicLong;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/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/bootstrap/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/package-info.java Sat Nov 21 16:52:56 2015
@@ -28,4 +28,4 @@
 /**
  * Embedded non-blocking server and server bootstrap.
  */
-package org.apache.http.impl.nio.bootstrap;
+package org.apache.hc.core5.http.impl.nio.bootstrap;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/AbstractContentDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/AbstractContentDecoder.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/AbstractContentDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/AbstractContentDecoder.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.ReadableByteChannel;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.nio.ContentDecoder;
-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.ContentDecoder;
+import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Abstract {@link ContentDecoder} that serves as a base for all content

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/AbstractContentEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/AbstractContentEncoder.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/AbstractContentEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/AbstractContentEncoder.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.WritableByteChannel;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.reactor.SessionOutputBuffer;
-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.impl.io.HttpTransportMetricsImpl;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
  * Abstract {@link ContentEncoder} that serves as a base for all content

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/AbstractMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/AbstractMessageParser.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/AbstractMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/AbstractMessageParser.java Sat Nov 21 16:52:56 2015
@@ -25,23 +25,23 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpMessage;
-import org.apache.http.MessageConstraintException;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.message.LazyLineParser;
-import org.apache.http.message.LineParser;
-import org.apache.http.nio.NHttpMessageParser;
-import org.apache.http.nio.reactor.SessionInputBuffer;
-import org.apache.http.util.Args;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpMessage;
+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.message.LazyLineParser;
+import org.apache.hc.core5.http.message.LineParser;
+import org.apache.hc.core5.http.nio.NHttpMessageParser;
+import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Abstract {@link NHttpMessageParser} that serves as a base for all message
@@ -70,7 +70,7 @@ public abstract class AbstractMessagePar
      * Creates an instance of AbstractMessageParser.
      *
      * @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 messageConstraints Message constraints. If {@code null}
      *   {@link MessageConstraints#DEFAULT} will be used.
      *

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/AbstractMessageWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/AbstractMessageWriter.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/AbstractMessageWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/AbstractMessageWriter.java Sat Nov 21 16:52:56 2015
@@ -25,22 +25,22 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.IOException;
 import java.util.Iterator;
 
-import org.apache.http.FormattedHeader;
-import org.apache.http.Header;
-import org.apache.http.HttpException;
-import org.apache.http.HttpMessage;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.message.BasicLineFormatter;
-import org.apache.http.message.LineFormatter;
-import org.apache.http.nio.NHttpMessageWriter;
-import org.apache.http.nio.reactor.SessionOutputBuffer;
-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.Header;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpMessage;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+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.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Abstract {@link NHttpMessageWriter} that serves as a base for all message

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/ChunkDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/ChunkDecoder.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/ChunkDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/ChunkDecoder.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -33,19 +33,19 @@ import java.nio.channels.ReadableByteCha
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.Header;
-import org.apache.http.MalformedChunkCodingException;
-import org.apache.http.MessageConstraintException;
-import org.apache.http.ParseException;
-import org.apache.http.TruncatedChunkException;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.message.BufferedHeader;
-import org.apache.http.nio.reactor.SessionInputBuffer;
-import org.apache.http.util.Args;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.MalformedChunkCodingException;
+import org.apache.hc.core5.http.MessageConstraintException;
+import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.TruncatedChunkException;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
+import org.apache.hc.core5.http.message.BufferedHeader;
+import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Implements chunked transfer coding. The content is received in small chunks.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/ChunkEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/ChunkEncoder.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/ChunkEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/ChunkEncoder.java Sat Nov 21 16:52:56 2015
@@ -25,20 +25,20 @@
  *
  */
 
-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.WritableByteChannel;
 
-import org.apache.http.FormattedHeader;
-import org.apache.http.Header;
-import org.apache.http.TrailerSupplier;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.message.BasicLineFormatter;
-import org.apache.http.nio.reactor.SessionOutputBuffer;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.FormattedHeader;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.TrailerSupplier;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
+import org.apache.hc.core5.http.message.BasicLineFormatter;
+import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Implements chunked transfer coding. The content is sent in small chunks.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpRequestParser.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/DefaultHttpRequestParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpRequestParser.java Sat Nov 21 16:52:56 2015
@@ -25,23 +25,23 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
-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.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;
 
 /**
- * Default {@link org.apache.http.nio.NHttpMessageParser} implementation
+ * Default {@link org.apache.hc.core5.http.nio.NHttpMessageParser} implementation
  * for {@link HttpRequest}s.
  *
  * @since 4.1
@@ -55,7 +55,7 @@ public class DefaultHttpRequestParser ex
      * Creates an instance of DefaultHttpRequestParser.
      *
      * @param parser 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 request factory. If {@code null}
      *   {@link DefaultHttpRequestFactory#INSTANCE} will be used.
      * @param constraints Message constraints. If {@code null}

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpRequestParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpRequestParserFactory.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/DefaultHttpRequestParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpRequestParserFactory.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.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.message.LazyLineParser;
-import org.apache.http.message.LineParser;
-import org.apache.http.nio.NHttpMessageParser;
-import org.apache.http.nio.NHttpMessageParserFactory;
+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.message.LazyLineParser;
+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 request message parsers.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpRequestWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpRequestWriter.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/DefaultHttpRequestWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpRequestWriter.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.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;
 
 /**
- * Default {@link org.apache.http.nio.NHttpMessageWriter} implementation
+ * Default {@link org.apache.hc.core5.http.nio.NHttpMessageWriter} implementation
  * for {@link HttpRequest}s.
  *
  * @since 4.1
@@ -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} 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/DefaultHttpRequestWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpRequestWriterFactory.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/DefaultHttpRequestWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpRequestWriterFactory.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.HttpRequest;
-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.HttpRequest;
+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 request message writers.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpResponseParser.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/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/impl/nio/codecs/DefaultHttpResponseParser.java Sat Nov 21 16:52:56 2015
@@ -25,23 +25,23 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseFactory;
-import org.apache.http.HttpVersion;
-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.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;
 
 /**
- * Default {@link org.apache.http.nio.NHttpMessageParser} implementation
+ * Default {@link org.apache.hc.core5.http.nio.NHttpMessageParser} implementation
  * for {@link HttpResponse}s.
  *
  * @since 4.1
@@ -55,7 +55,7 @@ public class DefaultHttpResponseParser e
      * Creates an instance of DefaultHttpResponseParser.
      *
      * @param parser 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 Message constraints. If {@code null}




Mime
View raw message