Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D14A4DDD4 for ; Thu, 8 Nov 2012 01:02:23 +0000 (UTC) Received: (qmail 37618 invoked by uid 500); 8 Nov 2012 01:02:23 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 37570 invoked by uid 500); 8 Nov 2012 01:02:23 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 37559 invoked by uid 99); 8 Nov 2012 01:02:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2012 01:02:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2012 01:02:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DDEE223888E3 for ; Thu, 8 Nov 2012 01:02:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1406881 - in /httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http: impl/nio/reactor/ nio/integration/ nio/testserver/ testserver/ Date: Thu, 08 Nov 2012 01:01:59 -0000 To: commits@hc.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121108010200.DDEE223888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Thu Nov 8 01:01:58 2012 New Revision: 1406881 URL: http://svn.apache.org/viewvc?rev=1406881&view=rev Log: Move NIO test server classes to 'org.apache.http.nio.testserver' This avoids any posible clash with httpcore testserver classes Added: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/ - copied from r1406434, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/ Removed: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/ Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestAsyncNHttpHandlers.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncPrematureTermination.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpsAsyncHandlers.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestThrottlingNHttpHandlers.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpCoreNIOTestBase.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingClientConnectionFactory.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingIOSession.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingNHttpClientConnection.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingNHttpServerConnection.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLClientConnectionFactory.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLServerConnectionFactory.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingServerConnectionFactory.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/NHttpClientEventHandlerAdaptor.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/NHttpServerEventHandlerAdaptor.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SSLTestContexts.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleEventListener.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleHttpRequestHandlerResolver.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleIOReactorExceptionHandler.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleNHttpRequestHandlerResolver.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/Wire.java Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java?rev=1406881&r1=1406880&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java Thu Nov 8 01:01:58 2012 @@ -55,12 +55,12 @@ import org.apache.http.params.BasicHttpP import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.HttpExpectationVerifier; import org.apache.http.protocol.HttpRequestHandler; -import org.apache.http.testserver.HttpCoreNIOTestBase; -import org.apache.http.testserver.HttpServerNio; -import org.apache.http.testserver.LoggingSSLClientConnectionFactory; -import org.apache.http.testserver.LoggingSSLServerConnectionFactory; -import org.apache.http.testserver.SSLTestContexts; -import org.apache.http.testserver.SimpleHttpRequestHandlerResolver; +import org.apache.http.nio.testserver.HttpCoreNIOTestBase; +import org.apache.http.nio.testserver.HttpServerNio; +import org.apache.http.nio.testserver.LoggingSSLClientConnectionFactory; +import org.apache.http.nio.testserver.LoggingSSLServerConnectionFactory; +import org.apache.http.nio.testserver.SSLTestContexts; +import org.apache.http.nio.testserver.SimpleHttpRequestHandlerResolver; import org.junit.After; import org.junit.Assert; import org.junit.Before; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java?rev=1406881&r1=1406880&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java Thu Nov 8 01:01:58 2012 @@ -59,10 +59,10 @@ import org.apache.http.nio.reactor.IORea import org.apache.http.nio.reactor.ListenerEndpoint; import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.HttpRequestHandler; -import org.apache.http.testserver.HttpCoreNIOTestBase; -import org.apache.http.testserver.HttpServerNio; -import org.apache.http.testserver.LoggingClientConnectionFactory; -import org.apache.http.testserver.LoggingServerConnectionFactory; +import org.apache.http.nio.testserver.HttpCoreNIOTestBase; +import org.apache.http.nio.testserver.HttpServerNio; +import org.apache.http.nio.testserver.LoggingClientConnectionFactory; +import org.apache.http.nio.testserver.LoggingServerConnectionFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java?rev=1406881&r1=1406880&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java Thu Nov 8 01:01:58 2012 @@ -30,9 +30,9 @@ package org.apache.http.impl.nio.reactor import org.apache.http.impl.nio.DefaultNHttpClientConnection; import org.apache.http.impl.nio.DefaultNHttpServerConnection; import org.apache.http.nio.NHttpConnectionFactory; -import org.apache.http.testserver.LoggingSSLClientConnectionFactory; -import org.apache.http.testserver.LoggingSSLServerConnectionFactory; -import org.apache.http.testserver.SSLTestContexts; +import org.apache.http.nio.testserver.LoggingSSLClientConnectionFactory; +import org.apache.http.nio.testserver.LoggingSSLServerConnectionFactory; +import org.apache.http.nio.testserver.SSLTestContexts; /** * Basic functionality tests for SSL I/O reactors. Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestAsyncNHttpHandlers.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestAsyncNHttpHandlers.java?rev=1406881&r1=1406880&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestAsyncNHttpHandlers.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestAsyncNHttpHandlers.java Thu Nov 8 01:01:58 2012 @@ -77,13 +77,13 @@ import org.apache.http.protocol.Response import org.apache.http.protocol.ResponseContent; import org.apache.http.protocol.ResponseDate; import org.apache.http.protocol.ResponseServer; -import org.apache.http.testserver.HttpClientNio; -import org.apache.http.testserver.HttpCoreNIOTestBase; -import org.apache.http.testserver.HttpServerNio; -import org.apache.http.testserver.LoggingClientConnectionFactory; -import org.apache.http.testserver.LoggingServerConnectionFactory; -import org.apache.http.testserver.SimpleEventListener; -import org.apache.http.testserver.SimpleNHttpRequestHandlerResolver; +import org.apache.http.nio.testserver.HttpClientNio; +import org.apache.http.nio.testserver.HttpCoreNIOTestBase; +import org.apache.http.nio.testserver.HttpServerNio; +import org.apache.http.nio.testserver.LoggingClientConnectionFactory; +import org.apache.http.nio.testserver.LoggingServerConnectionFactory; +import org.apache.http.nio.testserver.SimpleEventListener; +import org.apache.http.nio.testserver.SimpleNHttpRequestHandlerResolver; import org.apache.http.util.EncodingUtils; import org.junit.After; import org.junit.Assert; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.java?rev=1406881&r1=1406880&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.java Thu Nov 8 01:01:58 2012 @@ -58,9 +58,9 @@ import org.apache.http.nio.protocol.UriH import org.apache.http.nio.reactor.IOReactorStatus; import org.apache.http.nio.reactor.ListenerEndpoint; import org.apache.http.protocol.HttpContext; -import org.apache.http.testserver.HttpCoreNIOTestBase; -import org.apache.http.testserver.LoggingClientConnectionFactory; -import org.apache.http.testserver.LoggingServerConnectionFactory; +import org.apache.http.nio.testserver.HttpCoreNIOTestBase; +import org.apache.http.nio.testserver.LoggingClientConnectionFactory; +import org.apache.http.nio.testserver.LoggingServerConnectionFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java?rev=1406881&r1=1406880&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java Thu Nov 8 01:01:58 2012 @@ -71,9 +71,9 @@ import org.apache.http.protocol.RequestC import org.apache.http.protocol.RequestExpectContinue; import org.apache.http.protocol.RequestTargetHost; import org.apache.http.protocol.RequestUserAgent; -import org.apache.http.testserver.HttpCoreNIOTestBase; -import org.apache.http.testserver.LoggingClientConnectionFactory; -import org.apache.http.testserver.LoggingServerConnectionFactory; +import org.apache.http.nio.testserver.HttpCoreNIOTestBase; +import org.apache.http.nio.testserver.LoggingClientConnectionFactory; +import org.apache.http.nio.testserver.LoggingServerConnectionFactory; import org.apache.http.util.EntityUtils; import org.junit.After; import org.junit.Assert; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncPrematureTermination.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncPrematureTermination.java?rev=1406881&r1=1406880&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncPrematureTermination.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncPrematureTermination.java Thu Nov 8 01:01:58 2012 @@ -58,9 +58,9 @@ import org.apache.http.nio.reactor.Liste import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.ExecutionContext; import org.apache.http.protocol.HttpContext; -import org.apache.http.testserver.HttpCoreNIOTestBase; -import org.apache.http.testserver.LoggingClientConnectionFactory; -import org.apache.http.testserver.LoggingServerConnectionFactory; +import org.apache.http.nio.testserver.HttpCoreNIOTestBase; +import org.apache.http.nio.testserver.LoggingClientConnectionFactory; +import org.apache.http.nio.testserver.LoggingServerConnectionFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpsAsyncHandlers.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpsAsyncHandlers.java?rev=1406881&r1=1406880&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpsAsyncHandlers.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpsAsyncHandlers.java Thu Nov 8 01:01:58 2012 @@ -30,9 +30,9 @@ package org.apache.http.nio.integration; import org.apache.http.impl.nio.DefaultNHttpClientConnection; import org.apache.http.impl.nio.DefaultNHttpServerConnection; import org.apache.http.nio.NHttpConnectionFactory; -import org.apache.http.testserver.LoggingSSLClientConnectionFactory; -import org.apache.http.testserver.LoggingSSLServerConnectionFactory; -import org.apache.http.testserver.SSLTestContexts; +import org.apache.http.nio.testserver.LoggingSSLClientConnectionFactory; +import org.apache.http.nio.testserver.LoggingSSLServerConnectionFactory; +import org.apache.http.nio.testserver.SSLTestContexts; /** * HttpCore NIO integration tests for async handlers using SSL. Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java?rev=1406881&r1=1406880&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java Thu Nov 8 01:01:58 2012 @@ -65,9 +65,9 @@ import org.apache.http.protocol.Immutabl import org.apache.http.protocol.ResponseConnControl; import org.apache.http.protocol.ResponseContent; import org.apache.http.protocol.ResponseServer; -import org.apache.http.testserver.HttpCoreNIOTestBase; -import org.apache.http.testserver.LoggingClientConnectionFactory; -import org.apache.http.testserver.LoggingServerConnectionFactory; +import org.apache.http.nio.testserver.HttpCoreNIOTestBase; +import org.apache.http.nio.testserver.LoggingClientConnectionFactory; +import org.apache.http.nio.testserver.LoggingServerConnectionFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestThrottlingNHttpHandlers.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestThrottlingNHttpHandlers.java?rev=1406881&r1=1406880&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestThrottlingNHttpHandlers.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestThrottlingNHttpHandlers.java Thu Nov 8 01:01:58 2012 @@ -83,13 +83,13 @@ import org.apache.http.protocol.Response import org.apache.http.protocol.ResponseContent; import org.apache.http.protocol.ResponseDate; import org.apache.http.protocol.ResponseServer; -import org.apache.http.testserver.HttpClientNio; -import org.apache.http.testserver.HttpCoreNIOTestBase; -import org.apache.http.testserver.HttpServerNio; -import org.apache.http.testserver.LoggingClientConnectionFactory; -import org.apache.http.testserver.LoggingServerConnectionFactory; -import org.apache.http.testserver.SimpleEventListener; -import org.apache.http.testserver.SimpleHttpRequestHandlerResolver; +import org.apache.http.nio.testserver.HttpClientNio; +import org.apache.http.nio.testserver.HttpCoreNIOTestBase; +import org.apache.http.nio.testserver.HttpServerNio; +import org.apache.http.nio.testserver.LoggingClientConnectionFactory; +import org.apache.http.nio.testserver.LoggingServerConnectionFactory; +import org.apache.http.nio.testserver.SimpleEventListener; +import org.apache.http.nio.testserver.SimpleHttpRequestHandlerResolver; import org.apache.http.util.EncodingUtils; import org.junit.After; import org.junit.Assert; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java?rev=1406881&r1=1406880&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java Thu Nov 8 01:01:58 2012 @@ -65,9 +65,9 @@ import org.apache.http.nio.reactor.Sessi import org.apache.http.nio.util.HeapByteBufferAllocator; import org.apache.http.nio.util.SimpleInputBuffer; import org.apache.http.protocol.HttpContext; -import org.apache.http.testserver.HttpCoreNIOTestBase; -import org.apache.http.testserver.LoggingClientConnectionFactory; -import org.apache.http.testserver.LoggingNHttpServerConnection; +import org.apache.http.nio.testserver.HttpCoreNIOTestBase; +import org.apache.http.nio.testserver.LoggingClientConnectionFactory; +import org.apache.http.nio.testserver.LoggingNHttpServerConnection; import org.apache.http.util.CharArrayBuffer; import org.apache.http.util.EntityUtils; import org.junit.After; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java Thu Nov 8 01:01:58 2012 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import java.io.IOException; import java.net.InetSocketAddress; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpCoreNIOTestBase.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpCoreNIOTestBase.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpCoreNIOTestBase.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpCoreNIOTestBase.java Thu Nov 8 01:01:58 2012 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import org.apache.http.impl.nio.DefaultNHttpClientConnection; import org.apache.http.impl.nio.DefaultNHttpServerConnection; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java Thu Nov 8 01:01:58 2012 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import java.io.IOException; import java.net.InetSocketAddress; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingClientConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingClientConnectionFactory.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingClientConnectionFactory.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingClientConnectionFactory.java Thu Nov 8 01:01:58 2012 @@ -24,7 +24,7 @@ * . * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import org.apache.http.impl.nio.DefaultNHttpClientConnection; import org.apache.http.nio.NHttpConnectionFactory; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingIOSession.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingIOSession.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingIOSession.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingIOSession.java Thu Nov 8 01:01:58 2012 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import java.io.IOException; import java.net.SocketAddress; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingNHttpClientConnection.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingNHttpClientConnection.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingNHttpClientConnection.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingNHttpClientConnection.java Thu Nov 8 01:01:58 2012 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import java.io.IOException; import java.util.concurrent.atomic.AtomicLong; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingNHttpServerConnection.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingNHttpServerConnection.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingNHttpServerConnection.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingNHttpServerConnection.java Thu Nov 8 01:01:58 2012 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import java.io.IOException; import java.util.concurrent.atomic.AtomicLong; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLClientConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLClientConnectionFactory.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLClientConnectionFactory.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLClientConnectionFactory.java Thu Nov 8 01:01:58 2012 @@ -24,7 +24,7 @@ * . * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import javax.net.ssl.SSLContext; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLServerConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLServerConnectionFactory.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLServerConnectionFactory.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLServerConnectionFactory.java Thu Nov 8 01:01:58 2012 @@ -24,7 +24,7 @@ * . * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import javax.net.ssl.SSLContext; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingServerConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingServerConnectionFactory.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingServerConnectionFactory.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingServerConnectionFactory.java Thu Nov 8 01:01:58 2012 @@ -24,7 +24,7 @@ * . * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import org.apache.http.impl.nio.DefaultNHttpServerConnection; import org.apache.http.nio.NHttpConnectionFactory; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/NHttpClientEventHandlerAdaptor.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/NHttpClientEventHandlerAdaptor.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/NHttpClientEventHandlerAdaptor.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/NHttpClientEventHandlerAdaptor.java Thu Nov 8 01:01:58 2012 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import java.io.IOException; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/NHttpServerEventHandlerAdaptor.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/NHttpServerEventHandlerAdaptor.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/NHttpServerEventHandlerAdaptor.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/NHttpServerEventHandlerAdaptor.java Thu Nov 8 01:01:58 2012 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import java.io.IOException; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SSLTestContexts.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SSLTestContexts.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SSLTestContexts.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SSLTestContexts.java Thu Nov 8 01:01:58 2012 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import java.net.URL; import java.security.KeyStore; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleEventListener.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleEventListener.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleEventListener.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleEventListener.java Thu Nov 8 01:01:58 2012 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import java.io.IOException; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleHttpRequestHandlerResolver.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleHttpRequestHandlerResolver.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleHttpRequestHandlerResolver.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleHttpRequestHandlerResolver.java Thu Nov 8 01:01:58 2012 @@ -24,7 +24,7 @@ * . * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import org.apache.http.protocol.HttpRequestHandler; import org.apache.http.protocol.HttpRequestHandlerResolver; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleIOReactorExceptionHandler.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleIOReactorExceptionHandler.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleIOReactorExceptionHandler.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleIOReactorExceptionHandler.java Thu Nov 8 01:01:58 2012 @@ -24,7 +24,7 @@ * . * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import java.io.IOException; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleNHttpRequestHandlerResolver.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleNHttpRequestHandlerResolver.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleNHttpRequestHandlerResolver.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleNHttpRequestHandlerResolver.java Thu Nov 8 01:01:58 2012 @@ -24,7 +24,7 @@ * . * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import org.apache.http.nio.protocol.NHttpRequestHandler; import org.apache.http.nio.protocol.NHttpRequestHandlerResolver; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/Wire.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/Wire.java?rev=1406881&r1=1406434&r2=1406881&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/Wire.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/Wire.java Thu Nov 8 01:01:58 2012 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http.nio.testserver; import java.nio.ByteBuffer;