hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1716435 [5/5] - in /httpcomponents/httpcore/trunk: httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/ httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/ httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/ httpc...
Date Wed, 25 Nov 2015 15:17:56 GMT
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlers.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlers.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlers.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlers.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlers.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlers.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.integration;
+package org.apache.hc.core5.http.integration;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -49,28 +49,28 @@ import org.apache.hc.core5.http.HttpVers
 import org.apache.hc.core5.http.ProtocolVersion;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.EntityUtils;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestConsumer;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestHandler;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseProducer;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
 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.HttpAsyncExchange;
+import org.apache.hc.core5.http.nio.HttpAsyncExpectationVerifier;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestHandler;
 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.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.testserver.nio.HttpCoreNIOTestBase;
 import org.apache.hc.core5.reactor.ListenerEndpoint;
 import org.junit.After;
 import org.junit.Assert;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersBrokenExpectContinue.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersBrokenExpectContinue.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersBrokenExpectContinue.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersBrokenExpectContinue.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersBrokenExpectContinue.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersBrokenExpectContinue.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersBrokenExpectContinue.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.integration;
+package org.apache.hc.core5.http.integration;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -38,14 +38,14 @@ import org.apache.hc.core5.http.HttpExce
 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.impl.nio.BasicAsyncRequestHandler;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.nio.HttpAsyncExchange;
+import org.apache.hc.core5.http.nio.HttpAsyncExpectationVerifier;
 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.testserver.HttpCoreNIOTestBase;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.testserver.nio.HttpCoreNIOTestBase;
 import org.apache.hc.core5.reactor.ListenerEndpoint;
 import org.junit.After;
 import org.junit.Assert;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersPipelining.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersPipelining.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersPipelining.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersPipelining.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersPipelining.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlersPipelining.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersPipelining.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.integration;
+package org.apache.hc.core5.http.integration;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -49,28 +49,28 @@ import org.apache.hc.core5.http.HttpVers
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.StringEntity;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestConsumer;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestHandler;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestProducer;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseConsumer;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseProducer;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.nio.HttpAsyncExchange;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestHandler;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestProducer;
+import org.apache.hc.core5.http.nio.HttpAsyncResponseConsumer;
 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.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.testserver.nio.HttpCoreNIOTestBase;
 import org.apache.hc.core5.reactor.ListenerEndpoint;
 import org.junit.After;
 import org.junit.Assert;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncPrematureTermination.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncPrematureTermination.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncPrematureTermination.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncPrematureTermination.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncPrematureTermination.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncPrematureTermination.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncPrematureTermination.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.integration;
+package org.apache.hc.core5.http.integration;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -42,19 +42,19 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.InputStreamEntity;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestConsumer;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseProducer;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.HttpAsyncExchange;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestHandler;
 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.testserver.HttpCoreNIOTestBase;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.testserver.nio.HttpCoreNIOTestBase;
 import org.apache.hc.core5.reactor.ListenerEndpoint;
 import org.junit.After;
 import org.junit.Assert;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncTimeout.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncTimeout.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncTimeout.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncTimeout.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncTimeout.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncTimeout.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncTimeout.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.integration;
+package org.apache.hc.core5.http.integration;
 
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
@@ -39,12 +39,12 @@ import org.apache.hc.core5.concurrent.Fu
 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.BasicAsyncRequestProducer;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseConsumer;
 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.apache.hc.core5.http.testserver.nio.HttpCoreNIOTestBase;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestServerSidePipelining.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestServerSidePipelining.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestServerSidePipelining.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestServerSidePipelining.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestServerSidePipelining.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestServerSidePipelining.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestServerSidePipelining.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.integration;
+package org.apache.hc.core5.http.integration;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -44,17 +44,17 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.EntityUtils;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestHandler;
+import org.apache.hc.core5.http.impl.nio.UriHttpAsyncRequestHandlerMapper;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
 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.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.testserver.nio.HttpCoreNIOTestBase;
 import org.apache.hc.core5.reactor.ListenerEndpoint;
 import org.junit.After;
 import org.junit.Assert;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestSyncHttp.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestSyncHttp.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestSyncHttp.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestSyncHttp.java Wed Nov 25 15:17:53 2015
@@ -54,19 +54,19 @@ import org.apache.hc.core5.http.entity.B
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.StringEntity;
-import org.apache.hc.core5.http.impl.DefaultBHttpClientConnection;
+import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpExpectationVerifier;
-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.testserver.HttpClient;
-import org.apache.hc.core5.http.testserver.HttpServer;
+import org.apache.hc.core5.http.testserver.io.HttpClient;
+import org.apache.hc.core5.http.testserver.io.HttpServer;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestTruncatedChunks.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/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/integration/TestTruncatedChunks.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestTruncatedChunks.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/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/integration/TestTruncatedChunks.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.integration;
+package org.apache.hc.core5.http.integration;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -35,6 +35,7 @@ import java.util.concurrent.ExecutionExc
 import java.util.concurrent.Future;
 
 import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.ContentLengthStrategy;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;
