svn commit: r1716435 [1/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...

[ol...@apache.org]

Author: olegk
Date: Wed Nov 25 15:17:53 2015
New Revision: 1716435

URL: http://svn.apache.org/viewvc?rev=1716435&view=rev
Log:
Reorganized http packages

Added:
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ContentLengthStrategy.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ContentLengthStrategy.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/HttpServer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpServer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/RequestListener.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/RequestListener.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/SSLServerSetupHandler.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/SSLServerSetupHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/ServerBootstrap.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/ServerBootstrap.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/ThreadFactoryImpl.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/ThreadFactoryImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/Worker.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/Worker.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/io/package-info.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/package-info.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/HttpServer.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/HttpServer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/ServerBootstrap.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/ServerBootstrap.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/ThreadFactoryImpl.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/ThreadFactoryImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/bootstrap/nio/package-info.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/package-info.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultContentLengthStrategy.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/entity/DefaultContentLengthStrategy.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/BHttpConnectionBase.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnection.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnectionFactory.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpClientConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnection.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnectionFactory.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpServerConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpRequestExecutor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpService.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncRequestConsumer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncRequestConsumer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncResponseConsumer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncResponseConsumer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentDecoder.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractContentDecoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentEncoder.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractContentEncoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageParser.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractMessageParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageWriter.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/AbstractMessageWriter.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncClientExchangeHandler.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncClientExchangeHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestConsumer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestConsumer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestHandler.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestProducer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestProducer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseConsumer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseConsumer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseProducer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseProducer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkDecoder.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/ChunkDecoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkEncoder.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/ChunkEncoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ContentDecoderChannel.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/ContentDecoderChannel.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ContentEncoderChannel.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/ContentEncoderChannel.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpClientIODispatch.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultHttpClientIODispatch.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParser.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParserFactory.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestParserFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriter.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestWriter.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriterFactory.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpRequestWriterFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParser.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParserFactory.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseParserFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriter.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseWriter.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriterFactory.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/DefaultHttpResponseWriterFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpServerIODispatch.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultHttpServerIODispatch.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpClientConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpServerConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ErrorResponseProducer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/ErrorResponseProducer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/ExpandableBuffer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/ExpandableBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequestExecutor.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestExecutor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequester.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequester.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncService.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncService.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/IdentityDecoder.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/IdentityDecoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/IdentityEncoder.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/IdentityEncoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/LengthDelimitedDecoder.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/LengthDelimitedDecoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/LengthDelimitedEncoder.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/LengthDelimitedEncoder.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/MessageState.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/MessageState.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/NHttpConnectionBase.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpConnectionBase.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/NullRequestConsumer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/NullRequestConsumer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/NullRequestHandler.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/NullRequestHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/Pipelined.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/Pipelined.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/PipeliningClientExchangeHandler.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/PipeliningClientExchangeHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpClientConnectionFactory.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SSLNHttpClientConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpServerConnectionFactory.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SSLNHttpServerConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SessionHttpContext.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionHttpContext.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SessionInputBufferImpl.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionInputBufferImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SessionOutputBufferImpl.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionOutputBufferImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SharedInputBuffer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SharedInputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SharedOutputBuffer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SharedOutputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SimpleInputBuffer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SimpleInputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SimpleOutputBuffer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SimpleOutputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/UriHttpAsyncRequestHandlerMapper.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/UriHttpAsyncRequestHandlerMapper.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/BHttpConnection.java
      - copied, changed from r1716432, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/BHttpConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpClientConnection.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpConnectionFactory.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpRequestHandler.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpRequestHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpRequestHandlerMapper.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpRequestHandlerMapper.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/HttpServerConnection.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/io/UriHttpRequestHandlerMapper.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/UriHttpRequestHandlerMapper.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/ContentInputBuffer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/ContentInputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/ContentOutputBuffer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/ContentOutputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncClientExchangeHandler.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncClientExchangeHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncExchange.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncExchange.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncExpectationVerifier.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncExpectationVerifier.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestConsumer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestConsumer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestHandler.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestHandlerMapper.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestHandlerMapper.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestProducer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestProducer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncResponseConsumer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncResponseConsumer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncResponseProducer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncResponseProducer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/io/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/io/BasicConnFactory.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/io/BasicConnPool.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/io/BasicPoolEntry.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicPoolEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/io/package-info.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/package-info.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/nio/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/nio/BasicNIOConnFactory.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOConnFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/nio/BasicNIOConnPool.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/nio/BasicNIOPoolEntry.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOPoolEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/nio/package-info.java   (with props)
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/ByteBufferAllocator.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/ByteBufferAllocator.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/DirectByteBufferAllocator.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/DirectByteBufferAllocator.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/HeapByteBufferAllocator.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/HeapByteBufferAllocator.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultContentLengthStrategy.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/entity/TestDefaultContentLengthStrategy.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/SessionInputBufferMock.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/SessionInputBufferMock.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferMock.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/SessionOutputBufferMock.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestBHttpConnectionBase.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestBHttpConnectionBase.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultBHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultBHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestHttpRequestExecutor.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestHttpService.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ByteChannelMock.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/ByteChannelMock.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/CodecTestUtils.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/CodecTestUtils.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ContentDecoderMock.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentDecoderMock.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ContentEncoderMock.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ExceptionEventTest.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/ExceptionEventTest.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ReadableByteChannelMock.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/ReadableByteChannelMock.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncClientExchangeHandler.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncClientExchangeHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestConsumer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestConsumer.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestHandler.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestProducer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestProducer.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseConsumer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseConsumer.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseProducer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseProducer.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBuffers.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestChunkDecoder.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkDecoder.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestChunkEncoder.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkEncoder.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestContentChannel.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestContentChannel.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpClientConnection.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpServerConnection.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestErrorResponseProducer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestErrorResponseProducer.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequestExecutor.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequestExecutor.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequester.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncService.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncService.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpMessageParser.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestHttpMessageParser.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestIdentityDecoder.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityDecoder.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestIdentityEncoder.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityEncoder.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestLengthDelimitedDecoder.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedDecoder.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestLengthDelimitedEncoder.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedEncoder.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestNHttpConnectionBase.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestSessionInOutBuffers.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestUriHttpAsyncRequestHandlerMapper.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestUriHttpAsyncRequestHandlerMapper.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/WritableByteChannelMock.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/WritableByteChannelMock.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/RndTestPatternGenerator.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/RndTestPatternGenerator.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/SimpleRequestHandler.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/SimpleRequestHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestClientOutOfSequenceResponse.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestClientOutOfSequenceResponse.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestCustomSSL.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestDefaultListeningIOReactor.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestDefaultListeningIOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlerCancellable.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlerCancellable.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlers.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlers.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersBrokenExpectContinue.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersBrokenExpectContinue.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersPipelining.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersPipelining.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncPrematureTermination.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncPrematureTermination.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncTimeout.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncTimeout.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestServerSidePipelining.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestServerSidePipelining.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestTruncatedChunks.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/io/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/io/TestUriHttpRequestHandlerMapper.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestUriHttpRequestHandlerMapper.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/io/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/io/TestBasicConnPool.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/pool/TestBasicConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/nio/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/nio/TestBasicNIOConnPool.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestBasicNIOConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/HttpClient.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/HttpClient.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/HttpServer.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/HttpServer.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpClientConnection.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingBHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpServerConnection.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingBHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingInputStream.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingInputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingOutputStream.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingOutputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/Wire.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/Wire.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/ClientConnectionFactory.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ClientConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpClientNio.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpClientNio.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpCoreNIOTestBase.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpCoreNIOTestBase.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpServerNio.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpServerNio.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingIOSession.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingIOSession.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingNHttpClientConnection.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingNHttpServerConnection.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/ServerConnectionFactory.java
      - copied, changed from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ServerConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/Wire.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/Wire.java
Removed:
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/BHttpConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/HttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ContentLengthStrategy.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/BHttpConnectionBase.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpClientConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/DefaultBHttpServerConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/bootstrap/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/entity/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/ContentDecoderChannel.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/ContentEncoderChannel.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultHttpClientIODispatch.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultHttpServerIODispatch.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpClientConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultNHttpServerConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpConnectionBase.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SSLNHttpClientConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SSLNHttpServerConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionHttpContext.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionInputBufferImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionOutputBufferImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/bootstrap/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpRequestExecutor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpRequestHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpRequestHandlerMapper.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpService.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/UriHttpRequestHandlerMapper.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/ByteChannelMock.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/ReadableByteChannelMock.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/WritableByteChannelMock.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/SessionInputBufferMock.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/SessionOutputBufferMock.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestBHttpConnectionBase.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultBHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultBHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/entity/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/pool/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestHttpRequestExecutor.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestHttpService.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestUriHttpRequestHandlerMapper.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/HttpClient.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/HttpServer.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingBHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingBHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingInputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingOutputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/Wire.java
Modified:
    httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkConnection.java
    httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkWorker.java
    httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/HttpServer.java
    httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/SmokeTest.java
    httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalReverseProxy.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpReverseProxy.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/entity/ContentBufferEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/entity/ContentInputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/entity/ContentOutputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/entity/NFileEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestChunkCoding.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestContentLengthInputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestContentLengthOutputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestIdentityInputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestIdentityOutputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestMessageParser.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestSyncHttp.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestConnPool.java

Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkConnection.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkConnection.java Wed Nov 25 15:17:53 2015
@@ -30,7 +30,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 import org.apache.hc.core5.http.TrailerSupplier;
-import org.apache.hc.core5.http.impl.DefaultBHttpClientConnection;
+import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
 import org.apache.hc.core5.http.io.SessionInputBuffer;
 import org.apache.hc.core5.http.io.SessionOutputBuffer;
 

Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkWorker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkWorker.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkWorker.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkWorker.java Wed Nov 25 15:17:53 2015
@@ -49,7 +49,7 @@ import org.apache.hc.core5.http.impl.Def
 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.HttpRequestExecutor;
+import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
 import org.apache.hc.core5.http.protocol.RequestConnControl;
 import org.apache.hc.core5.http.protocol.RequestContent;
 import org.apache.hc.core5.http.protocol.RequestExpectContinue;

Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/HttpServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/HttpServer.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/HttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/HttpServer.java Wed Nov 25 15:17:53 2015
@@ -36,21 +36,21 @@ import java.net.Socket;
 import org.apache.hc.core5.http.ConnectionClosedException;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpResponseInterceptor;
-import org.apache.hc.core5.http.HttpServerConnection;
-import org.apache.hc.core5.http.impl.DefaultBHttpServerConnection;
+import org.apache.hc.core5.http.io.HttpServerConnection;
+import org.apache.hc.core5.http.impl.io.DefaultBHttpServerConnection;
 import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
-import org.apache.hc.core5.http.protocol.HttpRequestHandler;
-import org.apache.hc.core5.http.protocol.HttpService;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
+import org.apache.hc.core5.http.impl.io.HttpService;
 import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
 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;
+import org.apache.hc.core5.http.io.UriHttpRequestHandlerMapper;
 import org.apache.hc.core5.util.Asserts;
 
 public class HttpServer {

Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/SmokeTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/SmokeTest.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/SmokeTest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/SmokeTest.java Wed Nov 25 15:17:53 2015
@@ -36,7 +36,7 @@ import org.apache.hc.core5.http.HttpStat
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.core5.http.protocol.HttpRequestHandler;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/Common.java Wed Nov 25 15:17:53 2015
@@ -93,7 +93,9 @@ public class Common {
                         "org.apache.hc.core5.http.message",
                         "org.apache.hc.core5.http.protocol",
                         "org.apache.hc.core5.http.impl",
-                        "org.apache.hc.core5.http.impl.bootstrap",
+                        "org.apache.hc.core5.http.impl.io",
+                        "org.apache.hc.core5.http.io",
+                        "org.apache.hc.core5.http.bootstrap.io",
                         "org.apache.hc.core5.pool",
                         "org.apache.hc.core5.ssl",
                         "org.apache.hc.core5.util",

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java Wed Nov 25 15:17:53 2015
@@ -33,13 +33,13 @@ import org.apache.hc.core5.http.Connecti
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.hc.core5.http.impl.DefaultBHttpClientConnection;
 import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
+import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
+import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 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.HttpRequestExecutor;
 import org.apache.hc.core5.http.protocol.RequestConnControl;
 import org.apache.hc.core5.http.protocol.RequestContent;
 import org.apache.hc.core5.http.protocol.RequestExpectContinue;

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java Wed Nov 25 15:17:53 2015
@@ -41,13 +41,13 @@ import org.apache.hc.core5.http.entity.C
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.InputStreamEntity;
 import org.apache.hc.core5.http.entity.StringEntity;
-import org.apache.hc.core5.http.impl.DefaultBHttpClientConnection;
 import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
+import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
+import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 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.HttpRequestExecutor;
 import org.apache.hc.core5.http.protocol.RequestConnControl;
 import org.apache.hc.core5.http.protocol.RequestContent;
 import org.apache.hc.core5.http.protocol.RequestExpectContinue;

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java Wed Nov 25 15:17:53 2015
@@ -36,13 +36,13 @@ import org.apache.hc.core5.http.entity.C
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.HttpEntityWithTrailers;
 import org.apache.hc.core5.http.entity.StringEntity;
-import org.apache.hc.core5.http.impl.DefaultBHttpClientConnection;
+import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
+import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 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.HttpRequestExecutor;
 import org.apache.hc.core5.http.protocol.RequestConnControl;
 import org.apache.hc.core5.http.protocol.RequestContent;
 import org.apache.hc.core5.http.protocol.RequestTargetHost;

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java Wed Nov 25 15:17:53 2015
@@ -31,20 +31,20 @@ import java.io.IOException;
 import java.util.concurrent.Future;
 
 import org.apache.hc.core5.http.ConnectionReuseStrategy;
-import org.apache.hc.core5.http.HttpClientConnection;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
-import org.apache.hc.core5.http.impl.pool.BasicConnFactory;
-import org.apache.hc.core5.http.impl.pool.BasicConnPool;
-import org.apache.hc.core5.http.impl.pool.BasicPoolEntry;
+import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
+import org.apache.hc.core5.http.io.HttpClientConnection;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.pool.io.BasicConnFactory;
+import org.apache.hc.core5.http.pool.io.BasicConnPool;
+import org.apache.hc.core5.http.pool.io.BasicPoolEntry;
 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.HttpRequestExecutor;
 import org.apache.hc.core5.http.protocol.RequestConnControl;
 import org.apache.hc.core5.http.protocol.RequestContent;
 import org.apache.hc.core5.http.protocol.RequestExpectContinue;

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalReverseProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalReverseProxy.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalReverseProxy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalReverseProxy.java Wed Nov 25 15:17:53 2015
@@ -34,7 +34,6 @@ import java.net.Socket;
 
 import org.apache.hc.core5.http.ConnectionClosedException;
 import org.apache.hc.core5.http.ConnectionReuseStrategy;
-import org.apache.hc.core5.http.HttpClientConnection;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpHost;
@@ -42,17 +41,19 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpRequestInterceptor;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpResponseInterceptor;
-import org.apache.hc.core5.http.HttpServerConnection;
-import org.apache.hc.core5.http.impl.DefaultBHttpClientConnection;
-import org.apache.hc.core5.http.impl.DefaultBHttpServerConnection;
 import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
+import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
+import org.apache.hc.core5.http.impl.io.DefaultBHttpServerConnection;
+import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
+import org.apache.hc.core5.http.impl.io.HttpService;
+import org.apache.hc.core5.http.io.HttpClientConnection;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
+import org.apache.hc.core5.http.io.HttpServerConnection;
+import org.apache.hc.core5.http.io.UriHttpRequestHandlerMapper;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 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.HttpRequestExecutor;
-import org.apache.hc.core5.http.protocol.HttpRequestHandler;
-import org.apache.hc.core5.http.protocol.HttpService;
 import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
 import org.apache.hc.core5.http.protocol.RequestConnControl;
 import org.apache.hc.core5.http.protocol.RequestContent;
@@ -63,7 +64,6 @@ import org.apache.hc.core5.http.protocol
 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;
 
 /**
  * Elemental HTTP/1.1 reverse proxy.

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java Wed Nov 25 15:17:53 2015
@@ -47,16 +47,16 @@ 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.MethodNotSupportedException;
+import org.apache.hc.core5.http.bootstrap.io.HttpServer;
+import org.apache.hc.core5.http.bootstrap.io.ServerBootstrap;
 import org.apache.hc.core5.http.config.SocketConfig;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.FileEntity;
 import org.apache.hc.core5.http.entity.StringEntity;
-import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
-import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.hc.core5.http.protocol.HttpRequestHandler;
 import org.apache.hc.core5.ssl.SSLContexts;
 
 /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java Wed Nov 25 15:17:53 2015
@@ -34,13 +34,13 @@ import org.apache.hc.core5.concurrent.Fu
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestProducer;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseConsumer;
+import org.apache.hc.core5.http.impl.nio.DefaultHttpClientIODispatch;
+import org.apache.hc.core5.http.impl.nio.HttpAsyncRequestExecutor;
+import org.apache.hc.core5.http.impl.nio.HttpAsyncRequester;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.hc.core5.http.nio.DefaultHttpClientIODispatch;
-import org.apache.hc.core5.http.nio.pool.BasicNIOConnPool;
-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.pool.nio.BasicNIOConnPool;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
 import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java Wed Nov 25 15:17:53 2015
@@ -42,16 +42,16 @@ 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.MethodNotSupportedException;
+import org.apache.hc.core5.http.bootstrap.nio.HttpServer;
+import org.apache.hc.core5.http.bootstrap.nio.ServerBootstrap;
 import org.apache.hc.core5.http.entity.ContentType;
-import org.apache.hc.core5.http.nio.bootstrap.HttpServer;
-import org.apache.hc.core5.http.nio.bootstrap.ServerBootstrap;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestConsumer;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseProducer;
+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.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.reactor.IOReactorConfig;

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpReverseProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpReverseProxy.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpReverseProxy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/NHttpReverseProxy.java Wed Nov 25 15:17:53 2015
@@ -46,31 +46,31 @@ import org.apache.hc.core5.http.config.C
 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.BasicAsyncResponseProducer;
+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.HttpAsyncRequestExecutor;
+import org.apache.hc.core5.http.impl.nio.HttpAsyncRequester;
+import org.apache.hc.core5.http.impl.nio.HttpAsyncService;
+import org.apache.hc.core5.http.impl.nio.UriHttpAsyncRequestHandlerMapper;
 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.DefaultHttpClientIODispatch;
-import org.apache.hc.core5.http.nio.DefaultHttpServerIODispatch;
+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.nio.HttpAsyncRequestHandlerMapper;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestProducer;
+import org.apache.hc.core5.http.nio.HttpAsyncResponseConsumer;
+import org.apache.hc.core5.http.nio.HttpAsyncResponseProducer;
 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.BasicNIOConnPool;
-import org.apache.hc.core5.http.nio.pool.BasicNIOPoolEntry;
-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.pool.nio.BasicNIOConnPool;
+import org.apache.hc.core5.http.pool.nio.BasicNIOPoolEntry;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java Wed Nov 25 15:17:53 2015
@@ -36,13 +36,13 @@ import org.apache.hc.core5.concurrent.Fu
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestProducer;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseConsumer;
+import org.apache.hc.core5.http.impl.nio.DefaultHttpClientIODispatch;
+import org.apache.hc.core5.http.impl.nio.HttpAsyncRequestExecutor;
+import org.apache.hc.core5.http.impl.nio.HttpAsyncRequester;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.hc.core5.http.nio.DefaultHttpClientIODispatch;
-import org.apache.hc.core5.http.nio.pool.BasicNIOConnPool;
-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.pool.nio.BasicNIOConnPool;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
 import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ContentLengthStrategy.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ContentLengthStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ContentLengthStrategy.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ContentLengthStrategy.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ContentLengthStrategy.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/entity/ContentLengthStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ContentLengthStrategy.java Wed Nov 25 15:17:53 2015
@@ -25,10 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.entity;
-
-import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.HttpMessage;
+package org.apache.hc.core5.http;
 
 /**
  * Represents a strategy to determine length of the enclosed content entity