svn commit: r1715835 [4/5] - in /httpcomponents/httpcore/trunk: httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/ httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/ httpcore-osgi/ httpcore-osgi/src/test/java/org/apache/hc/core5/h...

[ol...@apache.org]

Modified: 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/http/nio/reactor/ssl/ReleasableSSLBufferManagementStrategy.java?rev=1715835&r1=1715834&r2=1715835&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/http/nio/reactor/ssl/ReleasableSSLBufferManagementStrategy.java Mon Nov 23 14:46:30 2015
@@ -28,7 +28,7 @@ package org.apache.hc.core5.http.nio.rea
 
 import java.nio.ByteBuffer;
 
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * A {@link SSLBufferManagementStrategy} that releases the underlying buffer when deactivated.

Modified: 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/http/nio/reactor/ssl/SSLIOSession.java?rev=1715835&r1=1715834&r2=1715835&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/http/nio/reactor/ssl/SSLIOSession.java Mon Nov 23 14:46:30 2015
@@ -42,14 +42,14 @@ import javax.net.ssl.SSLEngineResult.Sta
 import javax.net.ssl.SSLException;
 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.annotation.ThreadSafe;
 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.http.util.Args;
-import org.apache.hc.core5.http.util.Asserts;
+import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.util.Asserts;
 
 /**
  * {@code SSLIOSession} is a decorator class intended to transparently extend

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/DirectByteBufferAllocator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/DirectByteBufferAllocator.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/DirectByteBufferAllocator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/DirectByteBufferAllocator.java Mon Nov 23 14:46:30 2015
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.nio.uti
 
 import java.nio.ByteBuffer;
 
-import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.annotation.Immutable;
 
 /**
  * Allocates {@link ByteBuffer} instances using

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/ExpandableBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/ExpandableBuffer.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/ExpandableBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/ExpandableBuffer.java Mon Nov 23 14:46:30 2015
@@ -29,8 +29,8 @@ package org.apache.hc.core5.http.nio.uti
 
 import java.nio.ByteBuffer;
 
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.util.Args;
 
 /**
  * A buffer that expand its capacity on demand using {@link ByteBufferAllocator}

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/HeapByteBufferAllocator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/HeapByteBufferAllocator.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/HeapByteBufferAllocator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/HeapByteBufferAllocator.java Mon Nov 23 14:46:30 2015
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.nio.uti
 
 import java.nio.ByteBuffer;
 
-import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.annotation.Immutable;
 
 /**
  * Allocates {@link ByteBuffer} instances using

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SharedInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SharedInputBuffer.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SharedInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SharedInputBuffer.java Mon Nov 23 14:46:30 2015
@@ -31,7 +31,7 @@ import java.io.InterruptedIOException;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.nio.ContentDecoder;
 import org.apache.hc.core5.http.nio.IOControl;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SharedOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SharedOutputBuffer.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SharedOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SharedOutputBuffer.java Mon Nov 23 14:46:30 2015
@@ -31,10 +31,10 @@ import java.io.InterruptedIOException;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.nio.ContentEncoder;
 import org.apache.hc.core5.http.nio.IOControl;
-import org.apache.hc.core5.http.util.Asserts;
+import org.apache.hc.core5.util.Asserts;
 
 /**
  * Implementation of the {@link ContentOutputBuffer} interface that can be

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SimpleInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SimpleInputBuffer.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SimpleInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SimpleInputBuffer.java Mon Nov 23 14:46:30 2015
@@ -28,7 +28,7 @@ package org.apache.hc.core5.http.nio.uti
 
 import java.io.IOException;
 
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.nio.ContentDecoder;
 
 /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SimpleOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SimpleOutputBuffer.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SimpleOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/nio/util/SimpleOutputBuffer.java Mon Nov 23 14:46:30 2015
@@ -28,7 +28,7 @@ package org.apache.hc.core5.http.nio.uti
 
 import java.io.IOException;
 
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.nio.ContentEncoder;
 
 /**

Modified: 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/http/pool/AbstractConnPool.java?rev=1715835&r1=1715834&r2=1715835&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/http/pool/AbstractConnPool.java Mon Nov 23 14:46:30 2015
@@ -40,10 +40,10 @@ import java.util.concurrent.TimeoutExcep
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.hc.core5.http.annotation.ThreadSafe;
-import org.apache.hc.core5.http.concurrent.FutureCallback;
-import org.apache.hc.core5.http.util.Args;
-import org.apache.hc.core5.http.util.Asserts;
+import org.apache.hc.core5.annotation.ThreadSafe;
+import org.apache.hc.core5.concurrent.FutureCallback;
+import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.util.Asserts;
 
 /**
  * Abstract synchronous (blocking) pool of connections.

Modified: 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/http/pool/ConnPool.java?rev=1715835&r1=1715834&r2=1715835&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/http/pool/ConnPool.java Mon Nov 23 14:46:30 2015
@@ -28,7 +28,7 @@ package org.apache.hc.core5.http.pool;
 
 import java.util.concurrent.Future;
 
-import org.apache.hc.core5.http.concurrent.FutureCallback;
+import org.apache.hc.core5.concurrent.FutureCallback;
 
 /**
  * {@code ConnPool} represents a shared pool connections can be leased from

Modified: 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/http/pool/PoolEntry.java?rev=1715835&r1=1715834&r2=1715835&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/http/pool/PoolEntry.java Mon Nov 23 14:46:30 2015
@@ -28,9 +28,9 @@ package org.apache.hc.core5.http.pool;
 
 import java.util.concurrent.TimeUnit;
 
-import org.apache.hc.core5.http.annotation.GuardedBy;
-import org.apache.hc.core5.http.annotation.ThreadSafe;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.annotation.GuardedBy;
+import org.apache.hc.core5.annotation.ThreadSafe;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Pool entry containing a pool connection object along with its route.

Modified: 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/http/pool/PoolEntryFuture.java?rev=1715835&r1=1715834&r2=1715835&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/http/pool/PoolEntryFuture.java Mon Nov 23 14:46:30 2015
@@ -35,9 +35,9 @@ import java.util.concurrent.TimeoutExcep
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 
-import org.apache.hc.core5.http.annotation.ThreadSafe;
-import org.apache.hc.core5.http.concurrent.FutureCallback;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.annotation.ThreadSafe;
+import org.apache.hc.core5.concurrent.FutureCallback;
+import org.apache.hc.core5.util.Args;
 
 @ThreadSafe
 abstract class PoolEntryFuture<T> implements Future<T> {

Modified: 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/http/pool/PoolStats.java?rev=1715835&r1=1715834&r2=1715835&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/http/pool/PoolStats.java Mon Nov 23 14:46:30 2015
@@ -28,7 +28,7 @@ package org.apache.hc.core5.http.pool;
 
 import java.io.Serializable;
 
-import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.annotation.Immutable;
 
 /**
  * Pool statistics.

Modified: 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/http/pool/RouteSpecificPool.java?rev=1715835&r1=1715834&r2=1715835&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/http/pool/RouteSpecificPool.java Mon Nov 23 14:46:30 2015
@@ -31,9 +31,9 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Set;
 
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.util.Args;
-import org.apache.hc.core5.http.util.Asserts;
+import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.util.Asserts;
 
 @NotThreadSafe
 abstract class RouteSpecificPool<T, C, E extends PoolEntry<T, C>> {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/BasicHttpContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/BasicHttpContext.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/BasicHttpContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/BasicHttpContext.java Mon Nov 23 14:46:30 2015
@@ -30,8 +30,8 @@ package org.apache.hc.core5.http.protoco
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.hc.core5.http.annotation.ThreadSafe;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.annotation.ThreadSafe;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Default implementation of {@link HttpContext}.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ChainBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ChainBuilder.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ChainBuilder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ChainBuilder.java Mon Nov 23 14:46:30 2015
@@ -32,7 +32,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.annotation.NotThreadSafe;
 
 /**
  * Builder class to build a linked list (chain) of unique class instances. Each class can have

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpCoreContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpCoreContext.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpCoreContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpCoreContext.java Mon Nov 23 14:46:30 2015
@@ -27,12 +27,12 @@
 
 package org.apache.hc.core5.http.protocol;
 
+import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.HttpConnection;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Implementation of {@link HttpContext} that provides convenience

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpDateGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpDateGenerator.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpDateGenerator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpDateGenerator.java Mon Nov 23 14:46:30 2015
@@ -33,8 +33,8 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.apache.hc.core5.http.annotation.GuardedBy;
-import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.annotation.GuardedBy;
+import org.apache.hc.core5.annotation.ThreadSafe;
 
 /**
  * Generates a date in the format required by the HTTP protocol.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpRequestExecutor.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpRequestExecutor.java Mon Nov 23 14:46:30 2015
@@ -29,6 +29,7 @@ package org.apache.hc.core5.http.protoco
 
 import java.io.IOException;
 
+import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpClientConnection;
 import org.apache.hc.core5.http.HttpEntity;
@@ -38,8 +39,7 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.ProtocolException;
-import org.apache.hc.core5.http.annotation.Immutable;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * {@code HttpRequestExecutor} is a client side HTTP protocol handler based
@@ -212,9 +212,8 @@ public class HttpRequestExecutor {
      * <p>
      * This method does <i>not</i> read the response entity, if any.
      * The connection over which content of the response entity is being
-     * streamed from cannot be reused until
-     * {@link org.apache.hc.core5.http.util.EntityUtils#consume(org.apache.hc.core5.http.HttpEntity)}
-     * has been invoked.
+     * streamed from cannot be reused until the response entity has been
+     * fully consumed.
      *
      * @param response  the response object to post-process
      * @param processor the processor to use

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpService.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/HttpService.java Mon Nov 23 14:46:30 2015
@@ -29,6 +29,7 @@ package org.apache.hc.core5.http.protoco
 
 import java.io.IOException;
 
+import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.ConnectionReuseStrategy;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
@@ -43,13 +44,12 @@ import org.apache.hc.core5.http.MethodNo
 import org.apache.hc.core5.http.NotImplementedException;
 import org.apache.hc.core5.http.ProtocolException;
 import org.apache.hc.core5.http.UnsupportedHttpVersionException;
-import org.apache.hc.core5.http.annotation.Immutable;
 import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
-import org.apache.hc.core5.http.util.Args;
-import org.apache.hc.core5.http.util.EntityUtils;
+import org.apache.hc.core5.util.Args;
 
 /**
  * {@code HttpService} is a server side HTTP protocol handler based on

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ImmutableHttpProcessor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ImmutableHttpProcessor.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ImmutableHttpProcessor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ImmutableHttpProcessor.java Mon Nov 23 14:46:30 2015
@@ -29,12 +29,12 @@ package org.apache.hc.core5.http.protoco
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpRequestInterceptor;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpResponseInterceptor;
-import org.apache.hc.core5.http.annotation.ThreadSafe;
 
 /**
  * Immutable {@link HttpProcessor}.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestConnControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestConnControl.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestConnControl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestConnControl.java Mon Nov 23 14:46:30 2015
@@ -29,13 +29,13 @@ package org.apache.hc.core5.http.protoco
 
 import java.io.IOException;
 
+import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpRequestInterceptor;
-import org.apache.hc.core5.http.annotation.Immutable;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * RequestConnControl is responsible for adding {@code Connection} header

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestContent.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestContent.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestContent.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestContent.java Mon Nov 23 14:46:30 2015
@@ -30,6 +30,7 @@ package org.apache.hc.core5.http.protoco
 import java.io.IOException;
 import java.util.Set;
 
+import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpException;
@@ -39,9 +40,8 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.ProtocolException;
 import org.apache.hc.core5.http.ProtocolVersion;
-import org.apache.hc.core5.http.annotation.Immutable;
 import org.apache.hc.core5.http.message.BasicHeader;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * RequestContent is the most important interceptor for outgoing requests.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestDate.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestDate.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestDate.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestDate.java Mon Nov 23 14:46:30 2015
@@ -29,13 +29,13 @@ package org.apache.hc.core5.http.protoco
 
 import java.io.IOException;
 
+import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpRequestInterceptor;
-import org.apache.hc.core5.http.annotation.ThreadSafe;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * RequestDate interceptor is responsible for adding {@code Date} header

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestExpectContinue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestExpectContinue.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestExpectContinue.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestExpectContinue.java Mon Nov 23 14:46:30 2015
@@ -29,6 +29,7 @@ package org.apache.hc.core5.http.protoco
 
 import java.io.IOException;
 
+import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpException;
@@ -37,8 +38,7 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpRequestInterceptor;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.ProtocolVersion;
-import org.apache.hc.core5.http.annotation.Immutable;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * RequestExpectContinue is responsible for enabling the 'expect-continue'

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestTargetHost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestTargetHost.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestTargetHost.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestTargetHost.java Mon Nov 23 14:46:30 2015
@@ -30,6 +30,7 @@ package org.apache.hc.core5.http.protoco
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
+import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpConnection;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHeaders;
@@ -39,8 +40,7 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.ProtocolException;
 import org.apache.hc.core5.http.ProtocolVersion;
-import org.apache.hc.core5.http.annotation.Immutable;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * RequestTargetHost is responsible for adding {@code Host} header. This

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestUserAgent.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestUserAgent.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestUserAgent.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestUserAgent.java Mon Nov 23 14:46:30 2015
@@ -29,12 +29,12 @@ package org.apache.hc.core5.http.protoco
 
 import java.io.IOException;
 
+import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpRequestInterceptor;
-import org.apache.hc.core5.http.annotation.Immutable;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * RequestUserAgent is responsible for adding {@code User-Agent} header.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestValidateHost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestValidateHost.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestValidateHost.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/RequestValidateHost.java Mon Nov 23 14:46:30 2015
@@ -29,6 +29,7 @@ package org.apache.hc.core5.http.protoco
 
 import java.io.IOException;
 
+import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpRequest;
@@ -36,8 +37,7 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.ProtocolException;
 import org.apache.hc.core5.http.ProtocolVersion;
-import org.apache.hc.core5.http.annotation.Immutable;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * RequestValidateHost is responsible for validating {@code Host} header in HTTP/1.1 messages.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseConnControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseConnControl.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseConnControl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseConnControl.java Mon Nov 23 14:46:30 2015
@@ -29,6 +29,7 @@ package org.apache.hc.core5.http.protoco
 
 import java.io.IOException;
 
+import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpEntity;
@@ -40,8 +41,7 @@ import org.apache.hc.core5.http.HttpResp
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.ProtocolVersion;
-import org.apache.hc.core5.http.annotation.Immutable;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * ResponseConnControl is responsible for adding {@code Connection} header

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseContent.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseContent.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseContent.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseContent.java Mon Nov 23 14:46:30 2015
@@ -30,6 +30,7 @@ package org.apache.hc.core5.http.protoco
 import java.io.IOException;
 import java.util.Set;
 
+import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpException;
@@ -40,9 +41,8 @@ import org.apache.hc.core5.http.HttpStat
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.ProtocolException;
 import org.apache.hc.core5.http.ProtocolVersion;
-import org.apache.hc.core5.http.annotation.Immutable;
 import org.apache.hc.core5.http.message.BasicHeader;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * ResponseContent is the most important interceptor for outgoing responses.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseDate.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseDate.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseDate.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseDate.java Mon Nov 23 14:46:30 2015
@@ -29,13 +29,13 @@ package org.apache.hc.core5.http.protoco
 
 import java.io.IOException;
 
+import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpResponseInterceptor;
 import org.apache.hc.core5.http.HttpStatus;
-import org.apache.hc.core5.http.annotation.ThreadSafe;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * ResponseDate is responsible for adding {@code Date} header to the

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseServer.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/ResponseServer.java Mon Nov 23 14:46:30 2015
@@ -29,12 +29,12 @@ package org.apache.hc.core5.http.protoco
 
 import java.io.IOException;
 
+import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpResponseInterceptor;
-import org.apache.hc.core5.http.annotation.Immutable;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * ResponseServer is responsible for adding {@code Server} header. This

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/TrailerNameFormatter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/TrailerNameFormatter.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/TrailerNameFormatter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/TrailerNameFormatter.java Mon Nov 23 14:46:30 2015
@@ -36,7 +36,7 @@ import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.message.BufferedHeader;
-import org.apache.hc.core5.http.util.CharArrayBuffer;
+import org.apache.hc.core5.util.CharArrayBuffer;
 
 /**
  * Utility class to generate Trailer header.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/UriHttpRequestHandlerMapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/UriHttpRequestHandlerMapper.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/UriHttpRequestHandlerMapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/UriHttpRequestHandlerMapper.java Mon Nov 23 14:46:30 2015
@@ -27,9 +27,9 @@
 
 package org.apache.hc.core5.http.protocol;
 
+import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.annotation.ThreadSafe;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Maintains a map of HTTP request handlers keyed by a request URI pattern.

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/UriPatternMatcher.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/UriPatternMatcher.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/UriPatternMatcher.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/protocol/UriPatternMatcher.java Mon Nov 23 14:46:30 2015
@@ -30,9 +30,9 @@ package org.apache.hc.core5.http.protoco
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.hc.core5.http.annotation.GuardedBy;
-import org.apache.hc.core5.http.annotation.ThreadSafe;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.annotation.GuardedBy;
+import org.apache.hc.core5.annotation.ThreadSafe;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Maintains a map of objects keyed by a request URI pattern.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/PrivateKeyDetails.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/PrivateKeyDetails.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/PrivateKeyDetails.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/PrivateKeyDetails.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/PrivateKeyDetails.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/PrivateKeyDetails.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/PrivateKeyDetails.java Mon Nov 23 14:46:30 2015
@@ -24,13 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.ssl;
-
-import org.apache.hc.core5.http.util.Args;
+package org.apache.hc.core5.ssl;
 
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
 
+import org.apache.hc.core5.util.Args;
+
 /**
  * Private key details.
  *

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/PrivateKeyStrategy.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/PrivateKeyStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/PrivateKeyStrategy.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/PrivateKeyStrategy.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/PrivateKeyStrategy.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/PrivateKeyStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/PrivateKeyStrategy.java Mon Nov 23 14:46:30 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.ssl;
+package org.apache.hc.core5.ssl;
 
 import java.util.Map;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLContextBuilder.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/SSLContextBuilder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLContextBuilder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLContextBuilder.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/SSLContextBuilder.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/SSLContextBuilder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLContextBuilder.java Mon Nov 23 14:46:30 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.ssl;
+package org.apache.hc.core5.ssl;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -59,8 +59,8 @@ import javax.net.ssl.TrustManagerFactory
 import javax.net.ssl.X509ExtendedKeyManager;
 import javax.net.ssl.X509TrustManager;
 
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Builder for {@link javax.net.ssl.SSLContext} instances.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLContexts.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/SSLContexts.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLContexts.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLContexts.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/SSLContexts.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/SSLContexts.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLContexts.java Mon Nov 23 14:46:30 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.hc.core5.http.ssl;
+package org.apache.hc.core5.ssl;
 
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.annotation.Immutable;
 
 /**
  * {@link javax.net.ssl.SSLContext} factory methods.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLInitializationException.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/SSLInitializationException.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLInitializationException.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLInitializationException.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/SSLInitializationException.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/SSLInitializationException.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/SSLInitializationException.java Mon Nov 23 14:46:30 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.ssl;
+package org.apache.hc.core5.ssl;
 
 public class SSLInitializationException extends IllegalStateException {
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/TrustStrategy.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/TrustStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/TrustStrategy.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/TrustStrategy.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/TrustStrategy.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/TrustStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/TrustStrategy.java Mon Nov 23 14:46:30 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.ssl;
+package org.apache.hc.core5.ssl;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/package-info.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/package-info.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/package-info.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/package-info.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/package-info.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/ssl/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/ssl/package-info.java Mon Nov 23 14:46:30 2015
@@ -29,4 +29,4 @@
  * Utility classes for trust and key material management
  * and TLS/SSL context initialization.
  */
