You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2015/11/23 12:06:32 UTC
svn commit: r1715762 [3/3] - in /httpcomponents/httpcore/trunk: ./
httpcore-nio/ httpcore-osgi/
httpcore/src/examples/org/apache/hc/core5/http/examples/
httpcore/src/main/java/org/apache/hc/core5/http/nio/
httpcore/src/main/java/org/apache/hc/core5/htt...
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestNHttpConnectionBase.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/TestNHttpConnectionBase.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestNHttpConnectionBase.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestNHttpConnectionBase.java Mon Nov 23 11:06:29 2015
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.impl.nio;
+package org.apache.hc.core5.http.nio;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@@ -36,7 +36,6 @@ import org.apache.hc.core5.http.HttpHead
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.entity.ContentLengthStrategy;
import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.hc.core5.http.nio.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;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/CodecTestUtils.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/codecs/CodecTestUtils.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/CodecTestUtils.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/CodecTestUtils.java&r1=1715545&r2=1715762&rev=1715762&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/src/test/java/org/apache/hc/core5/http/nio/codecs/CodecTestUtils.java Mon Nov 23 11:06:29 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.impl.nio.codecs;
+package org.apache.hc.core5.http.nio.codecs;
import java.io.File;
import java.io.FileInputStream;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkDecoder.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkDecoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkDecoder.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestChunkDecoder.java&r1=1715545&r2=1715762&rev=1715762&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/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkDecoder.java Mon Nov 23 11:06:29 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.impl.nio.codecs;
+package org.apache.hc.core5.http.nio.codecs;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -40,8 +40,8 @@ import org.apache.hc.core5.http.Readable
import org.apache.hc.core5.http.TruncatedChunkException;
import org.apache.hc.core5.http.config.MessageConstraints;
import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.hc.core5.http.impl.nio.reactor.SessionInputBufferImpl;
import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.reactor.SessionInputBufferImpl;
import org.junit.Assert;
import org.junit.Test;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkEncoder.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkEncoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkEncoder.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestChunkEncoder.java&r1=1715545&r2=1715762&rev=1715762&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/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkEncoder.java Mon Nov 23 11:06:29 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.impl.nio.codecs;
+package org.apache.hc.core5.http.nio.codecs;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -35,9 +35,9 @@ 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.apache.hc.core5.http.nio.reactor.SessionOutputBufferImpl;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Matchers;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestHttpMessageParser.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/codecs/TestHttpMessageParser.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestHttpMessageParser.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestHttpMessageParser.java&r1=1715545&r2=1715762&rev=1715762&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/src/test/java/org/apache/hc/core5/http/nio/codecs/TestHttpMessageParser.java Mon Nov 23 11:06:29 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.impl.nio.codecs;
+package org.apache.hc.core5.http.nio.codecs;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -42,9 +42,9 @@ import org.apache.hc.core5.http.HttpVers
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.apache.hc.core5.http.nio.reactor.SessionInputBufferImpl;
import org.junit.Assert;
import org.junit.Test;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityDecoder.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityDecoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityDecoder.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestIdentityDecoder.java&r1=1715545&r2=1715762&rev=1715762&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/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityDecoder.java Mon Nov 23 11:06:29 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.impl.nio.codecs;
+package org.apache.hc.core5.http.nio.codecs;
import java.io.File;
import java.io.IOException;
@@ -37,8 +37,8 @@ import java.nio.channels.ReadableByteCha
import org.apache.hc.core5.http.Consts;
import org.apache.hc.core5.http.ReadableByteChannelMock;
import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.hc.core5.http.impl.nio.reactor.SessionInputBufferImpl;
import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.reactor.SessionInputBufferImpl;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityEncoder.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityEncoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityEncoder.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestIdentityEncoder.java&r1=1715545&r2=1715762&rev=1715762&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/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityEncoder.java Mon Nov 23 11:06:29 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.impl.nio.codecs;
+package org.apache.hc.core5.http.nio.codecs;
import java.io.File;
import java.io.IOException;
@@ -36,8 +36,8 @@ import java.nio.channels.FileChannel;
import org.apache.hc.core5.http.Consts;
import org.apache.hc.core5.http.WritableByteChannelMock;
import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.hc.core5.http.impl.nio.reactor.SessionOutputBufferImpl;
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.junit.After;
import org.junit.Assert;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedDecoder.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedDecoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedDecoder.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestLengthDelimitedDecoder.java&r1=1715545&r2=1715762&rev=1715762&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/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedDecoder.java Mon Nov 23 11:06:29 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.impl.nio.codecs;
+package org.apache.hc.core5.http.nio.codecs;
import java.io.File;
import java.io.IOException;
@@ -38,8 +38,8 @@ import org.apache.hc.core5.http.Connecti
import org.apache.hc.core5.http.Consts;
import org.apache.hc.core5.http.ReadableByteChannelMock;
import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.hc.core5.http.impl.nio.reactor.SessionInputBufferImpl;
import org.apache.hc.core5.http.nio.reactor.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.reactor.SessionInputBufferImpl;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedEncoder.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedEncoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedEncoder.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/codecs/TestLengthDelimitedEncoder.java&r1=1715545&r2=1715762&rev=1715762&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/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedEncoder.java Mon Nov 23 11:06:29 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.impl.nio.codecs;
+package org.apache.hc.core5.http.nio.codecs;
import java.io.File;
import java.io.IOException;
@@ -36,8 +36,8 @@ import java.nio.channels.FileChannel;
import org.apache.hc.core5.http.Consts;
import org.apache.hc.core5.http.WritableByteChannelMock;
import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.hc.core5.http.impl.nio.reactor.SessionOutputBufferImpl;
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.junit.After;
import org.junit.Assert;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestClientOutOfSequenceResponse.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/integration/TestClientOutOfSequenceResponse.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestClientOutOfSequenceResponse.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestClientOutOfSequenceResponse.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestClientOutOfSequenceResponse.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestClientOutOfSequenceResponse.java Mon Nov 23 11:06:29 2015
@@ -39,8 +39,8 @@ import org.apache.hc.core5.http.HttpRequ
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.pool.BasicNIOConnFactory;
import org.apache.hc.core5.http.nio.testserver.HttpClientNio;
import org.junit.After;
import org.junit.Assert;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/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 11:06:29 2015
@@ -42,9 +42,9 @@ import org.apache.hc.core5.http.HttpExce
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.pool.BasicNIOConnFactory;
import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestHandler;
import org.apache.hc.core5.http.nio.reactor.IOSession;
import org.apache.hc.core5.http.nio.reactor.ListenerEndpoint;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java Mon Nov 23 11:06:29 2015
@@ -46,12 +46,12 @@ import org.apache.hc.core5.http.entity.C
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.DefaultNHttpServerConnection;
import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.codecs.AbstractContentEncoder;
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;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestBasicNIOConnPool.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/pool/TestBasicNIOConnPool.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestBasicNIOConnPool.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/pool/TestBasicNIOConnPool.java&r1=1715545&r2=1715762&rev=1715762&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/src/test/java/org/apache/hc/core5/http/nio/pool/TestBasicNIOConnPool.java Mon Nov 23 11:06:29 2015
@@ -24,12 +24,15 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.impl.nio.pool;
+package org.apache.hc.core5.http.nio.pool;
+
+import java.net.SocketAddress;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
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;
@@ -43,10 +46,6 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import java.net.SocketAddress;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
public class TestBasicNIOConnPool {
static class LocalPool extends BasicNIOConnPool {
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java Mon Nov 23 11:06:29 2015
@@ -27,9 +27,9 @@
package org.apache.hc.core5.http.nio.pool;
import java.io.IOException;
+import java.net.ConnectException;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import java.net.ConnectException;
import java.net.UnknownHostException;
import java.util.Collections;
import java.util.concurrent.ExecutionException;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java (from r1715545, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java Mon Nov 23 11:06:29 2015
@@ -33,8 +33,8 @@ import java.util.concurrent.Future;
import org.apache.hc.core5.http.ConnectionClosedException;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.concurrent.FutureCallback;
-import org.apache.hc.core5.http.impl.nio.pool.BasicNIOPoolEntry;
import org.apache.hc.core5.http.nio.NHttpClientConnection;
+import org.apache.hc.core5.http.nio.pool.BasicNIOPoolEntry;
import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequester.ConnRequestCallback;
import org.apache.hc.core5.http.pool.ConnPool;
import org.apache.hc.core5.http.pool.PoolEntry;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/ExceptionEventTest.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/reactor/ExceptionEventTest.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/ExceptionEventTest.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/ExceptionEventTest.java&r1=1715545&r2=1715762&rev=1715762&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/src/test/java/org/apache/hc/core5/http/nio/reactor/ExceptionEventTest.java Mon Nov 23 11:06:29 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.impl.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
import java.util.Date;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/TestDefaultListeningIOReactor.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/reactor/TestDefaultListeningIOReactor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/TestDefaultListeningIOReactor.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/TestDefaultListeningIOReactor.java&r1=1715545&r2=1715762&rev=1715762&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/src/test/java/org/apache/hc/core5/http/nio/reactor/TestDefaultListeningIOReactor.java Mon Nov 23 11:06:29 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.impl.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
import java.io.IOException;
import java.net.BindException;
@@ -36,14 +36,9 @@ import java.util.concurrent.TimeUnit;
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.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;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/TestSessionInOutBuffers.java (from r1715545, 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/src/test/java/org/apache/hc/core5/http/nio/reactor/TestSessionInOutBuffers.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/reactor/TestSessionInOutBuffers.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/impl/nio/reactor/TestSessionInOutBuffers.java&r1=1715545&r2=1715762&rev=1715762&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/src/test/java/org/apache/hc/core5/http/nio/reactor/TestSessionInOutBuffers.java Mon Nov 23 11:06:29 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.impl.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -45,8 +45,6 @@ import java.util.Collection;
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;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ClientConnectionFactory.java (from r1715545, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/ClientConnectionFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ClientConnectionFactory.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ClientConnectionFactory.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/ClientConnectionFactory.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/ClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ClientConnectionFactory.java Mon Nov 23 11:06:29 2015
@@ -28,7 +28,7 @@ package org.apache.hc.core5.http.nio.tes
import javax.net.ssl.SSLContext;
-import org.apache.hc.core5.http.impl.nio.DefaultNHttpClientConnection;
+import org.apache.hc.core5.http.nio.DefaultNHttpClientConnection;
import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
import org.apache.hc.core5.http.nio.reactor.IOSession;
import org.apache.hc.core5.http.nio.reactor.ssl.SSLIOSession;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpClientNio.java (from r1715545, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpClientNio.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpClientNio.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpClientNio.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpClientNio.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpClientNio.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpClientNio.java Mon Nov 23 11:06:29 2015
@@ -41,15 +41,13 @@ import org.apache.hc.core5.http.HttpResp
import org.apache.hc.core5.http.OoopsieRuntimeException;
import org.apache.hc.core5.http.concurrent.FutureCallback;
import org.apache.hc.core5.http.config.ConnectionConfig;
-import org.apache.hc.core5.http.impl.nio.DefaultHttpClientIODispatch;
-import org.apache.hc.core5.http.impl.nio.DefaultNHttpClientConnection;
-import org.apache.hc.core5.http.impl.nio.DefaultNHttpClientConnectionFactory;
-import org.apache.hc.core5.http.impl.nio.pool.BasicNIOConnPool;
-import org.apache.hc.core5.http.impl.nio.pool.BasicNIOPoolEntry;
-import org.apache.hc.core5.http.impl.nio.reactor.DefaultConnectingIOReactor;
-import org.apache.hc.core5.http.impl.nio.reactor.ExceptionEvent;
+import org.apache.hc.core5.http.nio.DefaultHttpClientIODispatch;
+import org.apache.hc.core5.http.nio.DefaultNHttpClientConnection;
+import org.apache.hc.core5.http.nio.DefaultNHttpClientConnectionFactory;
import org.apache.hc.core5.http.nio.NHttpClientConnection;
import org.apache.hc.core5.http.nio.NHttpClientEventHandler;
+import org.apache.hc.core5.http.nio.pool.BasicNIOConnPool;
+import org.apache.hc.core5.http.nio.pool.BasicNIOPoolEntry;
import org.apache.hc.core5.http.nio.pool.NIOConnFactory;
import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestProducer;
import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseConsumer;
@@ -58,6 +56,8 @@ import org.apache.hc.core5.http.nio.prot
import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequester;
import org.apache.hc.core5.http.nio.protocol.HttpAsyncResponseConsumer;
import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.http.nio.reactor.DefaultConnectingIOReactor;
+import org.apache.hc.core5.http.nio.reactor.ExceptionEvent;
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;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpCoreNIOTestBase.java (from r1715545, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpCoreNIOTestBase.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpCoreNIOTestBase.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpCoreNIOTestBase.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpCoreNIOTestBase.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpCoreNIOTestBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpCoreNIOTestBase.java Mon Nov 23 11:06:29 2015
@@ -31,7 +31,7 @@ import java.net.URL;
import javax.net.ssl.SSLContext;
-import org.apache.hc.core5.http.impl.nio.pool.BasicNIOConnFactory;
+import org.apache.hc.core5.http.nio.pool.BasicNIOConnFactory;
import org.apache.hc.core5.http.ssl.SSLContextBuilder;
import org.junit.After;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpServerNio.java (from r1715545, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpServerNio.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpServerNio.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpServerNio.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpServerNio.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpServerNio.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpServerNio.java Mon Nov 23 11:06:29 2015
@@ -35,14 +35,14 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hc.core5.http.ConnectionClosedException;
import org.apache.hc.core5.http.ExceptionLogger;
-import org.apache.hc.core5.http.impl.nio.DefaultNHttpServerConnection;
-import org.apache.hc.core5.http.impl.nio.bootstrap.HttpServer;
-import org.apache.hc.core5.http.impl.nio.bootstrap.ServerBootstrap;
-import org.apache.hc.core5.http.impl.nio.reactor.IOReactorConfig;
+import org.apache.hc.core5.http.nio.DefaultNHttpServerConnection;
import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
+import org.apache.hc.core5.http.nio.bootstrap.HttpServer;
+import org.apache.hc.core5.http.nio.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.nio.protocol.HttpAsyncExpectationVerifier;
import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandler;
import org.apache.hc.core5.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
+import org.apache.hc.core5.http.nio.reactor.IOReactorConfig;
import org.apache.hc.core5.http.nio.reactor.ListenerEndpoint;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.http.util.Asserts;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpClientConnection.java (from r1715545, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpClientConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpClientConnection.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpClientConnection.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpClientConnection.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpClientConnection.java Mon Nov 23 11:06:29 2015
@@ -36,7 +36,7 @@ import org.apache.hc.core5.http.Header;
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.impl.nio.DefaultNHttpClientConnection;
+import org.apache.hc.core5.http.nio.DefaultNHttpClientConnection;
import org.apache.hc.core5.http.nio.NHttpClientEventHandler;
import org.apache.hc.core5.http.nio.reactor.IOSession;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpServerConnection.java (from r1715545, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpServerConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpServerConnection.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpServerConnection.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpServerConnection.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpServerConnection.java Mon Nov 23 11:06:29 2015
@@ -36,7 +36,7 @@ import org.apache.hc.core5.http.Header;
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.impl.nio.DefaultNHttpServerConnection;
+import org.apache.hc.core5.http.nio.DefaultNHttpServerConnection;
import org.apache.hc.core5.http.nio.NHttpServerEventHandler;
import org.apache.hc.core5.http.nio.reactor.IOSession;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ServerConnectionFactory.java (from r1715545, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/ServerConnectionFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ServerConnectionFactory.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ServerConnectionFactory.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/ServerConnectionFactory.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/testserver/ServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ServerConnectionFactory.java Mon Nov 23 11:06:29 2015
@@ -28,7 +28,7 @@ package org.apache.hc.core5.http.nio.tes
import javax.net.ssl.SSLContext;
-import org.apache.hc.core5.http.impl.nio.DefaultNHttpServerConnection;
+import org.apache.hc.core5.http.nio.DefaultNHttpServerConnection;
import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
import org.apache.hc.core5.http.nio.reactor.IOSession;
import org.apache.hc.core5.http.nio.reactor.ssl.SSLIOSession;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java (from r1715545, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java Mon Nov 23 11:06:29 2015
@@ -32,7 +32,7 @@ import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;
import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.hc.core5.http.impl.nio.codecs.AbstractContentEncoder;
+import org.apache.hc.core5.http.nio.codecs.AbstractContentEncoder;
import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
import org.apache.hc.core5.http.util.Asserts;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java (from r1715545, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java&r1=1715545&r2=1715762&rev=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java Mon Nov 23 11:06:29 2015
@@ -37,10 +37,10 @@ import java.nio.channels.WritableByteCha
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.SessionOutputBufferImpl;
import org.apache.hc.core5.http.nio.ContentDecoder;
import org.apache.hc.core5.http.nio.ContentEncoder;
import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
+import org.apache.hc.core5.http.nio.reactor.SessionOutputBufferImpl;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpcore/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/pom.xml?rev=1715762&r1=1715761&r2=1715762&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/pom.xml (original)
+++ httpcomponents/httpcore/trunk/pom.xml Mon Nov 23 11:06:29 2015
@@ -65,7 +65,6 @@
<modules>
<module>httpcore</module>
- <module>httpcore-nio</module>
<module>httpcore-osgi</module>
<module>httpcore-ab</module>
</modules>