@@ -42,31 +43,30 @@ import org.apache.hc.core5.http.HttpStat
 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.EntityUtils;
 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.AbstractAsyncResponseConsumer;
+import org.apache.hc.core5.http.impl.nio.AbstractContentEncoder;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestHandler;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestProducer;
+import org.apache.hc.core5.http.impl.nio.DefaultNHttpServerConnection;
+import org.apache.hc.core5.http.impl.nio.SimpleInputBuffer;
 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.SessionOutputBuffer;
-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;
-import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestProducer;
-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.testserver.nio.HttpCoreNIOTestBase;
+import org.apache.hc.core5.http.testserver.nio.LoggingNHttpServerConnection;
+import org.apache.hc.core5.http.testserver.nio.ServerConnectionFactory;
 import org.apache.hc.core5.reactor.IOSession;
 import org.apache.hc.core5.reactor.ListenerEndpoint;
 import org.apache.hc.core5.util.CharArrayBuffer;
+import org.apache.hc.core5.util.HeapByteBufferAllocator;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/io/TestUriHttpRequestHandlerMapper.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestUriHttpRequestHandlerMapper.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/io/TestUriHttpRequestHandlerMapper.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/io/TestUriHttpRequestHandlerMapper.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestUriHttpRequestHandlerMapper.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestUriHttpRequestHandlerMapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/io/TestUriHttpRequestHandlerMapper.java Wed Nov 25 15:17:53 2015
@@ -25,10 +25,12 @@
  *
  */
 
-package org.apache.hc.core5.http.protocol;
+package org.apache.hc.core5.http.io;
 
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.protocol.UriPatternMatcher;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/io/TestBasicConnPool.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/pool/TestBasicConnPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/io/TestBasicConnPool.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/io/TestBasicConnPool.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/pool/TestBasicConnPool.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/pool/TestBasicConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/io/TestBasicConnPool.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.impl.pool;
+package org.apache.hc.core5.http.pool.io;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -35,10 +35,10 @@ import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLSocketFactory;
 
-import org.apache.hc.core5.http.HttpClientConnection;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.config.ConnectionConfig;
 import org.apache.hc.core5.http.config.SocketConfig;
+import org.apache.hc.core5.http.io.HttpClientConnection;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/nio/TestBasicNIOConnPool.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestBasicNIOConnPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/nio/TestBasicNIOConnPool.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/nio/TestBasicNIOConnPool.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestBasicNIOConnPool.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestBasicNIOConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/nio/TestBasicNIOConnPool.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.pool;
+package org.apache.hc.core5.http.pool.nio;
 
 import java.net.SocketAddress;
 import java.util.concurrent.Future;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/HttpClient.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/HttpClient.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/HttpClient.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/HttpClient.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/HttpClient.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/HttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/HttpClient.java Wed Nov 25 15:17:53 2015
@@ -25,24 +25,24 @@
  *
  */
 
-package org.apache.hc.core5.http.testserver;
+package org.apache.hc.core5.http.testserver.io;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 
 import org.apache.hc.core5.http.ConnectionReuseStrategy;
-import org.apache.hc.core5.http.HttpClientConnection;
 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.DefaultBHttpClientConnection;
 import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
+import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
+import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
+import org.apache.hc.core5.http.io.HttpClientConnection;
 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.apache.hc.core5.http.protocol.HttpRequestExecutor;
 import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
 import org.apache.hc.core5.http.protocol.RequestConnControl;
 import org.apache.hc.core5.http.protocol.RequestContent;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/HttpServer.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/HttpServer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/HttpServer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/HttpServer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/HttpServer.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/HttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/HttpServer.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.testserver;
+package org.apache.hc.core5.http.testserver.io;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -37,12 +37,12 @@ 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.HttpConnectionFactory;
+import org.apache.hc.core5.http.bootstrap.io.ServerBootstrap;
 import org.apache.hc.core5.http.config.SocketConfig;
-import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
+import org.apache.hc.core5.http.io.HttpConnectionFactory;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
+import org.apache.hc.core5.http.io.UriHttpRequestHandlerMapper;
 import org.apache.hc.core5.http.protocol.HttpExpectationVerifier;