-package org.apache.hc.core5.http.ssl;
+package org.apache.hc.core5.ssl;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/Args.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/Args.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/Args.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/Args.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/Args.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/Args.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/Args.java Mon Nov 23 14:46:30 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.util;
+package org.apache.hc.core5.util;
 
 import java.util.Collection;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/Asserts.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/Asserts.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/Asserts.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/Asserts.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/Asserts.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/Asserts.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/Asserts.java Mon Nov 23 14:46:30 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.util;
+package org.apache.hc.core5.util;
 
 public class Asserts {
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/ByteArrayBuffer.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/ByteArrayBuffer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/ByteArrayBuffer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/ByteArrayBuffer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/ByteArrayBuffer.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/ByteArrayBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/ByteArrayBuffer.java Mon Nov 23 14:46:30 2015
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.hc.core5.http.util;
+package org.apache.hc.core5.util;
 
 import java.io.Serializable;
 
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.annotation.NotThreadSafe;
 
 /**
  * A resizable byte array.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharArrayBuffer.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/CharArrayBuffer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharArrayBuffer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharArrayBuffer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/CharArrayBuffer.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/CharArrayBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharArrayBuffer.java Mon Nov 23 14:46:30 2015
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.hc.core5.http.util;
+package org.apache.hc.core5.util;
 
 import java.io.Serializable;
 import java.nio.CharBuffer;
 
+import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.Consts;
-import org.apache.hc.core5.http.annotation.NotThreadSafe;
 
 /**
  * A resizable char array.

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharsetUtils.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/CharsetUtils.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharsetUtils.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharsetUtils.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/CharsetUtils.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/CharsetUtils.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharsetUtils.java Mon Nov 23 14:46:30 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.util;
+package org.apache.hc.core5.util;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/LangUtils.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/LangUtils.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/LangUtils.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/LangUtils.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/LangUtils.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/LangUtils.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/LangUtils.java Mon Nov 23 14:46:30 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.util;
+package org.apache.hc.core5.util;
 
 /**
  * A set of utility methods to help produce consistent

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/NetUtils.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/NetUtils.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/NetUtils.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/NetUtils.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/NetUtils.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/NetUtils.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/NetUtils.java Mon Nov 23 14:46:30 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.util;
+package org.apache.hc.core5.util;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/TextUtils.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/TextUtils.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/TextUtils.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/TextUtils.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/TextUtils.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/TextUtils.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/TextUtils.java Mon Nov 23 14:46:30 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.util;
+package org.apache.hc.core5.util;
 
 /**
  * @since 4.3

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/VersionInfo.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/VersionInfo.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/VersionInfo.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/VersionInfo.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/VersionInfo.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/VersionInfo.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/VersionInfo.java Mon Nov 23 14:46:30 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.util;
+package org.apache.hc.core5.util;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/package-info.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/package-info.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/package-info.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/package-info.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/package-info.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/util/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/package-info.java Mon Nov 23 14:46:30 2015
@@ -28,4 +28,4 @@
 /**
  * Core utility classes.
  */
-package org.apache.hc.core5.http.util;
+package org.apache.hc.core5.util;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/concurrent/BasicFutureCallback.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/concurrent/BasicFutureCallback.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/concurrent/BasicFutureCallback.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/concurrent/BasicFutureCallback.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/concurrent/BasicFutureCallback.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/concurrent/BasicFutureCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/concurrent/BasicFutureCallback.java Mon Nov 23 14:46:30 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.concurrent;
+package org.apache.hc.core5.concurrent;
 
 
 class BasicFutureCallback<T> implements FutureCallback<T> {

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/concurrent/TestBasicFuture.java (from r1715830, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/concurrent/TestBasicFuture.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/concurrent/TestBasicFuture.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/concurrent/TestBasicFuture.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/concurrent/TestBasicFuture.java&r1=1715830&r2=1715835&rev=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/concurrent/TestBasicFuture.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/concurrent/TestBasicFuture.java Mon Nov 23 14:46:30 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.concurrent;
+package org.apache.hc.core5.concurrent;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestByteBufferEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestByteBufferEntity.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestByteBufferEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestByteBufferEntity.java Mon Nov 23 14:46:30 2015
@@ -27,13 +27,13 @@
 
 package org.apache.hc.core5.http.entity;
 
+import java.io.ByteArrayOutputStream;
+import java.nio.ByteBuffer;
+
 import org.apache.hc.core5.http.Consts;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.io.ByteArrayOutputStream;
-import java.nio.ByteBuffer;
-
 /**
  * Unit tests for {@link ByteBufferEntity}.
  *

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestHttpEntityWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestHttpEntityWrapper.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestHttpEntityWrapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestHttpEntityWrapper.java Mon Nov 23 14:46:30 2015
@@ -30,7 +30,6 @@ package org.apache.hc.core5.http.entity;
 import java.io.ByteArrayOutputStream;
 
 import org.apache.hc.core5.http.Consts;
-import org.apache.hc.core5.http.util.EntityUtils;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestStringEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestStringEntity.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestStringEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/entity/TestStringEntity.java Mon Nov 23 14:46:30 2015
@@ -31,7 +31,6 @@ import java.io.ByteArrayOutputStream;
 import java.nio.charset.Charset;
 
 import org.apache.hc.core5.http.Consts;
-import org.apache.hc.core5.http.util.EntityUtils;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java Mon Nov 23 14:46:30 2015
@@ -39,7 +39,7 @@ import org.apache.hc.core5.http.config.M
 import org.apache.hc.core5.http.impl.SessionInputBufferMock;
 import org.apache.hc.core5.http.impl.SessionOutputBufferMock;
 import org.apache.hc.core5.http.io.HttpTransportMetrics;
-import org.apache.hc.core5.http.util.CharArrayBuffer;
+import org.apache.hc.core5.util.CharArrayBuffer;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestSyncHttp.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestSyncHttp.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestSyncHttp.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestSyncHttp.java Mon Nov 23 14:46:30 2015
@@ -52,6 +52,7 @@ import org.apache.hc.core5.http.HttpVers
 import org.apache.hc.core5.http.entity.AbstractHttpEntity;
 import org.apache.hc.core5.http.entity.ByteArrayEntity;
 import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.impl.DefaultBHttpClientConnection;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
@@ -66,7 +67,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.RequestUserAgent;
 import org.apache.hc.core5.http.testserver.HttpClient;
 import org.apache.hc.core5.http.testserver.HttpServer;
-import org.apache.hc.core5.http.util.EntityUtils;
 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/message/TestBasicHeaderValueFormatter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicHeaderValueFormatter.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicHeaderValueFormatter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicHeaderValueFormatter.java Mon Nov 23 14:46:30 2015
@@ -28,7 +28,7 @@ package org.apache.hc.core5.http.message
 
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.http.util.CharArrayBuffer;
+import org.apache.hc.core5.util.CharArrayBuffer;
 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/message/TestBasicHeaderValueParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicHeaderValueParser.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicHeaderValueParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicHeaderValueParser.java Mon Nov 23 14:46:30 2015
@@ -28,7 +28,7 @@ package org.apache.hc.core5.http.message
 
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.http.util.CharArrayBuffer;
+import org.apache.hc.core5.util.CharArrayBuffer;
 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/message/TestBasicLineFormatter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicLineFormatter.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicLineFormatter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicLineFormatter.java Mon Nov 23 14:46:30 2015
@@ -32,7 +32,7 @@ import org.apache.hc.core5.http.HttpStat
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.RequestLine;
 import org.apache.hc.core5.http.StatusLine;
-import org.apache.hc.core5.http.util.CharArrayBuffer;
+import org.apache.hc.core5.util.CharArrayBuffer;
 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/message/TestBasicLineParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicLineParser.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicLineParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBasicLineParser.java Mon Nov 23 14:46:30 2015
@@ -32,7 +32,7 @@ import org.apache.hc.core5.http.HttpVers
 import org.apache.hc.core5.http.ParseException;
 import org.apache.hc.core5.http.RequestLine;
 import org.apache.hc.core5.http.StatusLine;
-import org.apache.hc.core5.http.util.CharArrayBuffer;
+import org.apache.hc.core5.util.CharArrayBuffer;
 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/message/TestBufferedHeader.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBufferedHeader.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBufferedHeader.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestBufferedHeader.java Mon Nov 23 14:46:30 2015
@@ -34,7 +34,7 @@ import java.io.ObjectOutputStream;
 
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.ParseException;
-import org.apache.hc.core5.http.util.CharArrayBuffer;
+import org.apache.hc.core5.util.CharArrayBuffer;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestHeaderElement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestHeaderElement.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestHeaderElement.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestHeaderElement.java Mon Nov 23 14:46:30 2015
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.message
 
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.http.util.CharArrayBuffer;
+import org.apache.hc.core5.util.CharArrayBuffer;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestTokenParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestTokenParser.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestTokenParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/message/TestTokenParser.java Mon Nov 23 14:46:30 2015
@@ -27,7 +27,7 @@
 
 package org.apache.hc.core5.http.message;
 
-import org.apache.hc.core5.http.util.CharArrayBuffer;
+import org.apache.hc.core5.util.CharArrayBuffer;
 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=1715835&r1=1715834&r2=1715835&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 Mon Nov 23 14:46:30 2015
@@ -38,7 +38,7 @@ import org.apache.hc.core5.http.entity.C
 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.http.util.CharArrayBuffer;
+import org.apache.hc.core5.util.CharArrayBuffer;
 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/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=1715835&r1=1715834&r2=1715835&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 Mon Nov 23 14:46:30 2015
@@ -38,7 +38,7 @@ import org.apache.hc.core5.http.Writable
 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.util.CharArrayBuffer;
+import org.apache.hc.core5.util.CharArrayBuffer;
 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=1715835&r1=1715834&r2=1715835&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 Mon Nov 23 14:46:30 2015
@@ -38,7 +38,7 @@ import org.apache.hc.core5.http.Writable
 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.util.CharArrayBuffer;
+import org.apache.hc.core5.util.CharArrayBuffer;
 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/integration/SimpleRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/SimpleRequestHandler.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/SimpleRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/SimpleRequestHandler.java Mon Nov 23 14:46:30 2015
@@ -34,10 +34,10 @@ import org.apache.hc.core5.http.HttpExce
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.nio.entity.NStringEntity;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpRequestHandler;
-import org.apache.hc.core5.http.util.EntityUtils;
 
 final class SimpleRequestHandler implements HttpRequestHandler {
 

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=1715835&r1=1715834&r2=1715835&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 Mon Nov 23 14:46:30 2015
@@ -56,7 +56,7 @@ 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.http.ssl.SSLContextBuilder;
+import org.apache.hc.core5.ssl.SSLContextBuilder;
 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/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=1715835&r1=1715834&r2=1715835&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 Mon Nov 23 14:46:30 2015
@@ -36,11 +36,11 @@ import java.net.Socket;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hc.core5.concurrent.Cancellable;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.concurrent.Cancellable;
 import org.apache.hc.core5.http.entity.BasicHttpEntity;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.message.BasicHttpResponse;

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=1715835&r1=1715834&r2=1715835&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 Mon Nov 23 14:46:30 2015
@@ -48,6 +48,7 @@ import org.apache.hc.core5.http.HttpStat
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.ProtocolVersion;
 import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
 import org.apache.hc.core5.http.nio.ContentEncoder;
@@ -71,7 +72,6 @@ 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.http.util.EntityUtils;
 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=1715835&r1=1715834&r2=1715835&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 Mon Nov 23 14:46:30 2015
@@ -47,6 +47,7 @@ import org.apache.hc.core5.http.HttpResp
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
@@ -71,7 +72,6 @@ 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.http.util.EntityUtils;
 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=1715835&r1=1715834&r2=1715835&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 Mon Nov 23 14:46:30 2015
@@ -33,13 +33,13 @@ import java.net.InetSocketAddress;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hc.core5.concurrent.FutureCallback;
 import org.apache.hc.core5.http.Consts;
 import org.apache.hc.core5.http.HttpConnection;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.concurrent.FutureCallback;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.InputStreamEntity;
 import org.apache.hc.core5.http.message.BasicHttpRequest;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncTimeout.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncTimeout.java?rev=1715835&r1=1715834&r2=1715835&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncTimeout.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncTimeout.java Mon Nov 23 14:46:30 2015
@@ -35,10 +35,10 @@ import java.util.Collection;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hc.core5.concurrent.FutureCallback;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.concurrent.FutureCallback;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestProducer;
 import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseConsumer;