hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1716435 [2/5] - in /httpcomponents/httpcore/trunk: httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/ httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/ httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/ httpc...
Date Wed, 25 Nov 2015 15:17:56 GMT
Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/HttpServer.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpServer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/HttpServer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/HttpServer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpServer.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/HttpServer.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.impl.bootstrap;
+package org.apache.hc.core5.http.bootstrap.io;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -39,11 +39,11 @@ import javax.net.ServerSocketFactory;
 import javax.net.ssl.SSLServerSocket;
 
 import org.apache.hc.core5.http.ExceptionLogger;
-import org.apache.hc.core5.http.HttpConnectionFactory;
-import org.apache.hc.core5.http.HttpServerConnection;
 import org.apache.hc.core5.http.config.SocketConfig;
-import org.apache.hc.core5.http.impl.DefaultBHttpServerConnection;
-import org.apache.hc.core5.http.protocol.HttpService;
+import org.apache.hc.core5.http.impl.io.DefaultBHttpServerConnection;
+import org.apache.hc.core5.http.impl.io.HttpService;
+import org.apache.hc.core5.http.io.HttpConnectionFactory;
+import org.apache.hc.core5.http.io.HttpServerConnection;
 
 /**
  * @since 4.4

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/RequestListener.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/RequestListener.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/RequestListener.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/RequestListener.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/RequestListener.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/RequestListener.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/RequestListener.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.impl.bootstrap;
+package org.apache.hc.core5.http.bootstrap.io;
 
 import java.io.IOException;
 import java.net.ServerSocket;
@@ -33,10 +33,10 @@ import java.util.concurrent.ExecutorServ
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.hc.core5.http.ExceptionLogger;
-import org.apache.hc.core5.http.HttpConnectionFactory;
-import org.apache.hc.core5.http.HttpServerConnection;
 import org.apache.hc.core5.http.config.SocketConfig;
-import org.apache.hc.core5.http.protocol.HttpService;
+import org.apache.hc.core5.http.impl.io.HttpService;
+import org.apache.hc.core5.http.io.HttpConnectionFactory;
+import org.apache.hc.core5.http.io.HttpServerConnection;
 
 /**
  * @since 4.4

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/SSLServerSetupHandler.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/SSLServerSetupHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/SSLServerSetupHandler.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/SSLServerSetupHandler.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/SSLServerSetupHandler.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/SSLServerSetupHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/SSLServerSetupHandler.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.impl.bootstrap;
+package org.apache.hc.core5.http.bootstrap.io;
 
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLServerSocket;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/ServerBootstrap.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/ServerBootstrap.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/ServerBootstrap.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/ServerBootstrap.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/ServerBootstrap.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/ServerBootstrap.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/ServerBootstrap.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.impl.bootstrap;
+package org.apache.hc.core5.http.bootstrap.io;
 
 import java.net.InetAddress;
 import java.util.HashMap;
@@ -36,28 +36,28 @@ import javax.net.ssl.SSLContext;
 
 import org.apache.hc.core5.http.ConnectionReuseStrategy;
 import org.apache.hc.core5.http.ExceptionLogger;
-import org.apache.hc.core5.http.HttpConnectionFactory;
 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.config.SocketConfig;
-import org.apache.hc.core5.http.impl.DefaultBHttpServerConnection;
-import org.apache.hc.core5.http.impl.DefaultBHttpServerConnectionFactory;
 import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
+import org.apache.hc.core5.http.impl.io.DefaultBHttpServerConnection;
+import org.apache.hc.core5.http.impl.io.DefaultBHttpServerConnectionFactory;
+import org.apache.hc.core5.http.impl.io.HttpService;
+import org.apache.hc.core5.http.io.HttpConnectionFactory;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
+import org.apache.hc.core5.http.io.HttpRequestHandlerMapper;
+import org.apache.hc.core5.http.io.UriHttpRequestHandlerMapper;
 import org.apache.hc.core5.http.protocol.HttpExpectationVerifier;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
 import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;
-import org.apache.hc.core5.http.protocol.HttpRequestHandler;
-import org.apache.hc.core5.http.protocol.HttpRequestHandlerMapper;
-import org.apache.hc.core5.http.protocol.HttpService;
 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;
-import org.apache.hc.core5.http.protocol.UriHttpRequestHandlerMapper;
 
 /**
  * @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.hc.core5.http.HttpConnectionFactory)} method.
+     *HttpConnectionFactory)} method.
      */
     public final ServerBootstrap setConnectionConfig(final ConnectionConfig connectionConfig) {
         this.connectionConfig = connectionConfig;
@@ -243,7 +243,7 @@ public class ServerBootstrap {
      * matching the given pattern.
      * <p>
      * Please note this value can be overridden by the {@link #setHandlerMapper(
-     *   org.apache.hc.core5.http.protocol.HttpRequestHandlerMapper)} method.
+     *HttpRequestHandlerMapper)} method.
      *
      * @param pattern the pattern to register the handler for.
      * @param handler the handler.
