hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1716084 [2/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
Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/ConnFactory.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/ConnFactory.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/ConnFactory.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnFactory.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/ConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/ConnFactory.java Tue Nov 24 09:13:44 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.pool;
+package org.apache.hc.core5.pool.io;
 
 import java.io.IOException;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/PoolEntryFuture.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryFuture.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/PoolEntryFuture.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/PoolEntryFuture.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryFuture.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/PoolEntryFuture.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/PoolEntryFuture.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;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/RouteSpecificPool.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/RouteSpecificPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/RouteSpecificPool.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/RouteSpecificPool.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/RouteSpecificPool.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/RouteSpecificPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/RouteSpecificPool.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.util.HashSet;
 import java.util.Iterator;
@@ -32,6 +32,7 @@ import java.util.LinkedList;
 import java.util.Set;
 
 import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.pool.PoolEntry;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.Asserts;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/package-info.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/package-info.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/package-info.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/package-info.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/package-info.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/pool/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/io/package-info.java Tue Nov 24 09:13:44 2015
@@ -29,4 +29,4 @@
  * Client side connection pools APIs for synchronous, blocking
  * communication.
  */
-package org.apache.hc.core5.http.pool;
+package org.apache.hc.core5.pool.io;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/AbstractNIOConnPool.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/AbstractNIOConnPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/AbstractNIOConnPool.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/AbstractNIOConnPool.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/AbstractNIOConnPool.java&r1=1716083&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/AbstractNIOConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/AbstractNIOConnPool.java Tue Nov 24 09:13:44 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.pool;
+package org.apache.hc.core5.pool.nio;
 
 import java.io.IOException;
 import java.net.SocketAddress;
@@ -46,16 +46,16 @@ import java.util.concurrent.locks.Reentr
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.concurrent.BasicFuture;
 import org.apache.hc.core5.concurrent.FutureCallback;
-import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
-import org.apache.hc.core5.http.nio.reactor.IOReactorStatus;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.SessionRequest;
-import org.apache.hc.core5.http.nio.reactor.SessionRequestCallback;
-import org.apache.hc.core5.http.pool.ConnPool;
-import org.apache.hc.core5.http.pool.ConnPoolControl;
-import org.apache.hc.core5.http.pool.PoolEntry;
-import org.apache.hc.core5.http.pool.PoolEntryCallback;
-import org.apache.hc.core5.http.pool.PoolStats;
+import org.apache.hc.core5.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.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.reactor.IOReactorStatus;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.SessionRequest;
+import org.apache.hc.core5.reactor.SessionRequestCallback;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.Asserts;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/LeaseRequest.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/LeaseRequest.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/LeaseRequest.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/LeaseRequest.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/LeaseRequest.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/LeaseRequest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/LeaseRequest.java Tue Nov 24 09:13:44 2015
@@ -24,13 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.pool;
+package org.apache.hc.core5.pool.nio;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.concurrent.BasicFuture;
-import org.apache.hc.core5.http.pool.PoolEntry;
+import org.apache.hc.core5.pool.PoolEntry;
 
 @Immutable
 class LeaseRequest<T, C, E extends PoolEntry<T, C>> {

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/NIOConnFactory.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/NIOConnFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/NIOConnFactory.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/NIOConnFactory.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/NIOConnFactory.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/NIOConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/NIOConnFactory.java Tue Nov 24 09:13:44 2015
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.pool;
+package org.apache.hc.core5.pool.nio;
 
 import java.io.IOException;
 
-import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.reactor.IOSession;
 
 /**
  * Factory for poolable non-blocking connections.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/RouteSpecificPool.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/RouteSpecificPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/RouteSpecificPool.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/RouteSpecificPool.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/RouteSpecificPool.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/RouteSpecificPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/RouteSpecificPool.java Tue Nov 24 09:13:44 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.pool;
+package org.apache.hc.core5.pool.nio;
 
 import java.net.ConnectException;
 import java.util.HashMap;
@@ -36,8 +36,8 @@ import java.util.Set;
 
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.concurrent.BasicFuture;
-import org.apache.hc.core5.http.nio.reactor.SessionRequest;
-import org.apache.hc.core5.http.pool.PoolEntry;
+import org.apache.hc.core5.pool.PoolEntry;
+import org.apache.hc.core5.reactor.SessionRequest;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.Asserts;
 

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

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/package-info.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/package-info.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/package-info.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/package-info.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/package-info.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/pool/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/pool/nio/package-info.java Tue Nov 24 09:13:44 2015
@@ -29,4 +29,4 @@
  * Client side connection pools APIs for asynchronous, event driven
  * communication.
  */
-package org.apache.hc.core5.http.nio.pool;
+package org.apache.hc.core5.pool.nio;

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

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/AbstractIOReactor.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/AbstractIOReactor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/AbstractIOReactor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/AbstractIOReactor.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/AbstractIOReactor.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/AbstractIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/AbstractIOReactor.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.reactor;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/AbstractMultiworkerIOReactor.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/AbstractMultiworkerIOReactor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/AbstractMultiworkerIOReactor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/AbstractMultiworkerIOReactor.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/AbstractMultiworkerIOReactor.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/AbstractMultiworkerIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/AbstractMultiworkerIOReactor.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.reactor;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/BaseIOReactor.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/BaseIOReactor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/BaseIOReactor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/BaseIOReactor.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/BaseIOReactor.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/BaseIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/BaseIOReactor.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.reactor;
 
 import java.io.InterruptedIOException;
 import java.nio.channels.CancelledKeyException;
@@ -39,7 +39,7 @@ import org.apache.hc.core5.util.Args;
 
 /**
  * Default implementation of {@link AbstractIOReactor} that serves as a base
- * for more advanced {@link org.apache.hc.core5.http.nio.reactor.IOReactor}
+ * for more advanced {@link IOReactor}
  * implementations. This class adds support for the I/O event dispatching
  * using {@link IOEventDispatch}, management of buffering sessions, and
  * session timeout handling.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ChannelEntry.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ChannelEntry.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ChannelEntry.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ChannelEntry.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ChannelEntry.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ChannelEntry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ChannelEntry.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.reactor;
 
 import java.nio.channels.SocketChannel;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ConnectingIOReactor.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ConnectingIOReactor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ConnectingIOReactor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ConnectingIOReactor.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ConnectingIOReactor.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ConnectingIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ConnectingIOReactor.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.reactor;
 
 import java.net.SocketAddress;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/DefaultConnectingIOReactor.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/DefaultConnectingIOReactor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/DefaultConnectingIOReactor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/DefaultConnectingIOReactor.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/DefaultConnectingIOReactor.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/DefaultConnectingIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/DefaultConnectingIOReactor.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.reactor;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/DefaultListeningIOReactor.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/DefaultListeningIOReactor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/DefaultListeningIOReactor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/DefaultListeningIOReactor.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/DefaultListeningIOReactor.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/DefaultListeningIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/DefaultListeningIOReactor.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.reactor;
 
 import java.io.IOException;
 import java.net.ServerSocket;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/EventMask.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/EventMask.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/EventMask.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/EventMask.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/EventMask.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/EventMask.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/EventMask.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.reactor;
 
 import java.nio.channels.SelectionKey;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ExceptionEvent.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ExceptionEvent.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ExceptionEvent.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ExceptionEvent.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ExceptionEvent.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ExceptionEvent.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ExceptionEvent.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.reactor;
 
 import java.util.Date;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOEventDispatch.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOEventDispatch.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOEventDispatch.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOEventDispatch.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOEventDispatch.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOEventDispatch.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.reactor;
 
 /**
  * IOEventDispatch interface is used by I/O reactors to notify clients of I/O

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactor.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactor.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactor.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactor.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.reactor;
 
 import java.io.IOException;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorConfig.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorConfig.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorConfig.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorConfig.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorConfig.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorConfig.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorConfig.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.reactor;
 
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.util.Args;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorException.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorException.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorException.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorException.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorException.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorException.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorException.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.reactor;
 
 import java.io.IOException;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorExceptionHandler.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorExceptionHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorExceptionHandler.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorExceptionHandler.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorExceptionHandler.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorExceptionHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorExceptionHandler.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.reactor;
 
 import java.io.IOException;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorStatus.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorStatus.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorStatus.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorStatus.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorStatus.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorStatus.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOReactorStatus.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.reactor;
 
 /**
  * IOReactorStatus represents an internal status of an I/O reactor.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOSession.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOSession.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOSession.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOSession.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOSession.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOSession.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.reactor;
 
 import java.net.SocketAddress;
 import java.nio.channels.ByteChannel;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOSessionImpl.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOSessionImpl.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOSessionImpl.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOSessionImpl.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOSessionImpl.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/IOSessionImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/IOSessionImpl.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.reactor;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/InterestOpEntry.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/InterestOpEntry.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/InterestOpEntry.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/InterestOpEntry.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/InterestOpEntry.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/InterestOpEntry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/InterestOpEntry.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.reactor;
 
 import java.nio.channels.SelectionKey;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/InterestOpsCallback.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/InterestOpsCallback.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/InterestOpsCallback.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/InterestOpsCallback.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/InterestOpsCallback.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/InterestOpsCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/InterestOpsCallback.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.reactor;
 
 /**
  * Callback interface used internally by I/O session implementations to delegate execution

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpoint.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpoint.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpoint.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpoint.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpoint.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpoint.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpoint.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.reactor;
 
 import java.io.IOException;
 import java.net.SocketAddress;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpointClosedCallback.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpointClosedCallback.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpointClosedCallback.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpointClosedCallback.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpointClosedCallback.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpointClosedCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpointClosedCallback.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.reactor;
 
 /**
  * Listener endpoint callback interface used internally by I/O reactor

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpointImpl.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpointImpl.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpointImpl.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpointImpl.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpointImpl.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpointImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListenerEndpointImpl.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.reactor;
 
 import java.io.IOException;
 import java.net.SocketAddress;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListeningIOReactor.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListeningIOReactor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListeningIOReactor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListeningIOReactor.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListeningIOReactor.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ListeningIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ListeningIOReactor.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.reactor;
 
 import java.io.IOException;
 import java.net.SocketAddress;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionBufferStatus.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionBufferStatus.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionBufferStatus.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionBufferStatus.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionBufferStatus.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionBufferStatus.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionBufferStatus.java Tue Nov 24 09:13:44 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.reactor;
+package org.apache.hc.core5.reactor;
 
 /**
  * SessionBufferStatus interface is intended to query the status of session

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionClosedCallback.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionClosedCallback.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionClosedCallback.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionClosedCallback.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionClosedCallback.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionClosedCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionClosedCallback.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.reactor;
 
 /**
  * Session callback interface used internally by I/O reactor implementations.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequest.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequest.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequest.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequest.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequest.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequest.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.reactor;
 
 import java.io.IOException;
 import java.net.SocketAddress;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestCallback.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestCallback.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestCallback.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestCallback.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestCallback.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestCallback.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.reactor;
 
 /**
  * SessionRequestCallback interface can be used to get notifications of

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestHandle.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestHandle.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestHandle.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestHandle.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestHandle.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestHandle.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestHandle.java Tue Nov 24 09:13:44 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.reactor;
+package org.apache.hc.core5.reactor;
 
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.util.Args;
 
 /**
  * Session request handle class used by I/O reactor implementations to keep
- * a reference to a {@link org.apache.hc.core5.http.nio.reactor.SessionRequest} along
+ * a reference to a {@link SessionRequest} along
  * with the time the request was made.
  *
  * @since 4.0

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestImpl.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestImpl.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestImpl.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestImpl.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestImpl.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SessionRequestImpl.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.reactor;
 
 import java.io.IOException;
 import java.net.SocketAddress;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SocketAccessor.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SocketAccessor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SocketAccessor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SocketAccessor.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SocketAccessor.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/SocketAccessor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/SocketAccessor.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.reactor;
 
 import java.net.Socket;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/package-info.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/package-info.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/package-info.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/package-info.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/package-info.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/package-info.java Tue Nov 24 09:13:44 2015
@@ -34,4 +34,4 @@
  in the sense that it defines only what is required within the scope
  of HTTP protocol.
  */
-package org.apache.hc.core5.http.nio.reactor;
+package org.apache.hc.core5.reactor;

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

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

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

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLBufferManagementStrategy.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLBufferManagementStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLBufferManagementStrategy.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLBufferManagementStrategy.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLBufferManagementStrategy.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLBufferManagementStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLBufferManagementStrategy.java Tue Nov 24 09:13:44 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.reactor.ssl;
+package org.apache.hc.core5.reactor.ssl;
 
 /**
  * Encapsulates logic to manager SSL input/output buffers.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLIOSession.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLIOSession.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLIOSession.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLIOSession.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLIOSession.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLIOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLIOSession.java Tue Nov 24 09:13:44 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.reactor.ssl;
+package org.apache.hc.core5.reactor.ssl;
 
 import java.io.IOException;
 import java.net.Socket;
@@ -44,10 +44,10 @@ import javax.net.ssl.SSLSession;
 
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.HttpHost;
-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.SocketAccessor;
+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.Asserts;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLMode.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLMode.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLMode.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLMode.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLMode.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLMode.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLMode.java Tue Nov 24 09:13:44 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.reactor.ssl;
+package org.apache.hc.core5.reactor.ssl;
 
 /**
  * @since 4.2

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLSetupHandler.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLSetupHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLSetupHandler.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLSetupHandler.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLSetupHandler.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLSetupHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/SSLSetupHandler.java Tue Nov 24 09:13:44 2015
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.reactor.ssl;
+package org.apache.hc.core5.reactor.ssl;
 
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSession;
 
-import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.reactor.IOSession;
 
 /**
  * Callback interface that can be used to customize various aspects of

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/package-info.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/package-info.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/package-info.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/package-info.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/package-info.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/reactor/ssl/package-info.java Tue Nov 24 09:13:44 2015
@@ -28,4 +28,4 @@
 /**
  * TLS/SSL support for asynchronous, event driven communication.
  */
-package org.apache.hc.core5.http.nio.reactor.ssl;
+package org.apache.hc.core5.reactor.ssl;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/ExceptionEventTest.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/ExceptionEventTest.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/ExceptionEventTest.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/ExceptionEventTest.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/ExceptionEventTest.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/ExceptionEventTest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/ExceptionEventTest.java Tue Nov 24 09:13:44 2015
@@ -25,10 +25,11 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.reactor;
+package org.apache.hc.core5.http.nio;
 
 import java.util.Date;
 
+import org.apache.hc.core5.reactor.ExceptionEvent;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpClientConnection.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpClientConnection.java Tue Nov 24 09:13:44 2015
@@ -46,8 +46,8 @@ import org.apache.hc.core5.http.message.
 import org.apache.hc.core5.http.nio.codecs.LengthDelimitedDecoder;
 import org.apache.hc.core5.http.nio.entity.HttpAsyncContentProducer;
 import org.apache.hc.core5.http.nio.entity.NStringEntity;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
 import org.apache.hc.core5.http.nio.util.SimpleInputBuffer;
+import org.apache.hc.core5.reactor.IOSession;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpServerConnection.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpServerConnection.java Tue Nov 24 09:13:44 2015
@@ -45,8 +45,8 @@ import org.apache.hc.core5.http.message.
 import org.apache.hc.core5.http.nio.codecs.LengthDelimitedDecoder;
 import org.apache.hc.core5.http.nio.entity.HttpAsyncContentProducer;
 import org.apache.hc.core5.http.nio.entity.NStringEntity;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
 import org.apache.hc.core5.http.nio.util.SimpleInputBuffer;
+import org.apache.hc.core5.reactor.IOSession;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestNHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestNHttpConnectionBase.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestNHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestNHttpConnectionBase.java Tue Nov 24 09:13:44 2015
@@ -36,8 +36,8 @@ import org.apache.hc.core5.http.HttpHead
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.entity.ContentLengthStrategy;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
 import org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator;
+import org.apache.hc.core5.reactor.IOSession;
 import org.apache.hc.core5.util.CharArrayBuffer;
 import org.junit.Assert;
 import org.junit.Before;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestSessionInOutBuffers.java (from r1715835, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/TestSessionInOutBuffers.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestSessionInOutBuffers.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestSessionInOutBuffers.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/TestSessionInOutBuffers.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/TestSessionInOutBuffers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestSessionInOutBuffers.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.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkDecoder.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkDecoder.java Tue Nov 24 09:13:44 2015
@@ -40,8 +40,8 @@ import org.apache.hc.core5.http.Readable
 import org.apache.hc.core5.http.TruncatedChunkException;
 import org.apache.hc.core5.http.config.MessageConstraints;
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
-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.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.SessionInputBufferImpl;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkEncoder.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkEncoder.java Tue Nov 24 09:13:44 2015
@@ -36,8 +36,8 @@ import org.apache.hc.core5.http.TrailerS
 import org.apache.hc.core5.http.WritableByteChannelMock;
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
 import org.apache.hc.core5.http.message.BasicHeader;
-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.SessionOutputBuffer;
+import org.apache.hc.core5.http.nio.SessionOutputBufferImpl;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Matchers;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestHttpMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestHttpMessageParser.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestHttpMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestHttpMessageParser.java Tue Nov 24 09:13:44 2015
@@ -43,8 +43,8 @@ import org.apache.hc.core5.http.MessageC
 import org.apache.hc.core5.http.UnsupportedHttpVersionException;
 import org.apache.hc.core5.http.config.MessageConstraints;
 import org.apache.hc.core5.http.nio.NHttpMessageParser;
-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.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.SessionInputBufferImpl;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityDecoder.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityDecoder.java Tue Nov 24 09:13:44 2015
@@ -37,8 +37,8 @@ import java.nio.channels.ReadableByteCha
 import org.apache.hc.core5.http.Consts;
 import org.apache.hc.core5.http.ReadableByteChannelMock;
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
-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.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.SessionInputBufferImpl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityEncoder.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityEncoder.java Tue Nov 24 09:13:44 2015
@@ -36,8 +36,8 @@ import java.nio.channels.FileChannel;
 import org.apache.hc.core5.http.Consts;
 import org.apache.hc.core5.http.WritableByteChannelMock;
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
-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.SessionOutputBuffer;
+import org.apache.hc.core5.http.nio.SessionOutputBufferImpl;
 import org.apache.hc.core5.util.CharArrayBuffer;
 import org.junit.After;
 import org.junit.Assert;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedDecoder.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedDecoder.java Tue Nov 24 09:13:44 2015
@@ -38,8 +38,8 @@ import org.apache.hc.core5.http.Connecti
 import org.apache.hc.core5.http.Consts;
 import org.apache.hc.core5.http.ReadableByteChannelMock;
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
-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.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.SessionInputBufferImpl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedEncoder.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedEncoder.java Tue Nov 24 09:13:44 2015
@@ -36,8 +36,8 @@ import java.nio.channels.FileChannel;
 import org.apache.hc.core5.http.Consts;
 import org.apache.hc.core5.http.WritableByteChannelMock;
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
-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.SessionOutputBuffer;
+import org.apache.hc.core5.http.nio.SessionOutputBufferImpl;
 import org.apache.hc.core5.util.CharArrayBuffer;
 import org.junit.After;
 import org.junit.Assert;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java Tue Nov 24 09:13:44 2015
@@ -46,9 +46,6 @@ import org.apache.hc.core5.http.message.
 import org.apache.hc.core5.http.nio.NHttpConnection;
 import org.apache.hc.core5.http.nio.pool.BasicNIOConnFactory;
 import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestHandler;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.ListenerEndpoint;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLSetupHandler;
 import org.apache.hc.core5.http.nio.testserver.ClientConnectionFactory;
 import org.apache.hc.core5.http.nio.testserver.HttpClientNio;
 import org.apache.hc.core5.http.nio.testserver.HttpServerNio;
@@ -56,6 +53,9 @@ import org.apache.hc.core5.http.nio.test
 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.reactor.IOSession;
+import org.apache.hc.core5.reactor.ListenerEndpoint;
+import org.apache.hc.core5.reactor.ssl.SSLSetupHandler;
 import org.apache.hc.core5.ssl.SSLContextBuilder;
 import org.junit.After;
 import org.junit.Assert;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestDefaultListeningIOReactor.java (from r1715834, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/TestDefaultListeningIOReactor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestDefaultListeningIOReactor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestDefaultListeningIOReactor.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/TestDefaultListeningIOReactor.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/TestDefaultListeningIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestDefaultListeningIOReactor.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.integration;
 
 import java.io.IOException;
 import java.net.BindException;
@@ -45,6 +45,13 @@ 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.DefaultListeningIOReactor;
+import org.apache.hc.core5.reactor.IOEventDispatch;
+import org.apache.hc.core5.reactor.IOReactorConfig;
+import org.apache.hc.core5.reactor.IOReactorExceptionHandler;
+import org.apache.hc.core5.reactor.IOReactorStatus;
+import org.apache.hc.core5.reactor.ListenerEndpoint;
+import org.apache.hc.core5.reactor.ListeningIOReactor;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlerCancellable.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlerCancellable.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlerCancellable.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlerCancellable.java Tue Nov 24 09:13:44 2015
@@ -51,9 +51,9 @@ import org.apache.hc.core5.http.nio.prot
 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.protocol.HttpAsyncResponseProducer;
-import org.apache.hc.core5.http.nio.reactor.ListenerEndpoint;
 import org.apache.hc.core5.http.nio.testserver.HttpCoreNIOTestBase;
 import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.reactor.ListenerEndpoint;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlers.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlers.java Tue Nov 24 09:13:44 2015
@@ -61,7 +61,6 @@ import org.apache.hc.core5.http.nio.prot
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncExpectationVerifier;
 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.ListenerEndpoint;
 import org.apache.hc.core5.http.nio.testserver.HttpCoreNIOTestBase;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
@@ -72,6 +71,7 @@ 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.ListenerEndpoint;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersBrokenExpectContinue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersBrokenExpectContinue.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersBrokenExpectContinue.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersBrokenExpectContinue.java Tue Nov 24 09:13:44 2015
@@ -43,10 +43,10 @@ import org.apache.hc.core5.http.nio.enti
 import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestHandler;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncExchange;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncExpectationVerifier;
-import org.apache.hc.core5.http.nio.reactor.ListenerEndpoint;
 import org.apache.hc.core5.http.nio.testserver.HttpCoreNIOTestBase;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.reactor.ListenerEndpoint;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersPipelining.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersPipelining.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersPipelining.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersPipelining.java Tue Nov 24 09:13:44 2015
@@ -62,7 +62,6 @@ import org.apache.hc.core5.http.nio.prot
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandler;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestProducer;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncResponseConsumer;
-import org.apache.hc.core5.http.nio.reactor.ListenerEndpoint;
 import org.apache.hc.core5.http.nio.testserver.HttpCoreNIOTestBase;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
@@ -72,6 +71,7 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.RequestContent;
 import org.apache.hc.core5.http.protocol.RequestTargetHost;
 import org.apache.hc.core5.http.protocol.RequestUserAgent;
+import org.apache.hc.core5.reactor.ListenerEndpoint;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncPrematureTermination.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncPrematureTermination.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncPrematureTermination.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncPrematureTermination.java Tue Nov 24 09:13:44 2015
@@ -51,11 +51,11 @@ 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.ListenerEndpoint;
 import org.apache.hc.core5.http.nio.testserver.HttpCoreNIOTestBase;
 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.reactor.ListenerEndpoint;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;




Mime
View raw message