hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1716084 [1/3] - in /httpcomponents/httpcore/trunk: httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/ httpcore/src/examples/org/apache/hc/core5/http/examples/ httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/ httpcore/src/...
Date Tue, 24 Nov 2015 09:13:46 GMT
Author: olegk
Date: Tue Nov 24 09:13:44 2015
New Revision: 1716084

URL: http://svn.apache.org/viewvc?rev=1716084&view=rev
Log:
Moved I/O reactor and connection pool classes out of http namespace

Added:
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionInputBuffer.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionInputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionInputBufferImpl.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionInputBufferImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionOutputBuffer.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionOutputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionOutputBufferImpl.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionOutputBufferImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/ConnPool.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/ConnPoolControl.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPoolControl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolEntry.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolEntryCallback.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryCallback.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolStats.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolStats.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/AbstractConnPool.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/AbstractConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/ConnFactory.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/PoolEntryFuture.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryFuture.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/RouteSpecificPool.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/RouteSpecificPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/package-info.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/package-info.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/AbstractNIOConnPool.java
      - copied, changed from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/AbstractNIOConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/LeaseRequest.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/LeaseRequest.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/NIOConnFactory.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/NIOConnFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/RouteSpecificPool.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/RouteSpecificPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/SocketAddressResolver.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/SocketAddressResolver.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/package-info.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/package-info.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/AbstractIODispatch.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/AbstractIODispatch.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/AbstractIOReactor.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/AbstractIOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/AbstractMultiworkerIOReactor.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/AbstractMultiworkerIOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/BaseIOReactor.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/BaseIOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ChannelEntry.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ChannelEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ConnectingIOReactor.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ConnectingIOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/DefaultConnectingIOReactor.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/DefaultConnectingIOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/DefaultListeningIOReactor.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/DefaultListeningIOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/EventMask.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/EventMask.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ExceptionEvent.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ExceptionEvent.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOEventDispatch.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOEventDispatch.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactor.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorConfig.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorConfig.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorException.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorException.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorExceptionHandler.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorExceptionHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorStatus.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorStatus.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOSession.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOSession.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOSessionImpl.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOSessionImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/InterestOpEntry.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/InterestOpEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/InterestOpsCallback.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/InterestOpsCallback.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpoint.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpoint.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpointClosedCallback.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpointClosedCallback.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpointImpl.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpointImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListeningIOReactor.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListeningIOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionBufferStatus.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionBufferStatus.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionClosedCallback.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionClosedCallback.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequest.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequest.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestCallback.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestCallback.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestHandle.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestHandle.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestImpl.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestImpl.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SocketAccessor.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SocketAccessor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/package-info.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/package-info.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/PermanentSSLBufferManagementStrategy.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/PermanentSSLBufferManagementStrategy.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/ReleasableSSLBufferManagementStrategy.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/ReleasableSSLBufferManagementStrategy.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLBuffer.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLBufferManagementStrategy.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLBufferManagementStrategy.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLIOSession.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLIOSession.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLMode.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLMode.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLSetupHandler.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLSetupHandler.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/package-info.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/package-info.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/ExceptionEventTest.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/ExceptionEventTest.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestSessionInOutBuffers.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/TestSessionInOutBuffers.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestDefaultListeningIOReactor.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/TestDefaultListeningIOReactor.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestConnPool.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestPoolEntry.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestPoolEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestRouteSpecificPool.java
      - copied, changed from r1715834, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestRouteSpecificPool.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/nio/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/nio/TestNIOConnPool.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/nio/TestRouteSpecificPool.java
      - copied, changed from r1715835, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestRouteSpecificPool.java