@@ -277,7 +277,7 @@ public class ServerBootstrap {
     }
 
     /**
-     * Assigns {@link org.apache.hc.core5.http.impl.bootstrap.SSLServerSetupHandler} instance.
+     * Assigns {@link SSLServerSetupHandler} instance.
      */
     public final ServerBootstrap setSslSetupHandler(final SSLServerSetupHandler sslSetupHandler) {
         this.sslSetupHandler = sslSetupHandler;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/ThreadFactoryImpl.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/ThreadFactoryImpl.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/ThreadFactoryImpl.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/ThreadFactoryImpl.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/ThreadFactoryImpl.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/ThreadFactoryImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/ThreadFactoryImpl.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.impl.bootstrap;
+package org.apache.hc.core5.http.bootstrap.io;
 
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicLong;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/Worker.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/Worker.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/Worker.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/Worker.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/Worker.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/Worker.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/Worker.java Wed Nov 25 15:17:53 2015
@@ -24,15 +24,15 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.impl.bootstrap;
+package org.apache.hc.core5.http.bootstrap.io;
 
 import java.io.IOException;
 
 import org.apache.hc.core5.http.ExceptionLogger;
-import org.apache.hc.core5.http.HttpServerConnection;
+import org.apache.hc.core5.http.impl.io.HttpService;
+import org.apache.hc.core5.http.io.HttpServerConnection;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.hc.core5.http.protocol.HttpService;
 
 /**
  * @since 4.4

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/package-info.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/package-info.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/package-info.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/package-info.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/package-info.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/package-info.java Wed Nov 25 15:17:53 2015
@@ -28,4 +28,4 @@
 /**
  * Embedded server and server bootstrap.
  */
-package org.apache.hc.core5.http.impl.bootstrap;
+package org.apache.hc.core5.http.bootstrap.io;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/HttpServer.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/HttpServer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/HttpServer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/HttpServer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/HttpServer.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/HttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/HttpServer.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.bootstrap;
+package org.apache.hc.core5.http.bootstrap.nio;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -35,8 +35,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.hc.core5.http.ExceptionLogger;
-import org.apache.hc.core5.http.nio.DefaultHttpServerIODispatch;
-import org.apache.hc.core5.http.nio.DefaultNHttpServerConnection;
+import org.apache.hc.core5.http.impl.nio.DefaultHttpServerIODispatch;
+import org.apache.hc.core5.http.impl.nio.DefaultNHttpServerConnection;
 import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
 import org.apache.hc.core5.http.nio.NHttpServerEventHandler;
 import org.apache.hc.core5.reactor.DefaultListeningIOReactor;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/ServerBootstrap.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/ServerBootstrap.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/ServerBootstrap.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/ServerBootstrap.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/ServerBootstrap.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/ServerBootstrap.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/ServerBootstrap.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.bootstrap;
+package org.apache.hc.core5.http.bootstrap.nio;
 
 import java.net.InetAddress;
 import java.util.HashMap;
@@ -41,15 +41,15 @@ import org.apache.hc.core5.http.HttpResp
 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.nio.DefaultNHttpServerConnection;
-import org.apache.hc.core5.http.nio.DefaultNHttpServerConnectionFactory;
+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.HttpAsyncService;
+import org.apache.hc.core5.http.impl.nio.SSLNHttpServerConnectionFactory;
+import org.apache.hc.core5.http.impl.nio.UriHttpAsyncRequestHandlerMapper;
+import org.apache.hc.core5.http.nio.HttpAsyncExpectationVerifier;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestHandler;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestHandlerMapper;
 import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
-import org.apache.hc.core5.http.nio.SSLNHttpServerConnectionFactory;
-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.protocol.HttpProcessor;
 import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;
 import org.apache.hc.core5.http.protocol.RequestValidateHost;
@@ -231,7 +231,7 @@ public class ServerBootstrap {
     }
 
     /**
-     * Assigns {@link org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandlerMapper} instance.
+     * Assigns {@link 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.hc.core5.http.nio.protocol.HttpAsyncRequestHandler}
+     * Registers the given {@link HttpAsyncRequestHandler}
      * as a handler for URIs matching the given pattern.
      * <p>
      * Please note this value can be overridden by the {@link #setHandlerMapper(
-     *   org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandlerMapper)} )} method.
+     *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.hc.core5.http.nio.protocol.HttpAsyncExpectationVerifier} instance.
+     * Assigns {@link HttpAsyncExpectationVerifier} instance.
      */
     public final ServerBootstrap setExpectationVerifier(final HttpAsyncExpectationVerifier expectationVerifier) {
         this.expectationVerifier = expectationVerifier;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/ThreadFactoryImpl.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/ThreadFactoryImpl.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/ThreadFactoryImpl.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/ThreadFactoryImpl.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/ThreadFactoryImpl.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/ThreadFactoryImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/ThreadFactoryImpl.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.bootstrap;
+package org.apache.hc.core5.http.bootstrap.nio;
 
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicLong;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/package-info.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/package-info.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/package-info.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/package-info.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/package-info.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/package-info.java Wed Nov 25 15:17:53 2015
@@ -28,4 +28,4 @@
 /**
  * Embedded non-blocking server and server bootstrap.
  */
-package org.apache.hc.core5.http.nio.bootstrap;
+package org.apache.hc.core5.http.bootstrap.nio;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultContentLengthStrategy.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/entity/DefaultContentLengthStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultContentLengthStrategy.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultContentLengthStrategy.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/entity/DefaultContentLengthStrategy.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/entity/DefaultContentLengthStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultContentLengthStrategy.java Wed Nov 25 15:17:53 2015
@@ -25,9 +25,10 @@
  *
  */
 
-package org.apache.hc.core5.http.impl.entity;
+package org.apache.hc.core5.http.impl;
 
 import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.http.ContentLengthStrategy;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpException;
@@ -35,7 +36,6 @@ import org.apache.hc.core5.http.HttpHead
 import org.apache.hc.core5.http.HttpMessage;
 import org.apache.hc.core5.http.NotImplementedException;
 import org.apache.hc.core5.http.ProtocolException;
-import org.apache.hc.core5.http.entity.ContentLengthStrategy;
 import org.apache.hc.core5.util.Args;
 
 /**

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/BHttpConnectionBase.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/BHttpConnectionBase.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/BHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.impl;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -38,8 +38,8 @@ import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.hc.core5.http.BHttpConnection;
 import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.http.ContentLengthStrategy;
 import org.apache.hc.core5.http.HttpConnectionMetrics;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpException;
@@ -47,17 +47,9 @@ import org.apache.hc.core5.http.HttpHead
 import org.apache.hc.core5.http.HttpMessage;
 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.io.ChunkedInputStream;
-import org.apache.hc.core5.http.impl.io.ChunkedOutputStream;
-import org.apache.hc.core5.http.impl.io.ContentLengthInputStream;
-import org.apache.hc.core5.http.impl.io.ContentLengthOutputStream;
-import org.apache.hc.core5.http.impl.io.EmptyInputStream;
-import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.hc.core5.http.impl.io.IdentityInputStream;
-import org.apache.hc.core5.http.impl.io.IdentityOutputStream;
-import org.apache.hc.core5.http.impl.io.SessionInputBufferImpl;
-import org.apache.hc.core5.http.impl.io.SessionOutputBufferImpl;
+import org.apache.hc.core5.http.impl.HttpConnectionMetricsImpl;
+import org.apache.hc.core5.http.impl.IncomingHttpEntity;
+import org.apache.hc.core5.http.io.BHttpConnection;
 import org.apache.hc.core5.http.io.SessionInputBuffer;
 import org.apache.hc.core5.http.io.SessionOutputBuffer;
 import org.apache.hc.core5.util.Args;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnection.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpClientConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnection.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnection.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpClientConnection.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnection.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.impl;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -34,7 +34,7 @@ import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 
 import org.apache.hc.core5.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.HttpClientConnection;
+import org.apache.hc.core5.http.ContentLengthStrategy;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpRequest;
@@ -42,10 +42,8 @@ import org.apache.hc.core5.http.HttpResp
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.LengthRequiredException;
 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.io.DefaultHttpRequestWriterFactory;
-import org.apache.hc.core5.http.impl.io.DefaultHttpResponseParserFactory;
+import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
+import org.apache.hc.core5.http.io.HttpClientConnection;
 import org.apache.hc.core5.http.io.HttpMessageParser;
 import org.apache.hc.core5.http.io.HttpMessageParserFactory;
 import org.apache.hc.core5.http.io.HttpMessageWriter;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnectionFactory.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpClientConnectionFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnectionFactory.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnectionFactory.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpClientConnectionFactory.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnectionFactory.java Wed Nov 25 15:17:53 2015
@@ -25,22 +25,23 @@
  *
  */
 
-package org.apache.hc.core5.http.impl;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 import java.net.Socket;
 
 import org.apache.hc.core5.annotation.Immutable;
-import org.apache.hc.core5.http.HttpConnectionFactory;
+import org.apache.hc.core5.http.ContentLengthStrategy;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 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.io.HttpConnectionFactory;
 import org.apache.hc.core5.http.io.HttpMessageParserFactory;
 import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
 
 /**
- * Default factory for {@link org.apache.hc.core5.http.HttpClientConnection}s.
+ * Default factory for {@link org.apache.hc.core5.http.io.HttpClientConnection}s.
  *
  * @since 4.3
  */

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnection.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpServerConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnection.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnection.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpServerConnection.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnection.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.impl;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -34,20 +34,18 @@ import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 
 import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.ContentLengthStrategy;
 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.HttpServerConnection;
 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.io.DefaultHttpRequestParserFactory;
-import org.apache.hc.core5.http.impl.io.DefaultHttpResponseWriterFactory;
+import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
 import org.apache.hc.core5.http.io.HttpMessageParser;
 import org.apache.hc.core5.http.io.HttpMessageParserFactory;
 import org.apache.hc.core5.http.io.HttpMessageWriter;
 import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
+import org.apache.hc.core5.http.io.HttpServerConnection;
 import org.apache.hc.core5.util.Args;
 
 /**

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnectionFactory.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpServerConnectionFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnectionFactory.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnectionFactory.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpServerConnectionFactory.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnectionFactory.java Wed Nov 25 15:17:53 2015
@@ -25,22 +25,23 @@
  *
  */
 
-package org.apache.hc.core5.http.impl;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 import java.net.Socket;
 
 import org.apache.hc.core5.annotation.Immutable;
-import org.apache.hc.core5.http.HttpConnectionFactory;
+import org.apache.hc.core5.http.ContentLengthStrategy;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 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.io.HttpConnectionFactory;
 import org.apache.hc.core5.http.io.HttpMessageParserFactory;
 import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
 
 /**
- * Default factory for {@link org.apache.hc.core5.http.HttpServerConnection}s.
+ * Default factory for {@link org.apache.hc.core5.http.io.HttpServerConnection}s.
  *
  * @since 4.3
  */

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpRequestExecutor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpRequestExecutor.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java Wed Nov 25 15:17:53 2015
@@ -25,13 +25,12 @@
  *
  */
 
-package org.apache.hc.core5.http.protocol;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
-import org.apache.hc.core5.http.HttpClientConnection;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHeaders;
@@ -39,6 +38,10 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.ProtocolException;
+import org.apache.hc.core5.http.io.HttpClientConnection;
+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.util.Args;
 
 /**

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpService.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpService.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.protocol;
+package org.apache.hc.core5.http.impl.io;
 
 import java.io.IOException;
 
@@ -38,7 +38,6 @@ import org.apache.hc.core5.http.HttpHead
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpResponseFactory;
-import org.apache.hc.core5.http.HttpServerConnection;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.MethodNotSupportedException;
 import org.apache.hc.core5.http.NotImplementedException;
@@ -49,6 +48,13 @@ import org.apache.hc.core5.http.entity.E
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
+import org.apache.hc.core5.http.io.HttpRequestHandlerMapper;
+import org.apache.hc.core5.http.io.HttpServerConnection;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.protocol.HttpExpectationVerifier;
+import org.apache.hc.core5.http.protocol.HttpProcessor;
 import org.apache.hc.core5.util.Args;
 
 /**

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncRequestConsumer.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncRequestConsumer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncRequestConsumer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncRequestConsumer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncRequestConsumer.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncRequestConsumer.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -34,6 +34,7 @@ import org.apache.hc.core5.http.HttpExce
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
 import org.apache.hc.core5.http.nio.IOControl;
 import org.apache.hc.core5.http.protocol.HttpContext;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncResponseConsumer.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncResponseConsumer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncResponseConsumer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncResponseConsumer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncResponseConsumer.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncResponseConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncResponseConsumer.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -34,6 +34,7 @@ import org.apache.hc.core5.http.HttpExce
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.HttpAsyncResponseConsumer;
 import org.apache.hc.core5.http.nio.IOControl;
 import org.apache.hc.core5.http.protocol.HttpContext;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentDecoder.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractContentDecoder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentDecoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentDecoder.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractContentDecoder.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractContentDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentDecoder.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentEncoder.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractContentEncoder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentEncoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentEncoder.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractContentEncoder.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractContentEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentEncoder.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageParser.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractMessageParser.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageParser.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageParser.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractMessageParser.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageParser.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.util.ArrayList;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageWriter.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractMessageWriter.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageWriter.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageWriter.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractMessageWriter.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractMessageWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageWriter.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.util.Iterator;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncClientExchangeHandler.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncClientExchangeHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncClientExchangeHandler.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncClientExchangeHandler.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncClientExchangeHandler.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncClientExchangeHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncClientExchangeHandler.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.util.concurrent.Future;
@@ -39,6 +39,9 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.nio.ContentDecoder;
 import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.HttpAsyncClientExchangeHandler;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestProducer;
+import org.apache.hc.core5.http.nio.HttpAsyncResponseConsumer;
 import org.apache.hc.core5.http.nio.IOControl;
 import org.apache.hc.core5.http.nio.NHttpClientConnection;
 import org.apache.hc.core5.http.protocol.HttpContext;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestConsumer.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestConsumer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestConsumer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestConsumer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestConsumer.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestConsumer.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 
@@ -35,14 +35,13 @@ import org.apache.hc.core5.http.entity.C
 import org.apache.hc.core5.http.nio.ContentDecoder;
 import org.apache.hc.core5.http.nio.IOControl;
 import org.apache.hc.core5.http.nio.entity.ContentBufferEntity;
-import org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator;
-import org.apache.hc.core5.http.nio.util.SimpleInputBuffer;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Asserts;
+import org.apache.hc.core5.util.HeapByteBufferAllocator;
 
 /**
- * Basic implementation of {@link HttpAsyncRequestConsumer}. Please note that
- * this consumer buffers request content in memory and should be used for
+ * Basic implementation of {@link org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer}.
+ * Please note that this consumer buffers request content in memory and should be used for
  * relatively small request messages.
  *
  * @since 4.2

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestHandler.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestHandler.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestHandler.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestHandler.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestHandler.java Wed Nov 25 15:17:53 2015
@@ -25,15 +25,18 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
+import org.apache.hc.core5.http.nio.HttpAsyncExchange;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestHandler;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.core5.http.protocol.HttpRequestHandler;
 import org.apache.hc.core5.util.Args;
 
 /**
@@ -57,7 +60,7 @@ public class BasicAsyncRequestHandler im
 
     @Override
     public HttpAsyncRequestConsumer<HttpRequest> processRequest(final HttpRequest request,
-            final HttpContext context) {
+                                                                final HttpContext context) {
         return new BasicAsyncRequestConsumer();
     }
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestProducer.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestProducer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestProducer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestProducer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestProducer.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestProducer.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 
@@ -32,6 +32,7 @@ import org.apache.hc.core5.http.HttpEnti
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestProducer;
 import org.apache.hc.core5.http.nio.IOControl;
 import org.apache.hc.core5.http.nio.entity.EntityAsyncContentProducer;
 import org.apache.hc.core5.http.nio.entity.HttpAsyncContentProducer;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseConsumer.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseConsumer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseConsumer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseConsumer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseConsumer.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseConsumer.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 
@@ -35,14 +35,13 @@ import org.apache.hc.core5.http.entity.C
 import org.apache.hc.core5.http.nio.ContentDecoder;
 import org.apache.hc.core5.http.nio.IOControl;
 import org.apache.hc.core5.http.nio.entity.ContentBufferEntity;
-import org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator;
-import org.apache.hc.core5.http.nio.util.SimpleInputBuffer;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Asserts;
+import org.apache.hc.core5.util.HeapByteBufferAllocator;
 
 /**
- * Basic implementation of {@link HttpAsyncResponseConsumer}. Please note that
- * this consumer buffers response content in memory and should be used for
+ * Basic implementation of {@link org.apache.hc.core5.http.nio.HttpAsyncResponseConsumer}.
+ * Please note that this consumer buffers response content in memory and should be used for
  * relatively small response messages.
  *
  * @since 4.2

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseProducer.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseProducer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseProducer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseProducer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseProducer.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseProducer.java Wed Nov 25 15:17:53 2015
@@ -25,13 +25,14 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.HttpAsyncResponseProducer;
 import org.apache.hc.core5.http.nio.IOControl;
 import org.apache.hc.core5.http.nio.entity.EntityAsyncContentProducer;
 import org.apache.hc.core5.http.nio.entity.HttpAsyncContentProducer;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkDecoder.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/ChunkDecoder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkDecoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkDecoder.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/ChunkDecoder.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/ChunkDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkDecoder.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkEncoder.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/ChunkEncoder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkEncoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkEncoder.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/ChunkEncoder.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/ChunkEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkEncoder.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ContentDecoderChannel.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/ContentDecoderChannel.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ContentDecoderChannel.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ContentDecoderChannel.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/ContentDecoderChannel.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/ContentDecoderChannel.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ContentDecoderChannel.java Wed Nov 25 15:17:53 2015
@@ -25,12 +25,14 @@
  *
  */
 
-package org.apache.hc.core5.http.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
 
+import org.apache.hc.core5.http.nio.ContentDecoder;
+
 /**
  * A {@link ReadableByteChannel} that delegates to a {@link ContentDecoder}.
  * Attempts to close this channel are ignored, and {@link #isOpen} always

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ContentEncoderChannel.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/ContentEncoderChannel.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ContentEncoderChannel.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ContentEncoderChannel.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/ContentEncoderChannel.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/ContentEncoderChannel.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ContentEncoderChannel.java Wed Nov 25 15:17:53 2015
@@ -25,12 +25,14 @@
  *
  */
 
-package org.apache.hc.core5.http.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
+import org.apache.hc.core5.http.nio.ContentEncoder;
+
 /**
  * A {@link WritableByteChannel} that delegates to a {@link ContentEncoder}.
  * Attempts to close this channel are ignored, and {@link #isOpen} always

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpClientIODispatch.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultHttpClientIODispatch.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpClientIODispatch.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpClientIODispatch.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultHttpClientIODispatch.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultHttpClientIODispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpClientIODispatch.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 
@@ -33,6 +33,8 @@ import javax.net.ssl.SSLContext;
 
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.nio.NHttpClientEventHandler;
+import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
 import org.apache.hc.core5.reactor.AbstractIODispatch;
 import org.apache.hc.core5.reactor.IOSession;
 import org.apache.hc.core5.reactor.ssl.SSLSetupHandler;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParser.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestParser.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParser.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParser.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestParser.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParser.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
 
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.HttpException;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParserFactory.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestParserFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParserFactory.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParserFactory.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestParserFactory.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParserFactory.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
 
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpRequest;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriter.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestWriter.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriter.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriter.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestWriter.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriter.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriterFactory.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestWriterFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriterFactory.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriterFactory.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestWriterFactory.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriterFactory.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
 
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpRequest;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParser.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseParser.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParser.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParser.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseParser.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParser.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
 
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.HttpException;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParserFactory.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseParserFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParserFactory.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParserFactory.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseParserFactory.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParserFactory.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
 
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpResponse;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriter.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseWriter.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriter.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriter.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseWriter.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriter.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriterFactory.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseWriterFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriterFactory.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriterFactory.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseWriterFactory.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriterFactory.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
 
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpResponse;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpServerIODispatch.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultHttpServerIODispatch.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpServerIODispatch.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpServerIODispatch.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultHttpServerIODispatch.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultHttpServerIODispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpServerIODispatch.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 
@@ -33,6 +33,8 @@ import javax.net.ssl.SSLContext;
 
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
+import org.apache.hc.core5.http.nio.NHttpServerEventHandler;
 import org.apache.hc.core5.reactor.AbstractIODispatch;
 import org.apache.hc.core5.reactor.IOSession;
 import org.apache.hc.core5.reactor.ssl.SSLSetupHandler;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpClientConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpClientConnection.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.nio.channels.SelectionKey;
@@ -33,20 +33,24 @@ import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 
 import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.ContentLengthStrategy;
 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.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.nio.codecs.DefaultHttpRequestWriterFactory;
-import org.apache.hc.core5.http.nio.codecs.DefaultHttpResponseParserFactory;
-import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
+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.reactor.EventMask;
 import org.apache.hc.core5.reactor.IOSession;
 import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.util.ByteBufferAllocator;
 
 /**
  * Default implementation of the {@link org.apache.hc.core5.http.nio.NHttpClientConnection}
@@ -71,7 +75,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.hc.core5.http.nio.util.HeapByteBufferAllocator#INSTANCE}
+     *   If {@code null} {@link org.apache.hc.core5.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.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpClientConnectionFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpClientConnectionFactory.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java Wed Nov 25 15:17:53 2015
@@ -24,16 +24,19 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.http.ContentLengthStrategy;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 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.util.ByteBufferAllocator;
+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.reactor.IOSession;
+import org.apache.hc.core5.util.ByteBufferAllocator;
 
 /**
  * Default factory for plain (non-encrypted), non-blocking

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpServerConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpServerConnection.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.io.IOException;
 import java.nio.channels.SelectionKey;
@@ -33,19 +33,23 @@ import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 
 import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.ContentLengthStrategy;
 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.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.nio.codecs.DefaultHttpRequestParserFactory;
-import org.apache.hc.core5.http.nio.codecs.DefaultHttpResponseWriterFactory;
-import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
+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.reactor.EventMask;
 import org.apache.hc.core5.reactor.IOSession;
 import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.util.ByteBufferAllocator;
 
 /**
  * Default implementation of the {@link org.apache.hc.core5.http.nio.NHttpServerConnection}
@@ -69,7 +73,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.hc.core5.http.nio.util.HeapByteBufferAllocator#INSTANCE}
+     *   If {@code null} {@link org.apache.hc.core5.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.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpServerConnectionFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpServerConnectionFactory.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java Wed Nov 25 15:17:53 2015
@@ -24,16 +24,19 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.http.ContentLengthStrategy;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 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.util.ByteBufferAllocator;
+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.reactor.IOSession;
+import org.apache.hc.core5.util.ByteBufferAllocator;
 
 /**
  * Default factory for plain (non-encrypted), non-blocking




Mime
View raw message