-import org.apache.hc.core5.http.protocol.HttpRequestHandler;
-import org.apache.hc.core5.http.protocol.UriHttpRequestHandlerMapper;
 import org.apache.hc.core5.util.Asserts;
 
 public class HttpServer {
@@ -51,7 +51,7 @@ public class HttpServer {
     private volatile HttpExpectationVerifier expectationVerifier;
     private volatile int timeout;
 
-    private volatile org.apache.hc.core5.http.impl.bootstrap.HttpServer server;
+    private volatile org.apache.hc.core5.http.bootstrap.io.HttpServer server;
 
     public HttpServer() throws IOException {
         super();
@@ -77,7 +77,7 @@ public class HttpServer {
     }
 
     public int getPort() {
-        final org.apache.hc.core5.http.impl.bootstrap.HttpServer local = this.server;
+        final org.apache.hc.core5.http.bootstrap.io.HttpServer local = this.server;
         if (local != null) {
             return this.server.getLocalPort();
         } else {
@@ -86,7 +86,7 @@ public class HttpServer {
     }
 
     public InetAddress getInetAddress() {
-        final org.apache.hc.core5.http.impl.bootstrap.HttpServer local = this.server;
+        final org.apache.hc.core5.http.bootstrap.io.HttpServer local = this.server;
         if (local != null) {
             return local.getInetAddress();
         } else {
@@ -110,7 +110,7 @@ public class HttpServer {
     }
 
     public void shutdown() {
-        final org.apache.hc.core5.http.impl.bootstrap.HttpServer local = this.server;
+        final org.apache.hc.core5.http.bootstrap.io.HttpServer local = this.server;
         this.server = null;
         if (local != null) {
             local.shutdown(5, TimeUnit.SECONDS);

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpClientConnection.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingBHttpClientConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpClientConnection.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpClientConnection.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingBHttpClientConnection.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingBHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpClientConnection.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.testserver;
+package org.apache.hc.core5.http.testserver.io;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,12 +37,12 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.core5.http.ContentLengthStrategy;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.config.MessageConstraints;
-import org.apache.hc.core5.http.entity.ContentLengthStrategy;
-import org.apache.hc.core5.http.impl.DefaultBHttpClientConnection;
+import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
 import org.apache.hc.core5.http.io.HttpMessageParserFactory;
 import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpServerConnection.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingBHttpServerConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpServerConnection.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpServerConnection.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingBHttpServerConnection.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingBHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpServerConnection.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.testserver;
+package org.apache.hc.core5.http.testserver.io;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,12 +37,12 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.core5.http.ContentLengthStrategy;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.config.MessageConstraints;
-import org.apache.hc.core5.http.entity.ContentLengthStrategy;
-import org.apache.hc.core5.http.impl.DefaultBHttpServerConnection;
+import org.apache.hc.core5.http.impl.io.DefaultBHttpServerConnection;
 import org.apache.hc.core5.http.io.HttpMessageParserFactory;
 import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingInputStream.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingInputStream.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingInputStream.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingInputStream.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingInputStream.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingInputStream.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.testserver;
+package org.apache.hc.core5.http.testserver.io;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingOutputStream.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingOutputStream.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingOutputStream.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingOutputStream.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingOutputStream.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/LoggingOutputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingOutputStream.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.testserver;
+package org.apache.hc.core5.http.testserver.io;
 
 import java.io.IOException;
 import java.io.OutputStream;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/Wire.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/Wire.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/Wire.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/Wire.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/Wire.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/Wire.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/io/Wire.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.testserver;
+package org.apache.hc.core5.http.testserver.io;
 
 import org.apache.commons.logging.Log;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/ClientConnectionFactory.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/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/testserver/nio/ClientConnectionFactory.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/ClientConnectionFactory.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ClientConnectionFactory.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/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/testserver/nio/ClientConnectionFactory.java Wed Nov 25 15:17:53 2015
@@ -24,11 +24,11 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.testserver;
+package org.apache.hc.core5.http.testserver.nio;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.hc.core5.http.nio.DefaultNHttpClientConnection;
+import org.apache.hc.core5.http.impl.nio.DefaultNHttpClientConnection;
 import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
 import org.apache.hc.core5.reactor.IOSession;
 import org.apache.hc.core5.reactor.ssl.SSLIOSession;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpClientNio.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/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/testserver/nio/HttpClientNio.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpClientNio.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpClientNio.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/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/testserver/nio/HttpClientNio.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.testserver;
+package org.apache.hc.core5.http.testserver.nio;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -41,19 +41,19 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.OoopsieRuntimeException;
 import org.apache.hc.core5.http.config.ConnectionConfig;
-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.impl.nio.BasicAsyncRequestProducer;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseConsumer;
+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.HttpAsyncRequestExecutor;
+import org.apache.hc.core5.http.impl.nio.HttpAsyncRequester;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestProducer;
+import org.apache.hc.core5.http.nio.HttpAsyncResponseConsumer;
 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.protocol.BasicAsyncRequestProducer;
-import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseConsumer;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestExecutor;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestProducer;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequester;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncResponseConsumer;
+import org.apache.hc.core5.http.pool.nio.BasicNIOConnPool;
+import org.apache.hc.core5.http.pool.nio.BasicNIOPoolEntry;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpCoreNIOTestBase.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/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/testserver/nio/HttpCoreNIOTestBase.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpCoreNIOTestBase.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpCoreNIOTestBase.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/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/testserver/nio/HttpCoreNIOTestBase.java Wed Nov 25 15:17:53 2015
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.testserver;
+package org.apache.hc.core5.http.testserver.nio;
 
 import java.net.URL;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.hc.core5.http.nio.pool.BasicNIOConnFactory;
+import org.apache.hc.core5.http.pool.nio.BasicNIOConnFactory;
 import org.apache.hc.core5.ssl.SSLContextBuilder;
 import org.junit.After;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpServerNio.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/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/testserver/nio/HttpServerNio.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpServerNio.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpServerNio.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/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/testserver/nio/HttpServerNio.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.testserver;
+package org.apache.hc.core5.http.testserver.nio;
 
 import java.io.IOException;
 import java.net.SocketException;
@@ -35,13 +35,13 @@ 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.nio.DefaultNHttpServerConnection;
+import org.apache.hc.core5.http.bootstrap.nio.HttpServer;
+import org.apache.hc.core5.http.bootstrap.nio.ServerBootstrap;
+import org.apache.hc.core5.http.impl.nio.DefaultNHttpServerConnection;
+import org.apache.hc.core5.http.impl.nio.UriHttpAsyncRequestHandlerMapper;
+import org.apache.hc.core5.http.nio.HttpAsyncExpectationVerifier;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestHandler;
 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.protocol.HttpProcessor;
 import org.apache.hc.core5.reactor.IOReactorConfig;
 import org.apache.hc.core5.reactor.ListenerEndpoint;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingIOSession.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingIOSession.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingIOSession.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingIOSession.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingIOSession.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingIOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingIOSession.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.testserver;
+package org.apache.hc.core5.http.testserver.nio;
 
 import java.io.IOException;
 import java.net.SocketAddress;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingNHttpClientConnection.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/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/testserver/nio/LoggingNHttpClientConnection.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingNHttpClientConnection.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpClientConnection.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/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/testserver/nio/LoggingNHttpClientConnection.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.testserver;
+package org.apache.hc.core5.http.testserver.nio;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicLong;
@@ -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.nio.DefaultNHttpClientConnection;
+import org.apache.hc.core5.http.impl.nio.DefaultNHttpClientConnection;
 import org.apache.hc.core5.http.nio.NHttpClientEventHandler;
 import org.apache.hc.core5.reactor.IOSession;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingNHttpServerConnection.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/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/testserver/nio/LoggingNHttpServerConnection.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingNHttpServerConnection.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpServerConnection.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/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/testserver/nio/LoggingNHttpServerConnection.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.testserver;
+package org.apache.hc.core5.http.testserver.nio;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicLong;
@@ -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.nio.DefaultNHttpServerConnection;
+import org.apache.hc.core5.http.impl.nio.DefaultNHttpServerConnection;
 import org.apache.hc.core5.http.nio.NHttpServerEventHandler;
 import org.apache.hc.core5.reactor.IOSession;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/ServerConnectionFactory.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/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/testserver/nio/ServerConnectionFactory.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/ServerConnectionFactory.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ServerConnectionFactory.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/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/testserver/nio/ServerConnectionFactory.java Wed Nov 25 15:17:53 2015
@@ -24,11 +24,11 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.testserver;
+package org.apache.hc.core5.http.testserver.nio;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.hc.core5.http.nio.DefaultNHttpServerConnection;
+import org.apache.hc.core5.http.impl.nio.DefaultNHttpServerConnection;
 import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
 import org.apache.hc.core5.reactor.IOSession;
 import org.apache.hc.core5.reactor.ssl.SSLIOSession;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/Wire.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/Wire.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/Wire.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/Wire.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/Wire.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/Wire.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/testserver/nio/Wire.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.core5.http.nio.testserver;
+package org.apache.hc.core5.http.testserver.nio;
 
 import java.nio.ByteBuffer;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestConnPool.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestConnPool.java Wed Nov 25 15:17:53 2015
@@ -33,7 +33,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.hc.core5.http.BHttpConnection;
+import org.apache.hc.core5.http.io.BHttpConnection;
 import org.apache.hc.core5.pool.PoolEntry;
 import org.apache.hc.core5.pool.PoolStats;
 import org.junit.Assert;



Mime
View raw message