hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1715545 [5/10] - in /httpcomponents/httpcore/trunk: httpcore-ab/ httpcore-ab/src/main/java/org/apache/hc/ httpcore-ab/src/main/java/org/apache/hc/core5/ httpcore-ab/src/main/java/org/apache/hc/core5/http/ httpcore-ab/src/main/java/org/apac...
Date Sat, 21 Nov 2015 16:53:03 GMT
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SimpleOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SimpleOutputBuffer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SimpleOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SimpleOutputBuffer.java Sat Nov 21 16:52:56 2015
@@ -24,12 +24,12 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.util;
+package org.apache.hc.core5.http.nio.util;
 
 import java.io.IOException;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.nio.ContentEncoder;
 
 /**
  * Basic implementation of the {@link ContentOutputBuffer} interface.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/package-info.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/package-info.java Sat Nov 21 16:52:56 2015
@@ -28,4 +28,4 @@
 /**
  * Core utility classes for asynchronous, event driven communication.
  */
-package org.apache.http.nio.util;
+package org.apache.hc.core5.http.nio.util;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/ByteChannelMock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/ByteChannelMock.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/ByteChannelMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/ByteChannelMock.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http;
+package org.apache.hc.core5.http;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/OoopsieRuntimeException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/OoopsieRuntimeException.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/OoopsieRuntimeException.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/OoopsieRuntimeException.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http;
+package org.apache.hc.core5.http;
 
 public class OoopsieRuntimeException extends RuntimeException {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/ReadableByteChannelMock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/ReadableByteChannelMock.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/ReadableByteChannelMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/ReadableByteChannelMock.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http;
+package org.apache.hc.core5.http;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/WritableByteChannelMock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/WritableByteChannelMock.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/WritableByteChannelMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/WritableByteChannelMock.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http;
+package org.apache.hc.core5.http;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -33,8 +33,8 @@ import java.nio.channels.ClosedChannelEx
 import java.nio.channels.WritableByteChannel;
 import java.nio.charset.Charset;
 
-import org.apache.http.nio.util.ExpandableBuffer;
-import org.apache.http.nio.util.HeapByteBufferAllocator;
+import org.apache.hc.core5.http.nio.util.ExpandableBuffer;
+import org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator;
 
 public class WritableByteChannelMock implements WritableByteChannel {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestContentChannel.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestContentChannel.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestContentChannel.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestContentChannel.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.times;
@@ -32,10 +32,10 @@ import static org.mockito.Mockito.verify
 
 import java.nio.ByteBuffer;
 
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.ContentDecoderChannel;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.ContentEncoderChannel;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentDecoderChannel;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.ContentEncoderChannel;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpClientConnection.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpClientConnection.java Sat Nov 21 16:52:56 2015
@@ -24,36 +24,36 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.ByteChannel;
 import java.nio.channels.SelectionKey;
 import java.util.LinkedList;
 
-import org.apache.http.ByteChannelMock;
-import org.apache.http.Consts;
-import org.apache.http.HeaderElements;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpVersion;
-import org.apache.http.ReadableByteChannelMock;
-import org.apache.http.WritableByteChannelMock;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.nio.codecs.LengthDelimitedDecoder;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.nio.NHttpClientEventHandler;
-import org.apache.http.nio.NHttpConnection;
-import org.apache.http.nio.entity.HttpAsyncContentProducer;
-import org.apache.http.nio.entity.NStringEntity;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.util.SimpleInputBuffer;
+import org.apache.hc.core5.http.ByteChannelMock;
+import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.HeaderElements;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpHeaders;
+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.ReadableByteChannelMock;
+import org.apache.hc.core5.http.WritableByteChannelMock;
+import org.apache.hc.core5.http.entity.StringEntity;
+import org.apache.hc.core5.http.impl.nio.codecs.LengthDelimitedDecoder;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.NHttpClientConnection;
+import org.apache.hc.core5.http.nio.NHttpClientEventHandler;
+import org.apache.hc.core5.http.nio.NHttpConnection;
+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.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpServerConnection.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpServerConnection.java Sat Nov 21 16:52:56 2015
@@ -24,35 +24,35 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.ByteChannel;
 import java.nio.channels.SelectionKey;
 import java.util.LinkedList;
 
-import org.apache.http.ByteChannelMock;
-import org.apache.http.Consts;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpVersion;
-import org.apache.http.ReadableByteChannelMock;
-import org.apache.http.WritableByteChannelMock;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.nio.codecs.LengthDelimitedDecoder;
-import org.apache.http.message.BasicHttpResponse;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.nio.NHttpConnection;
-import org.apache.http.nio.NHttpServerConnection;
-import org.apache.http.nio.NHttpServerEventHandler;
-import org.apache.http.nio.entity.HttpAsyncContentProducer;
-import org.apache.http.nio.entity.NStringEntity;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.util.SimpleInputBuffer;
+import org.apache.hc.core5.http.ByteChannelMock;
+import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpHeaders;
+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.ReadableByteChannelMock;
+import org.apache.hc.core5.http.WritableByteChannelMock;
+import org.apache.hc.core5.http.entity.StringEntity;
+import org.apache.hc.core5.http.impl.nio.codecs.LengthDelimitedDecoder;
+import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.NHttpConnection;
+import org.apache.hc.core5.http.nio.NHttpServerConnection;
+import org.apache.hc.core5.http.nio.NHttpServerEventHandler;
+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.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java Sat Nov 21 16:52:56 2015
@@ -24,22 +24,22 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio;
+package org.apache.hc.core5.http.impl.nio;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.channels.ByteChannel;
 import java.nio.channels.SelectionKey;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpVersion;
-import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.message.BasicHttpResponse;
-import org.apache.http.nio.NHttpConnection;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpHeaders;
+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.NHttpConnection;
+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.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/CodecTestUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/CodecTestUtils.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/CodecTestUtils.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/CodecTestUtils.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
 import java.nio.ByteBuffer;
 
-import org.apache.http.Consts;
+import org.apache.hc.core5.http.Consts;
 
 class CodecTestUtils {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestChunkDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestChunkDecoder.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestChunkDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestChunkDecoder.java Sat Nov 21 16:52:56 2015
@@ -25,23 +25,23 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
 
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.Consts;
-import org.apache.http.Header;
-import org.apache.http.MalformedChunkCodingException;
-import org.apache.http.MessageConstraintException;
-import org.apache.http.ReadableByteChannelMock;
-import org.apache.http.TruncatedChunkException;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.impl.nio.reactor.SessionInputBufferImpl;
-import org.apache.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.MalformedChunkCodingException;
+import org.apache.hc.core5.http.MessageConstraintException;
+import org.apache.hc.core5.http.ReadableByteChannelMock;
+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.impl.nio.reactor.SessionInputBufferImpl;
+import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestChunkEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestChunkEncoder.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestChunkEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestChunkEncoder.java Sat Nov 21 16:52:56 2015
@@ -25,19 +25,19 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import org.apache.http.Consts;
-import org.apache.http.Header;
-import org.apache.http.TrailerSupplier;
-import org.apache.http.WritableByteChannelMock;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.impl.nio.reactor.SessionOutputBufferImpl;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.TrailerSupplier;
+import org.apache.hc.core5.http.WritableByteChannelMock;
+import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
+import org.apache.hc.core5.http.impl.nio.reactor.SessionOutputBufferImpl;
+import org.apache.hc.core5.http.message.BasicHeader;
+import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Matchers;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestHttpMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestHttpMessageParser.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestHttpMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestHttpMessageParser.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -34,17 +34,17 @@ import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.charset.Charset;
 
-import org.apache.http.Consts;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpVersion;
-import org.apache.http.MessageConstraintException;
-import org.apache.http.UnsupportedHttpVersionException;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.impl.nio.reactor.SessionInputBufferImpl;
-import org.apache.http.nio.NHttpMessageParser;
-import org.apache.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.Consts;
+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.MessageConstraintException;
+import org.apache.hc.core5.http.UnsupportedHttpVersionException;
+import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.impl.nio.reactor.SessionInputBufferImpl;
+import org.apache.hc.core5.http.nio.NHttpMessageParser;
+import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestIdentityDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestIdentityDecoder.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestIdentityDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestIdentityDecoder.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,11 +34,11 @@ import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
 
-import org.apache.http.Consts;
-import org.apache.http.ReadableByteChannelMock;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.impl.nio.reactor.SessionInputBufferImpl;
-import org.apache.http.nio.reactor.SessionInputBuffer;
+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.impl.nio.reactor.SessionInputBufferImpl;
+import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestIdentityEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestIdentityEncoder.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestIdentityEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestIdentityEncoder.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,12 +33,12 @@ import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 
-import org.apache.http.Consts;
-import org.apache.http.WritableByteChannelMock;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.impl.nio.reactor.SessionOutputBufferImpl;
-import org.apache.http.nio.reactor.SessionOutputBuffer;
-import org.apache.http.util.CharArrayBuffer;
+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.impl.nio.reactor.SessionOutputBufferImpl;
+import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestLengthDelimitedDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestLengthDelimitedDecoder.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestLengthDelimitedDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestLengthDelimitedDecoder.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,12 +34,12 @@ import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
 
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.Consts;
-import org.apache.http.ReadableByteChannelMock;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.impl.nio.reactor.SessionInputBufferImpl;
-import org.apache.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.ConnectionClosedException;
+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.impl.nio.reactor.SessionInputBufferImpl;
+import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestLengthDelimitedEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestLengthDelimitedEncoder.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestLengthDelimitedEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestLengthDelimitedEncoder.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.codecs;
+package org.apache.hc.core5.http.impl.nio.codecs;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,12 +33,12 @@ import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 
-import org.apache.http.Consts;
-import org.apache.http.WritableByteChannelMock;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.impl.nio.reactor.SessionOutputBufferImpl;
-import org.apache.http.nio.reactor.SessionOutputBuffer;
-import org.apache.http.util.CharArrayBuffer;
+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.impl.nio.reactor.SessionOutputBufferImpl;
+import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/pool/TestBasicNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/pool/TestBasicNIOConnPool.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/pool/TestBasicNIOConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/pool/TestBasicNIOConnPool.java Sat Nov 21 16:52:56 2015
@@ -24,16 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.nio.pool;
+package org.apache.hc.core5.http.impl.nio.pool;
 
-import org.apache.http.HttpHost;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.nio.pool.NIOConnFactory;
-import org.apache.http.nio.reactor.ConnectingIOReactor;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.SessionRequest;
-import org.apache.http.nio.reactor.SessionRequestCallback;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.nio.NHttpClientConnection;
+import org.apache.hc.core5.http.nio.pool.NIOConnFactory;
+import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
+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.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/ExceptionEventTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/ExceptionEventTest.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/ExceptionEventTest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/ExceptionEventTest.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.util.Date;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/TestDefaultListeningIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/TestDefaultListeningIOReactor.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/TestDefaultListeningIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/TestDefaultListeningIOReactor.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.io.IOException;
 import java.net.BindException;
@@ -34,22 +34,22 @@ import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.http.HttpResponseInterceptor;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.impl.nio.DefaultHttpServerIODispatch;
-import org.apache.http.nio.protocol.HttpAsyncService;
-import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
-import org.apache.http.nio.reactor.IOEventDispatch;
-import org.apache.http.nio.reactor.IOReactorExceptionHandler;
-import org.apache.http.nio.reactor.IOReactorStatus;
-import org.apache.http.nio.reactor.ListenerEndpoint;
-import org.apache.http.nio.reactor.ListeningIOReactor;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.protocol.ImmutableHttpProcessor;
-import org.apache.http.protocol.ResponseConnControl;
-import org.apache.http.protocol.ResponseContent;
-import org.apache.http.protocol.ResponseDate;
-import org.apache.http.protocol.ResponseServer;
+import org.apache.hc.core5.http.HttpResponseInterceptor;
+import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.impl.nio.DefaultHttpServerIODispatch;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncService;
+import org.apache.hc.core5.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
+import org.apache.hc.core5.http.nio.reactor.IOEventDispatch;
+import org.apache.hc.core5.http.nio.reactor.IOReactorExceptionHandler;
+import org.apache.hc.core5.http.nio.reactor.IOReactorStatus;
+import org.apache.hc.core5.http.nio.reactor.ListenerEndpoint;
+import org.apache.hc.core5.http.nio.reactor.ListeningIOReactor;
+import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
+import org.apache.hc.core5.http.protocol.ResponseConnControl;
+import org.apache.hc.core5.http.protocol.ResponseContent;
+import org.apache.hc.core5.http.protocol.ResponseDate;
+import org.apache.hc.core5.http.protocol.ResponseServer;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/TestSessionInOutBuffers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/TestSessionInOutBuffers.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/TestSessionInOutBuffers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/TestSessionInOutBuffers.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.nio.reactor;
+package org.apache.hc.core5.http.impl.nio.reactor;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -42,15 +42,15 @@ import java.nio.charset.CodingErrorActio
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.http.Consts;
-import org.apache.http.MessageConstraintException;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.nio.reactor.SessionInputBuffer;
-import org.apache.http.nio.reactor.SessionOutputBuffer;
-import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.nio.util.DirectByteBufferAllocator;
-import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.MessageConstraintException;
+import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
+import org.apache.hc.core5.http.nio.util.DirectByteBufferAllocator;
+import org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/RndTestPatternGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/RndTestPatternGenerator.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/RndTestPatternGenerator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/RndTestPatternGenerator.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.integration;
+package org.apache.hc.core5.http.nio.integration;
 
 import java.util.Random;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/SimpleRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/SimpleRequestHandler.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/SimpleRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/SimpleRequestHandler.java Sat Nov 21 16:52:56 2015
@@ -25,19 +25,19 @@
  *
  */
 
-package org.apache.http.nio.integration;
+package org.apache.hc.core5.http.nio.integration;
 
 import java.io.IOException;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.entity.ContentType;
-import org.apache.http.nio.entity.NStringEntity;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.util.EntityUtils;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.entity.ContentType;
+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-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestClientOutOfSequenceResponse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestClientOutOfSequenceResponse.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestClientOutOfSequenceResponse.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestClientOutOfSequenceResponse.java Sat Nov 21 16:52:56 2015
@@ -25,23 +25,23 @@
  *
  */
 
-package org.apache.http.nio.integration;
+package org.apache.hc.core5.http.nio.integration;
 
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import org.apache.http.Consts;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpVersion;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.impl.nio.pool.BasicNIOConnFactory;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.nio.testserver.HttpClientNio;
+import org.apache.hc.core5.http.Consts;
+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.HttpVersion;
+import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.impl.nio.pool.BasicNIOConnFactory;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.nio.testserver.HttpClientNio;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.integration;
+package org.apache.hc.core5.http.nio.integration;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -38,25 +38,25 @@ import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSession;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.impl.nio.pool.BasicNIOConnFactory;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.nio.NHttpConnection;
-import org.apache.http.nio.protocol.BasicAsyncRequestHandler;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.ListenerEndpoint;
-import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
-import org.apache.http.nio.testserver.ClientConnectionFactory;
-import org.apache.http.nio.testserver.HttpClientNio;
-import org.apache.http.nio.testserver.HttpServerNio;
-import org.apache.http.nio.testserver.ServerConnectionFactory;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpCoreContext;
-import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.ssl.SSLContextBuilder;
+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.impl.nio.pool.BasicNIOConnFactory;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.nio.NHttpConnection;
+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;
+import org.apache.hc.core5.http.nio.testserver.ServerConnectionFactory;
+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.junit.After;
 import org.junit.Assert;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlerCancellable.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlerCancellable.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlerCancellable.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlerCancellable.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.integration;
+package org.apache.hc.core5.http.nio.integration;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -36,24 +36,24 @@ import java.net.Socket;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpVersion;
-import org.apache.http.concurrent.Cancellable;
-import org.apache.http.entity.BasicHttpEntity;
-import org.apache.http.entity.ContentType;
-import org.apache.http.message.BasicHttpResponse;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.nio.protocol.BasicAsyncRequestConsumer;
-import org.apache.http.nio.protocol.HttpAsyncExchange;
-import org.apache.http.nio.protocol.HttpAsyncRequestConsumer;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
-import org.apache.http.nio.protocol.HttpAsyncResponseProducer;
-import org.apache.http.nio.reactor.ListenerEndpoint;
-import org.apache.http.nio.testserver.HttpCoreNIOTestBase;
-import org.apache.http.protocol.HttpContext;
+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;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestConsumer;
+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.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.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlers.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlers.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.integration;
+package org.apache.hc.core5.http.nio.integration;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -36,42 +36,42 @@ import java.util.concurrent.ConcurrentLi
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.http.Consts;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.HttpVersion;
-import org.apache.http.ProtocolVersion;
-import org.apache.http.entity.ContentType;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.message.BasicHttpResponse;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.nio.entity.NStringEntity;
-import org.apache.http.nio.protocol.BasicAsyncRequestConsumer;
-import org.apache.http.nio.protocol.BasicAsyncRequestHandler;
-import org.apache.http.nio.protocol.BasicAsyncResponseProducer;
-import org.apache.http.nio.protocol.HttpAsyncExchange;
-import org.apache.http.nio.protocol.HttpAsyncExpectationVerifier;
-import org.apache.http.nio.protocol.HttpAsyncRequestConsumer;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
-import org.apache.http.nio.reactor.ListenerEndpoint;
-import org.apache.http.nio.testserver.HttpCoreNIOTestBase;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.protocol.ImmutableHttpProcessor;
-import org.apache.http.protocol.RequestConnControl;
-import org.apache.http.protocol.RequestContent;
-import org.apache.http.protocol.RequestExpectContinue;
-import org.apache.http.protocol.RequestTargetHost;
-import org.apache.http.protocol.RequestUserAgent;
-import org.apache.http.util.EntityUtils;
+import org.apache.hc.core5.http.Consts;
+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.HttpHost;
+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.HttpStatus;
+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.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.entity.NStringEntity;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestConsumer;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestHandler;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseProducer;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncExchange;
+import org.apache.hc.core5.http.nio.protocol.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;
+import org.apache.hc.core5.http.protocol.HttpRequestHandler;
+import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
+import org.apache.hc.core5.http.protocol.RequestConnControl;
+import org.apache.hc.core5.http.protocol.RequestContent;
+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-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersBrokenExpectContinue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersBrokenExpectContinue.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersBrokenExpectContinue.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersBrokenExpectContinue.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.integration;
+package org.apache.hc.core5.http.nio.integration;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -33,20 +33,20 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.concurrent.Future;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.nio.entity.NStringEntity;
-import org.apache.http.nio.protocol.BasicAsyncRequestHandler;
-import org.apache.http.nio.protocol.HttpAsyncExchange;
-import org.apache.http.nio.protocol.HttpAsyncExpectationVerifier;
-import org.apache.http.nio.reactor.ListenerEndpoint;
-import org.apache.http.nio.testserver.HttpCoreNIOTestBase;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.nio.entity.NStringEntity;
+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.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersPipelining.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersPipelining.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersPipelining.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersPipelining.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.integration;
+package org.apache.hc.core5.http.nio.integration;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -38,40 +38,40 @@ import java.util.concurrent.ConcurrentLi
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.HttpVersion;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.message.BasicHttpResponse;
-import org.apache.http.nio.entity.NStringEntity;
-import org.apache.http.nio.protocol.BasicAsyncRequestConsumer;
-import org.apache.http.nio.protocol.BasicAsyncRequestHandler;
-import org.apache.http.nio.protocol.BasicAsyncRequestProducer;
-import org.apache.http.nio.protocol.BasicAsyncResponseConsumer;
-import org.apache.http.nio.protocol.BasicAsyncResponseProducer;
-import org.apache.http.nio.protocol.HttpAsyncExchange;
-import org.apache.http.nio.protocol.HttpAsyncRequestConsumer;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
-import org.apache.http.nio.protocol.HttpAsyncRequestProducer;
-import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
-import org.apache.http.nio.reactor.ListenerEndpoint;
-import org.apache.http.nio.testserver.HttpCoreNIOTestBase;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.protocol.ImmutableHttpProcessor;
-import org.apache.http.protocol.RequestConnControl;
-import org.apache.http.protocol.RequestContent;
-import org.apache.http.protocol.RequestTargetHost;
-import org.apache.http.protocol.RequestUserAgent;
-import org.apache.http.util.EntityUtils;
+import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHeaders;
+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.HttpStatus;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.StringEntity;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.nio.entity.NStringEntity;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestConsumer;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestHandler;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestProducer;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseConsumer;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseProducer;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncExchange;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestConsumer;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandler;
+import org.apache.hc.core5.http.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;
+import org.apache.hc.core5.http.protocol.HttpRequestHandler;
+import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
+import org.apache.hc.core5.http.protocol.RequestConnControl;
+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-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncPrematureTermination.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncPrematureTermination.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncPrematureTermination.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncPrematureTermination.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.integration;
+package org.apache.hc.core5.http.nio.integration;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -33,29 +33,29 @@ import java.net.InetSocketAddress;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.http.Consts;
-import org.apache.http.HttpConnection;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.InputStreamEntity;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.nio.entity.NStringEntity;
-import org.apache.http.nio.protocol.BasicAsyncRequestConsumer;
-import org.apache.http.nio.protocol.BasicAsyncResponseProducer;
-import org.apache.http.nio.protocol.HttpAsyncExchange;
-import org.apache.http.nio.protocol.HttpAsyncRequestConsumer;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
-import org.apache.http.nio.reactor.ListenerEndpoint;
-import org.apache.http.nio.testserver.HttpCoreNIOTestBase;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpCoreContext;
+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;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.entity.NStringEntity;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestConsumer;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseProducer;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncExchange;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestConsumer;
+import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandler;
+import org.apache.hc.core5.http.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.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncTimeout.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncTimeout.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncTimeout.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncTimeout.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.integration;
+package org.apache.hc.core5.http.nio.integration;
 
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
@@ -35,16 +35,16 @@ import java.util.Collection;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.nio.protocol.BasicAsyncRequestProducer;
-import org.apache.http.nio.protocol.BasicAsyncResponseConsumer;
-import org.apache.http.nio.testserver.HttpCoreNIOTestBase;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
+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;
+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.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestServerSidePipelining.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestServerSidePipelining.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestServerSidePipelining.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestServerSidePipelining.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.integration;
+package org.apache.hc.core5.http.nio.integration;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -37,25 +37,25 @@ import java.io.OutputStreamWriter;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.entity.ContentType;
-import org.apache.http.nio.entity.NByteArrayEntity;
-import org.apache.http.nio.entity.NStringEntity;
-import org.apache.http.nio.protocol.BasicAsyncRequestHandler;
-import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
-import org.apache.http.nio.reactor.ListenerEndpoint;
-import org.apache.http.nio.testserver.HttpCoreNIOTestBase;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.protocol.ImmutableHttpProcessor;
-import org.apache.http.protocol.ResponseConnControl;
-import org.apache.http.protocol.ResponseContent;
-import org.apache.http.protocol.ResponseServer;
-import org.apache.http.util.EntityUtils;
+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.HttpResponse;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.nio.entity.NByteArrayEntity;
+import org.apache.hc.core5.http.nio.entity.NStringEntity;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestHandler;
+import org.apache.hc.core5.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
+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.HttpRequestHandler;
+import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
+import org.apache.hc.core5.http.protocol.ResponseConnControl;
+import org.apache.hc.core5.http.protocol.ResponseContent;
+import org.apache.hc.core5.http.protocol.ResponseServer;
+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-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.integration;
+package org.apache.hc.core5.http.nio.integration;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -34,39 +34,39 @@ import java.nio.channels.WritableByteCha
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import org.apache.http.Consts;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.MalformedChunkCodingException;
-import org.apache.http.TrailerSupplier;
-import org.apache.http.TruncatedChunkException;
-import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.InputStreamEntity;
-import org.apache.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.http.impl.nio.DefaultNHttpServerConnection;
-import org.apache.http.impl.nio.codecs.AbstractContentEncoder;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.nio.entity.ContentInputStream;
-import org.apache.http.nio.protocol.AbstractAsyncResponseConsumer;
-import org.apache.http.nio.protocol.BasicAsyncRequestHandler;
-import org.apache.http.nio.protocol.BasicAsyncRequestProducer;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.ListenerEndpoint;
-import org.apache.http.nio.reactor.SessionOutputBuffer;
-import org.apache.http.nio.testserver.HttpCoreNIOTestBase;
-import org.apache.http.nio.testserver.LoggingNHttpServerConnection;
-import org.apache.http.nio.testserver.ServerConnectionFactory;
-import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.nio.util.SimpleInputBuffer;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.util.CharArrayBuffer;
-import org.apache.http.util.EntityUtils;
+import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.MalformedChunkCodingException;
+import org.apache.hc.core5.http.TrailerSupplier;
+import org.apache.hc.core5.http.TruncatedChunkException;
+import org.apache.hc.core5.http.entity.ContentLengthStrategy;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.InputStreamEntity;
+import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
+import org.apache.hc.core5.http.impl.nio.DefaultNHttpServerConnection;
+import org.apache.hc.core5.http.impl.nio.codecs.AbstractContentEncoder;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.entity.ContentInputStream;
+import org.apache.hc.core5.http.nio.protocol.AbstractAsyncResponseConsumer;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestHandler;
+import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestProducer;
+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.SessionOutputBuffer;
+import org.apache.hc.core5.http.nio.testserver.HttpCoreNIOTestBase;
+import org.apache.hc.core5.http.nio.testserver.LoggingNHttpServerConnection;
+import org.apache.hc.core5.http.nio.testserver.ServerConnectionFactory;
+import org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator;
+import org.apache.hc.core5.http.nio.util.SimpleInputBuffer;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
+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-nio/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.pool;
+package org.apache.hc.core5.http.nio.pool;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -36,14 +36,14 @@ import java.util.concurrent.ExecutionExc
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.http.concurrent.BasicFuture;
-import org.apache.http.nio.reactor.ConnectingIOReactor;
-import org.apache.http.nio.reactor.IOReactorStatus;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.SessionRequest;
-import org.apache.http.nio.reactor.SessionRequestCallback;
-import org.apache.http.pool.PoolEntry;
-import org.apache.http.pool.PoolStats;
+import org.apache.hc.core5.http.concurrent.BasicFuture;
+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.PoolEntry;
+import org.apache.hc.core5.http.pool.PoolStats;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Matchers;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/pool/TestRouteSpecificPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/pool/TestRouteSpecificPool.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/pool/TestRouteSpecificPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/pool/TestRouteSpecificPool.java Sat Nov 21 16:52:56 2015
@@ -24,16 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.pool;
+package org.apache.hc.core5.http.nio.pool;
 
 import java.io.IOException;
 import java.net.ConnectException;
 import java.util.concurrent.ExecutionException;
 
-import org.apache.http.concurrent.BasicFuture;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.SessionRequest;
-import org.apache.http.pool.PoolEntry;
+import org.apache.hc.core5.http.concurrent.BasicFuture;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.nio.reactor.SessionRequest;
+import org.apache.hc.core5.http.pool.PoolEntry;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncClientExchangeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncClientExchangeHandler.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncClientExchangeHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncClientExchangeHandler.java Sat Nov 21 16:52:56 2015
@@ -25,22 +25,22 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.util.concurrent.ExecutionException;
 
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpVersion;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.message.BasicHttpResponse;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpCoreContext;
-import org.apache.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.NHttpClientConnection;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.protocol.HttpProcessor;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestConsumer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestConsumer.java Sat Nov 21 16:52:56 2015
@@ -25,17 +25,17 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.apache.http.HttpRequest;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.entity.StringEntity;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestHandler.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestHandler.java Sat Nov 21 16:52:56 2015
@@ -25,15 +25,15 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpVersion;
-import org.apache.http.message.BasicRequestLine;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpRequestHandler;
+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.message.BasicRequestLine;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpRequestHandler;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestProducer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestProducer.java Sat Nov 21 16:52:56 2015
@@ -25,16 +25,16 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.entity.HttpAsyncContentProducer;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.entity.HttpAsyncContentProducer;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseConsumer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseConsumer.java Sat Nov 21 16:52:56 2015
@@ -25,17 +25,17 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.entity.StringEntity;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseProducer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseProducer.java Sat Nov 21 16:52:56 2015
@@ -25,16 +25,16 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.entity.HttpAsyncContentProducer;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.entity.HttpAsyncContentProducer;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestErrorResponseProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestErrorResponseProducer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestErrorResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestErrorResponseProducer.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpVersion;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.entity.StringEntity;
+import org.apache.hc.core5.http.message.BasicHttpResponse;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;




Mime
View raw message