Removed:
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/AbstractNIOConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/LeaseRequest.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/NIOConnFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/RouteSpecificPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/SocketAddressResolver.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/package-info.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestRouteSpecificPool.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestPoolEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestRouteSpecificPool.java
Modified:
    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/ElementalEchoServer.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/impl/pool/BasicConnFactory.java
    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/impl/pool/BasicPoolEntry.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/NHttpConnectionFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageWriter.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/bootstrap/HttpServer.java
    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/nio/codecs/AbstractContentDecoder.java
    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/nio/codecs/AbstractMessageParser.java
    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/nio/codecs/ChunkDecoder.java
    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/nio/codecs/IdentityDecoder.java
    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/nio/codecs/LengthDelimitedDecoder.java
    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/nio/pool/BasicNIOConnFactory.java
    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/nio/pool/BasicNIOPoolEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequester.java
    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/nio/TestDefaultNHttpServerConnection.java
    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/nio/codecs/TestChunkDecoder.java
    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/nio/codecs/TestHttpMessageParser.java
    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/nio/codecs/TestIdentityEncoder.java
    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/nio/codecs/TestLengthDelimitedEncoder.java
    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/nio/integration/TestHttpAsyncHandlerCancellable.java
    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/nio/integration/TestHttpAsyncHandlersBrokenExpectContinue.java
    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/nio/integration/TestHttpAsyncPrematureTermination.java
    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/nio/integration/TestTruncatedChunks.java
    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/nio/protocol/TestHttpAsyncRequester.java
    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/nio/testserver/ClientConnectionFactory.java
    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/nio/testserver/HttpServerNio.java
    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/nio/testserver/LoggingNHttpClientConnection.java
    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/nio/testserver/ServerConnectionFactory.java
    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/nio/util/TestBuffers.java

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=1716084&r1=1716083&r2=1716084&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 Tue Nov 24 09:13:44 2015
@@ -91,10 +91,10 @@ public class Common {
                         "org.apache.hc.core5.http.config",
                         "org.apache.hc.core5.http.entity",
                         "org.apache.hc.core5.http.message",
-                        "org.apache.hc.core5.http.pool",
                         "org.apache.hc.core5.http.protocol",
                         "org.apache.hc.core5.http.impl",
                         "org.apache.hc.core5.http.impl.bootstrap",
+                        "org.apache.hc.core5.pool",
                         "org.apache.hc.core5.ssl",
                         "org.apache.hc.core5.util",
                         "org.apache.commons.logging; provider=paxlogging",

Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalEchoServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalEchoServer.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalEchoServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/hc/core5/http/examples/ElementalEchoServer.java Tue Nov 24 09:13:44 2015
@@ -31,11 +31,11 @@ import java.io.InterruptedIOException;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 
-import org.apache.hc.core5.http.nio.reactor.DefaultListeningIOReactor;
-import org.apache.hc.core5.http.nio.reactor.EventMask;
-import org.apache.hc.core5.http.nio.reactor.IOEventDispatch;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.ListeningIOReactor;
+import org.apache.hc.core5.reactor.DefaultListeningIOReactor;
+import org.apache.hc.core5.reactor.EventMask;
+import org.apache.hc.core5.reactor.IOEventDispatch;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.ListeningIOReactor;
 
 public class ElementalEchoServer {
 

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=1716084&r1=1716083&r2=1716084&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 Tue Nov 24 09:13:44 2015
@@ -41,9 +41,6 @@ import org.apache.hc.core5.http.nio.prot
 import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseConsumer;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestExecutor;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequester;
-import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
-import org.apache.hc.core5.http.nio.reactor.DefaultConnectingIOReactor;
-import org.apache.hc.core5.http.nio.reactor.IOEventDispatch;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
 import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;
@@ -52,6 +49,9 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.RequestExpectContinue;
 import org.apache.hc.core5.http.protocol.RequestTargetHost;
 import org.apache.hc.core5.http.protocol.RequestUserAgent;
+import org.apache.hc.core5.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.reactor.DefaultConnectingIOReactor;
+import org.apache.hc.core5.reactor.IOEventDispatch;
 
 /**
  * Minimal asynchronous HTTP/1.1 client.

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=1716084&r1=1716083&r2=1716084&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 Tue Nov 24 09:13:44 2015
@@ -52,9 +52,9 @@ import org.apache.hc.core5.http.nio.prot
 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.nio.reactor.IOReactorConfig;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.reactor.IOReactorConfig;
 import org.apache.hc.core5.ssl.SSLContexts;
 
 /**

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=1716084&r1=1716083&r2=1716084&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 Tue Nov 24 09:13:44 2015
@@ -59,7 +59,6 @@ import org.apache.hc.core5.http.nio.NHtt
 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.pool.NIOConnFactory;
 import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseProducer;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncExchange;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestConsumer;
@@ -72,13 +71,6 @@ import org.apache.hc.core5.http.nio.prot
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncResponseProducer;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncService;
 import org.apache.hc.core5.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
-import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
-import org.apache.hc.core5.http.nio.reactor.DefaultConnectingIOReactor;
-import org.apache.hc.core5.http.nio.reactor.DefaultListeningIOReactor;
-import org.apache.hc.core5.http.nio.reactor.IOEventDispatch;
-import org.apache.hc.core5.http.nio.reactor.IOReactorConfig;
-import org.apache.hc.core5.http.nio.reactor.ListeningIOReactor;
-import org.apache.hc.core5.http.pool.PoolStats;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
@@ -92,6 +84,14 @@ 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.pool.PoolStats;
+import org.apache.hc.core5.pool.nio.NIOConnFactory;
+import org.apache.hc.core5.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.reactor.DefaultConnectingIOReactor;
+import org.apache.hc.core5.reactor.DefaultListeningIOReactor;
+import org.apache.hc.core5.reactor.IOEventDispatch;
+import org.apache.hc.core5.reactor.IOReactorConfig;
+import org.apache.hc.core5.reactor.ListeningIOReactor;
 
 /**
  * Asynchronous, fully streaming HTTP/1.1 reverse proxy.

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=1716084&r1=1716083&r2=1716084&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 Tue Nov 24 09:13:44 2015
@@ -43,9 +43,6 @@ import org.apache.hc.core5.http.nio.prot
 import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseConsumer;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestExecutor;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequester;
-import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
-import org.apache.hc.core5.http.nio.reactor.DefaultConnectingIOReactor;
-import org.apache.hc.core5.http.nio.reactor.IOEventDispatch;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
 import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;
@@ -54,6 +51,9 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.RequestExpectContinue;
 import org.apache.hc.core5.http.protocol.RequestTargetHost;
 import org.apache.hc.core5.http.protocol.RequestUserAgent;
+import org.apache.hc.core5.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.reactor.DefaultConnectingIOReactor;
+import org.apache.hc.core5.reactor.IOEventDispatch;
 
 /**
  * Minimal pipelining HTTP/1.1 client.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnFactory.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnFactory.java Tue Nov 24 09:13:44 2015
@@ -40,7 +40,7 @@ import org.apache.hc.core5.http.HttpHost
 import org.apache.hc.core5.http.config.ConnectionConfig;
 import org.apache.hc.core5.http.config.SocketConfig;
 import org.apache.hc.core5.http.impl.DefaultBHttpClientConnectionFactory;
-import org.apache.hc.core5.http.pool.ConnFactory;
+import org.apache.hc.core5.pool.io.ConnFactory;
 
 /**
  * A very basic {@link ConnFactory} implementation that creates

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnPool.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicConnPool.java Tue Nov 24 09:13:44 2015
@@ -33,11 +33,11 @@ import org.apache.hc.core5.http.HttpClie
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.config.ConnectionConfig;
 import org.apache.hc.core5.http.config.SocketConfig;
-import org.apache.hc.core5.http.pool.AbstractConnPool;
-import org.apache.hc.core5.http.pool.ConnFactory;
+import org.apache.hc.core5.pool.io.AbstractConnPool;
+import org.apache.hc.core5.pool.io.ConnFactory;
 
 /**
- * A very basic {@link org.apache.hc.core5.http.pool.ConnPool} implementation that
+ * A very basic {@link org.apache.hc.core5.pool.ConnPool} implementation that
  * represents a pool of blocking {@link HttpClientConnection} connections
  * identified by an {@link HttpHost} instance. Please note this pool
  * implementation does not support complex routes via a proxy cannot

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicPoolEntry.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicPoolEntry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/BasicPoolEntry.java Tue Nov 24 09:13:44 2015
@@ -31,7 +31,7 @@ import java.io.IOException;
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.HttpClientConnection;
 import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.pool.PoolEntry;
+import org.apache.hc.core5.pool.PoolEntry;
 
 /**
  * A very basic {@link PoolEntry} implementation that represents an entry

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultHttpClientIODispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/DefaultHttpClientIODispatch.java?rev=1716084&r1=1716083&r2=1716084&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/nio/DefaultHttpClientIODispatch.java Tue Nov 24 09:13:44 2015
@@ -33,13 +33,13 @@ 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.reactor.AbstractIODispatch;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLSetupHandler;
+import org.apache.hc.core5.reactor.AbstractIODispatch;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.ssl.SSLSetupHandler;
 import org.apache.hc.core5.util.Args;
 
 /**
- * Default {@link org.apache.hc.core5.http.nio.reactor.IOEventDispatch} implementation
+ * Default {@link org.apache.hc.core5.reactor.IOEventDispatch} implementation
  * that supports both plain (non-encrypted) and SSL encrypted client side HTTP
  * connections.
  *

Modified: 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/nio/DefaultHttpServerIODispatch.java?rev=1716084&r1=1716083&r2=1716084&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/nio/DefaultHttpServerIODispatch.java Tue Nov 24 09:13:44 2015
@@ -33,13 +33,13 @@ 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.reactor.AbstractIODispatch;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLSetupHandler;
+import org.apache.hc.core5.reactor.AbstractIODispatch;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.ssl.SSLSetupHandler;
 import org.apache.hc.core5.util.Args;
 
 /**
- * Default {@link org.apache.hc.core5.http.nio.reactor.IOEventDispatch} implementation
+ * Default {@link org.apache.hc.core5.reactor.IOEventDispatch} implementation
  * that supports both plain (non-encrypted) and SSL encrypted server side HTTP
  * connections.
  *

Modified: 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/nio/DefaultNHttpClientConnection.java?rev=1716084&r1=1716083&r2=1716084&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/nio/DefaultNHttpClientConnection.java Tue Nov 24 09:13:44 2015
@@ -43,9 +43,9 @@ import org.apache.hc.core5.http.entity.C
 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.reactor.EventMask;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
 import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.reactor.EventMask;
+import org.apache.hc.core5.reactor.IOSession;
 import org.apache.hc.core5.util.Args;
 
 /**

Modified: 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/nio/DefaultNHttpClientConnectionFactory.java?rev=1716084&r1=1716083&r2=1716084&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/nio/DefaultNHttpClientConnectionFactory.java Tue Nov 24 09:13:44 2015
@@ -32,8 +32,8 @@ import org.apache.hc.core5.http.HttpResp
 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.reactor.IOSession;
 import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.reactor.IOSession;
 
 /**
  * Default factory for plain (non-encrypted), non-blocking

Modified: 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/nio/DefaultNHttpServerConnection.java?rev=1716084&r1=1716083&r2=1716084&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/nio/DefaultNHttpServerConnection.java Tue Nov 24 09:13:44 2015
@@ -42,9 +42,9 @@ import org.apache.hc.core5.http.entity.C
 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.reactor.EventMask;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
 import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.reactor.EventMask;
+import org.apache.hc.core5.reactor.IOSession;
 import org.apache.hc.core5.util.Args;
 
 /**

Modified: 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/nio/DefaultNHttpServerConnectionFactory.java?rev=1716084&r1=1716083&r2=1716084&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/nio/DefaultNHttpServerConnectionFactory.java Tue Nov 24 09:13:44 2015
@@ -32,8 +32,8 @@ import org.apache.hc.core5.http.HttpResp
 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.reactor.IOSession;
 import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.reactor.IOSession;
 
 /**
  * Default factory for plain (non-encrypted), non-blocking

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpConnectionBase.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpConnectionBase.java Tue Nov 24 09:13:44 2015
@@ -55,16 +55,12 @@ import org.apache.hc.core5.http.nio.code
 import org.apache.hc.core5.http.nio.codecs.IdentityEncoder;
 import org.apache.hc.core5.http.nio.codecs.LengthDelimitedDecoder;
 import org.apache.hc.core5.http.nio.codecs.LengthDelimitedEncoder;
-import org.apache.hc.core5.http.nio.reactor.EventMask;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.SessionBufferStatus;
-import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
-import org.apache.hc.core5.http.nio.reactor.SessionInputBufferImpl;
-import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
-import org.apache.hc.core5.http.nio.reactor.SessionOutputBufferImpl;
-import org.apache.hc.core5.http.nio.reactor.SocketAccessor;
 import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
 import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.reactor.EventMask;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.SessionBufferStatus;
+import org.apache.hc.core5.reactor.SocketAccessor;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.NetUtils;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpConnectionFactory.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpConnectionFactory.java Tue Nov 24 09:13:44 2015
@@ -27,7 +27,7 @@
 
 package org.apache.hc.core5.http.nio;
 
-import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.reactor.IOSession;
 
 /**
  * Factory for {@link NHttpConnection} instances.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParser.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParser.java Tue Nov 24 09:13:44 2015
@@ -31,7 +31,6 @@ import java.io.IOException;
 
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpMessage;
-import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
 
 /**
  * Abstract HTTP message parser for non-blocking connections.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageWriter.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageWriter.java Tue Nov 24 09:13:44 2015
@@ -31,7 +31,6 @@ import java.io.IOException;
 
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpMessage;
-import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
 
 /**
  * Abstract HTTP message writer for non-blocking connections.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SSLNHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SSLNHttpClientConnectionFactory.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SSLNHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SSLNHttpClientConnectionFactory.java Tue Nov 24 09:13:44 2015
@@ -34,11 +34,11 @@ import org.apache.hc.core5.http.HttpResp
 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.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLIOSession;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLMode;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLSetupHandler;
 import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.ssl.SSLIOSession;
+import org.apache.hc.core5.reactor.ssl.SSLMode;
+import org.apache.hc.core5.reactor.ssl.SSLSetupHandler;
 import org.apache.hc.core5.ssl.SSLContexts;
 
 /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SSLNHttpServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SSLNHttpServerConnectionFactory.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SSLNHttpServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SSLNHttpServerConnectionFactory.java Tue Nov 24 09:13:44 2015
@@ -34,11 +34,11 @@ import org.apache.hc.core5.http.HttpResp
 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.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLIOSession;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLMode;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLSetupHandler;
 import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.ssl.SSLIOSession;
+import org.apache.hc.core5.reactor.ssl.SSLMode;
+import org.apache.hc.core5.reactor.ssl.SSLSetupHandler;
 import org.apache.hc.core5.ssl.SSLContexts;
 
 /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionHttpContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionHttpContext.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionHttpContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionHttpContext.java Tue Nov 24 09:13:44 2015
@@ -27,8 +27,8 @@
 
 package org.apache.hc.core5.http.nio;
 
-import org.apache.hc.core5.http.nio.reactor.IOSession;
 import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.reactor.IOSession;
 
 class SessionHttpContext implements HttpContext {
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionInputBuffer.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionInputBuffer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionInputBuffer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionInputBuffer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionInputBuffer.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionInputBuffer.java Tue Nov 24 09:13:44 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.reactor;
+package org.apache.hc.core5.http.nio;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionInputBufferImpl.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionInputBufferImpl.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionInputBufferImpl.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionInputBufferImpl.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionInputBufferImpl.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionInputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionInputBufferImpl.java Tue Nov 24 09:13:44 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.reactor;
+package org.apache.hc.core5.http.nio;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionOutputBuffer.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionOutputBuffer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionOutputBuffer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionOutputBuffer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionOutputBuffer.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionOutputBuffer.java Tue Nov 24 09:13:44 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.reactor;
+package org.apache.hc.core5.http.nio;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionOutputBufferImpl.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionOutputBufferImpl.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionOutputBufferImpl.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionOutputBufferImpl.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionOutputBufferImpl.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionOutputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/SessionOutputBufferImpl.java Tue Nov 24 09:13:44 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.reactor;
+package org.apache.hc.core5.http.nio;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Modified: 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/nio/bootstrap/HttpServer.java?rev=1716084&r1=1716083&r2=1716084&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/nio/bootstrap/HttpServer.java Tue Nov 24 09:13:44 2015
@@ -39,12 +39,12 @@ import org.apache.hc.core5.http.nio.Defa
 import org.apache.hc.core5.http.nio.DefaultNHttpServerConnection;
 import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
 import org.apache.hc.core5.http.nio.NHttpServerEventHandler;
-import org.apache.hc.core5.http.nio.reactor.DefaultListeningIOReactor;
-import org.apache.hc.core5.http.nio.reactor.IOEventDispatch;
-import org.apache.hc.core5.http.nio.reactor.IOReactorConfig;
-import org.apache.hc.core5.http.nio.reactor.IOReactorException;
-import org.apache.hc.core5.http.nio.reactor.IOReactorExceptionHandler;
-import org.apache.hc.core5.http.nio.reactor.ListenerEndpoint;
+import org.apache.hc.core5.reactor.DefaultListeningIOReactor;
+import org.apache.hc.core5.reactor.IOEventDispatch;
+import org.apache.hc.core5.reactor.IOReactorConfig;
+import org.apache.hc.core5.reactor.IOReactorException;
+import org.apache.hc.core5.reactor.IOReactorExceptionHandler;
+import org.apache.hc.core5.reactor.ListenerEndpoint;
 
 /**
  * @since 4.4

Modified: 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/nio/bootstrap/ServerBootstrap.java?rev=1716084&r1=1716083&r2=1716084&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/nio/bootstrap/ServerBootstrap.java Tue Nov 24 09:13:44 2015
@@ -50,8 +50,6 @@ import org.apache.hc.core5.http.nio.prot
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandlerMapper;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncService;
 import org.apache.hc.core5.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
-import org.apache.hc.core5.http.nio.reactor.IOReactorConfig;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLSetupHandler;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
 import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;
 import org.apache.hc.core5.http.protocol.RequestValidateHost;
@@ -59,6 +57,8 @@ 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.reactor.IOReactorConfig;
+import org.apache.hc.core5.reactor.ssl.SSLSetupHandler;
 
 /**
  * @since 4.4
@@ -288,7 +288,7 @@ public class ServerBootstrap {
     }
 
     /**
-     * Assigns {@link org.apache.hc.core5.http.nio.reactor.ssl.SSLSetupHandler} instance.
+     * Assigns {@link SSLSetupHandler} instance.
      * <p>
      * Please note this value can be overridden by the {@link #setConnectionFactory(
      *   org.apache.hc.core5.http.nio.NHttpConnectionFactory)} method.

Modified: 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/nio/codecs/AbstractContentDecoder.java?rev=1716084&r1=1716083&r2=1716084&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/nio/codecs/AbstractContentDecoder.java Tue Nov 24 09:13:44 2015
@@ -34,7 +34,7 @@ import java.nio.channels.ReadableByteCha
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
 import org.apache.hc.core5.http.nio.ContentDecoder;
-import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.SessionInputBuffer;
 import org.apache.hc.core5.util.Args;
 
 /**

Modified: 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/nio/codecs/AbstractContentEncoder.java?rev=1716084&r1=1716083&r2=1716084&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/nio/codecs/AbstractContentEncoder.java Tue Nov 24 09:13:44 2015
@@ -34,7 +34,7 @@ import java.nio.channels.WritableByteCha
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
 import org.apache.hc.core5.http.nio.ContentEncoder;
-import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.nio.SessionOutputBuffer;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.Asserts;
 

Modified: 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/nio/codecs/AbstractMessageParser.java?rev=1716084&r1=1716083&r2=1716084&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/nio/codecs/AbstractMessageParser.java Tue Nov 24 09:13:44 2015
@@ -39,7 +39,7 @@ import org.apache.hc.core5.http.config.M
 import org.apache.hc.core5.http.message.LazyLineParser;
 import org.apache.hc.core5.http.message.LineParser;
 import org.apache.hc.core5.http.nio.NHttpMessageParser;
-import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.SessionInputBuffer;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.CharArrayBuffer;
 

Modified: 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/nio/codecs/AbstractMessageWriter.java?rev=1716084&r1=1716083&r2=1716084&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/nio/codecs/AbstractMessageWriter.java Tue Nov 24 09:13:44 2015
@@ -38,7 +38,7 @@ import org.apache.hc.core5.http.HttpMess
 import org.apache.hc.core5.http.message.BasicLineFormatter;
 import org.apache.hc.core5.http.message.LineFormatter;
 import org.apache.hc.core5.http.nio.NHttpMessageWriter;
-import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.nio.SessionOutputBuffer;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.CharArrayBuffer;
 

Modified: 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/nio/codecs/ChunkDecoder.java?rev=1716084&r1=1716083&r2=1716084&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/nio/codecs/ChunkDecoder.java Tue Nov 24 09:13:44 2015
@@ -43,7 +43,7 @@ import org.apache.hc.core5.http.Truncate
 import org.apache.hc.core5.http.config.MessageConstraints;
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
 import org.apache.hc.core5.http.message.BufferedHeader;
-import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.SessionInputBuffer;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.CharArrayBuffer;
 

Modified: 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/nio/codecs/ChunkEncoder.java?rev=1716084&r1=1716083&r2=1716084&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/nio/codecs/ChunkEncoder.java Tue Nov 24 09:13:44 2015
@@ -37,7 +37,7 @@ import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.TrailerSupplier;
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
 import org.apache.hc.core5.http.message.BasicLineFormatter;
-import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.nio.SessionOutputBuffer;
 import org.apache.hc.core5.util.CharArrayBuffer;
 
 /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/IdentityDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/IdentityDecoder.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/IdentityDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/IdentityDecoder.java Tue Nov 24 09:13:44 2015
@@ -35,7 +35,7 @@ import java.nio.channels.ReadableByteCha
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
 import org.apache.hc.core5.http.nio.FileContentDecoder;
-import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.SessionInputBuffer;
 import org.apache.hc.core5.util.Args;
 
 /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/IdentityEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/IdentityEncoder.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/IdentityEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/IdentityEncoder.java Tue Nov 24 09:13:44 2015
@@ -35,7 +35,7 @@ import java.nio.channels.WritableByteCha
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
 import org.apache.hc.core5.http.nio.FileContentEncoder;
-import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.nio.SessionOutputBuffer;
 
 /**
  * Content encoder that writes data without any transformation. The end of

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/LengthDelimitedDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/LengthDelimitedDecoder.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/LengthDelimitedDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/LengthDelimitedDecoder.java Tue Nov 24 09:13:44 2015
@@ -36,7 +36,7 @@ import org.apache.hc.core5.annotation.No
 import org.apache.hc.core5.http.ConnectionClosedException;
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
 import org.apache.hc.core5.http.nio.FileContentDecoder;
-import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.SessionInputBuffer;
 import org.apache.hc.core5.util.Args;
 
 /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/LengthDelimitedEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/LengthDelimitedEncoder.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/LengthDelimitedEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/codecs/LengthDelimitedEncoder.java Tue Nov 24 09:13:44 2015
@@ -35,7 +35,7 @@ import java.nio.channels.WritableByteCha
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
 import org.apache.hc.core5.http.nio.FileContentEncoder;
-import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.nio.SessionOutputBuffer;
 import org.apache.hc.core5.util.Args;
 
 /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOConnFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOConnFactory.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOConnFactory.java Tue Nov 24 09:13:44 2015
@@ -41,10 +41,11 @@ import org.apache.hc.core5.http.nio.NHtt
 import org.apache.hc.core5.http.nio.NHttpMessageParserFactory;
 import org.apache.hc.core5.http.nio.NHttpMessageWriterFactory;
 import org.apache.hc.core5.http.nio.SSLNHttpClientConnectionFactory;
-import org.apache.hc.core5.http.nio.reactor.IOEventDispatch;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLSetupHandler;
 import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.pool.nio.NIOConnFactory;
+import org.apache.hc.core5.reactor.IOEventDispatch;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.ssl.SSLSetupHandler;
 import org.apache.hc.core5.util.Args;
 
 /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOConnPool.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOConnPool.java Tue Nov 24 09:13:44 2015
@@ -37,10 +37,13 @@ import org.apache.hc.core5.concurrent.Fu
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.config.ConnectionConfig;
 import org.apache.hc.core5.http.nio.NHttpClientConnection;
-import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.pool.nio.AbstractNIOConnPool;
+import org.apache.hc.core5.pool.nio.NIOConnFactory;
+import org.apache.hc.core5.pool.nio.SocketAddressResolver;
+import org.apache.hc.core5.reactor.ConnectingIOReactor;
 
 /**
- * A very basic {@link org.apache.hc.core5.http.pool.ConnPool} implementation that
+ * A very basic {@link org.apache.hc.core5.pool.ConnPool} implementation that
  * represents a pool of non-blocking {@link NHttpClientConnection} connections
  * identified by an {@link HttpHost} instance. Please note this pool
  * implementation does not support complex routes via a proxy cannot

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOPoolEntry.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOPoolEntry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/BasicNIOPoolEntry.java Tue Nov 24 09:13:44 2015
@@ -31,7 +31,7 @@ import java.io.IOException;
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.nio.NHttpClientConnection;
-import org.apache.hc.core5.http.pool.PoolEntry;
+import org.apache.hc.core5.pool.PoolEntry;
 
 /**
  * A basic {@link PoolEntry} implementation that represents an entry

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequester.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequester.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequester.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequester.java Tue Nov 24 09:13:44 2015
@@ -38,11 +38,11 @@ import org.apache.hc.core5.http.Connecti
 import org.apache.hc.core5.http.ExceptionLogger;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.nio.NHttpClientConnection;
-import org.apache.hc.core5.http.pool.ConnPool;
-import org.apache.hc.core5.http.pool.PoolEntry;
 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.pool.ConnPool;
+import org.apache.hc.core5.pool.PoolEntry;
 import org.apache.hc.core5.util.Args;
 
 /**

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/ConnPool.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/ConnPool.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/ConnPool.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPool.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/ConnPool.java Tue Nov 24 09:13:44 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.pool;
+package org.apache.hc.core5.pool;
 
 import java.util.concurrent.Future;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/ConnPoolControl.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPoolControl.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/ConnPoolControl.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/ConnPoolControl.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPoolControl.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnPoolControl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/ConnPoolControl.java Tue Nov 24 09:13:44 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.pool;
+package org.apache.hc.core5.pool;
 
 /**
  * Interface to control runtime properties of a {@link ConnPool} such as

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolEntry.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntry.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolEntry.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolEntry.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntry.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolEntry.java Tue Nov 24 09:13:44 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.pool;
+package org.apache.hc.core5.pool;
 
 import java.util.concurrent.TimeUnit;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolEntryCallback.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryCallback.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolEntryCallback.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolEntryCallback.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryCallback.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolEntryCallback.java Tue Nov 24 09:13:44 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.pool;
+package org.apache.hc.core5.pool;
 
 /**
  * Pool entry callabck.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolStats.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolStats.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolStats.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolStats.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolStats.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolStats.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/PoolStats.java Tue Nov 24 09:13:44 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.pool;
+package org.apache.hc.core5.pool;
 
 import java.io.Serializable;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/AbstractConnPool.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/AbstractConnPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/AbstractConnPool.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/AbstractConnPool.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/AbstractConnPool.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/AbstractConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/AbstractConnPool.java Tue Nov 24 09:13:44 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.pool;
+package org.apache.hc.core5.pool.io;
 
 import java.io.IOException;
 import java.util.Date;
@@ -42,6 +42,11 @@ import java.util.concurrent.locks.Reentr
 
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.concurrent.FutureCallback;
+import org.apache.hc.core5.pool.ConnPool;
+import org.apache.hc.core5.pool.ConnPoolControl;
+import org.apache.hc.core5.pool.PoolEntry;
+import org.apache.hc.core5.pool.PoolEntryCallback;
+import org.apache.hc.core5.pool.PoolStats;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.Asserts;
 




Mime
View raw message