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 40E6A8BE8 for ; Sat, 3 Sep 2011 19:24:11 +0000 (UTC) Received: (qmail 92161 invoked by uid 500); 3 Sep 2011 19:24:11 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 92116 invoked by uid 500); 3 Sep 2011 19:24:10 -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 92109 invoked by uid 99); 3 Sep 2011 19:24:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Sep 2011 19:24:10 +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; Sat, 03 Sep 2011 19:24:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3CC4C23889B3 for ; Sat, 3 Sep 2011 19:23:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1164918 - in /httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http: ./ impl/nio/reactor/ nio/protocol/ testserver/ Date: Sat, 03 Sep 2011 19:23:39 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110903192340.3CC4C23889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Sat Sep 3 19:23:38 2011 New Revision: 1164918 URL: http://svn.apache.org/viewvc?rev=1164918&view=rev Log: Added logging to test cases Added: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingClientConnectionFactory.java (with props) httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingIOSession.java (contents, props changed) - copied, changed from r1164871, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingIOSession.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpClientConnection.java (contents, props changed) - copied, changed from r1164871, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpClientConnection.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpServerConnection.java (contents, props changed) - copied, changed from r1164871, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpServerConnection.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLClientConnectionFactory.java (with props) httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLServerConnectionFactory.java (with props) httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingServerConnectionFactory.java (with props) httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/SSLTestContexts.java (contents, props changed) - copied, changed from r1164868, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/SSLTestContexts.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/Wire.java (contents, props changed) - copied, changed from r1164217, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/Wire.java 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/protocol/TestAsyncNHttpHandlers.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingNHttpHandlers.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncHandlers.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestTruncatedChunks.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingIOSession.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpClientConnection.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpServerConnection.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/SSLTestContexts.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/Wire.java Added: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingClientConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingClientConnectionFactory.java?rev=1164918&view=auto ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingClientConnectionFactory.java (added) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingClientConnectionFactory.java Sat Sep 3 19:23:38 2011 @@ -0,0 +1,52 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ +package org.apache.http; + +import org.apache.http.impl.DefaultHttpResponseFactory; +import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory; +import org.apache.http.nio.NHttpClientIOTarget; +import org.apache.http.nio.reactor.IOSession; +import org.apache.http.nio.util.ByteBufferAllocator; +import org.apache.http.nio.util.HeapByteBufferAllocator; +import org.apache.http.params.HttpParams; + +public class LoggingClientConnectionFactory extends DefaultNHttpClientConnectionFactory { + + public LoggingClientConnectionFactory(final HttpParams params) { + super(new DefaultHttpResponseFactory(), new HeapByteBufferAllocator(), params); + } + + @Override + protected NHttpClientIOTarget createConnection( + final IOSession session, + final HttpResponseFactory responseFactory, + final ByteBufferAllocator allocator, + final HttpParams params) { + return new LoggingNHttpClientConnection(session, responseFactory, allocator, params); + } + +} Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingClientConnectionFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingClientConnectionFactory.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingClientConnectionFactory.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingIOSession.java (from r1164871, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingIOSession.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingIOSession.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingIOSession.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingIOSession.java&r1=1164871&r2=1164918&rev=1164918&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingIOSession.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingIOSession.java Sat Sep 3 19:23:38 2011 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http; import java.io.IOException; import java.net.SocketAddress; Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingIOSession.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingIOSession.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingIOSession.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Sep 3 19:23:38 2011 @@ -0,0 +1 @@ +/httpcomponents/httpcore/branches/ibm_compat_branch/httpcore-contrib/src/main/java/org/apache/http/contrib/logging/LoggingIOSession.java:755687-758898 Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingIOSession.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpClientConnection.java (from r1164871, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpClientConnection.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpClientConnection.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpClientConnection.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpClientConnection.java&r1=1164871&r2=1164918&rev=1164918&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpClientConnection.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpClientConnection.java Sat Sep 3 19:23:38 2011 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http; import java.io.IOException; import java.nio.channels.ReadableByteChannel; Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpClientConnection.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpClientConnection.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpClientConnection.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Sep 3 19:23:38 2011 @@ -0,0 +1 @@ +/httpcomponents/httpcore/branches/ibm_compat_branch/httpcore-contrib/src/main/java/org/apache/http/contrib/logging/LoggingNHttpClientConnection.java:755687-758898 Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpClientConnection.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpServerConnection.java (from r1164871, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpServerConnection.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpServerConnection.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpServerConnection.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpServerConnection.java&r1=1164871&r2=1164918&rev=1164918&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpServerConnection.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpServerConnection.java Sat Sep 3 19:23:38 2011 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http; import java.io.IOException; import java.nio.channels.ReadableByteChannel; Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpServerConnection.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpServerConnection.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpServerConnection.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Sep 3 19:23:38 2011 @@ -0,0 +1 @@ +/httpcomponents/httpcore/branches/ibm_compat_branch/httpcore-contrib/src/main/java/org/apache/http/contrib/logging/LoggingNHttpServerConnection.java:755687-758898 Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpServerConnection.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLClientConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLClientConnectionFactory.java?rev=1164918&view=auto ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLClientConnectionFactory.java (added) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLClientConnectionFactory.java Sat Sep 3 19:23:38 2011 @@ -0,0 +1,56 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ +package org.apache.http; + +import javax.net.ssl.SSLContext; + +import org.apache.http.impl.DefaultHttpResponseFactory; +import org.apache.http.impl.nio.SSLNHttpClientConnectionFactory; +import org.apache.http.nio.NHttpClientIOTarget; +import org.apache.http.nio.reactor.IOSession; +import org.apache.http.nio.util.ByteBufferAllocator; +import org.apache.http.nio.util.HeapByteBufferAllocator; +import org.apache.http.params.HttpParams; + +public class LoggingSSLClientConnectionFactory extends SSLNHttpClientConnectionFactory { + + public LoggingSSLClientConnectionFactory( + final SSLContext sslcontext, + final HttpParams params) { + super(sslcontext, null, new DefaultHttpResponseFactory(), new HeapByteBufferAllocator(), params); + } + + @Override + protected NHttpClientIOTarget createConnection( + final IOSession session, + final HttpResponseFactory responseFactory, + final ByteBufferAllocator allocator, + final HttpParams params) { + return new LoggingNHttpClientConnection(session, responseFactory, allocator, params); + } + +} Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLClientConnectionFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLClientConnectionFactory.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLClientConnectionFactory.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLServerConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLServerConnectionFactory.java?rev=1164918&view=auto ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLServerConnectionFactory.java (added) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLServerConnectionFactory.java Sat Sep 3 19:23:38 2011 @@ -0,0 +1,56 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ +package org.apache.http; + +import javax.net.ssl.SSLContext; + +import org.apache.http.impl.DefaultHttpRequestFactory; +import org.apache.http.impl.nio.SSLNHttpServerConnectionFactory; +import org.apache.http.nio.NHttpServerIOTarget; +import org.apache.http.nio.reactor.IOSession; +import org.apache.http.nio.util.ByteBufferAllocator; +import org.apache.http.nio.util.HeapByteBufferAllocator; +import org.apache.http.params.HttpParams; + +public class LoggingSSLServerConnectionFactory extends SSLNHttpServerConnectionFactory { + + public LoggingSSLServerConnectionFactory( + final SSLContext sslcontext, + final HttpParams params) { + super(sslcontext, null, new DefaultHttpRequestFactory(), new HeapByteBufferAllocator(), params); + } + + @Override + protected NHttpServerIOTarget createConnection( + final IOSession session, + final HttpRequestFactory requestFactory, + final ByteBufferAllocator allocator, + final HttpParams params) { + return new LoggingNHttpServerConnection(session, requestFactory, allocator, params); + } + +} Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLServerConnectionFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLServerConnectionFactory.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingSSLServerConnectionFactory.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingServerConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingServerConnectionFactory.java?rev=1164918&view=auto ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingServerConnectionFactory.java (added) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingServerConnectionFactory.java Sat Sep 3 19:23:38 2011 @@ -0,0 +1,52 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ +package org.apache.http; + +import org.apache.http.impl.DefaultHttpRequestFactory; +import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory; +import org.apache.http.nio.NHttpServerIOTarget; +import org.apache.http.nio.reactor.IOSession; +import org.apache.http.nio.util.ByteBufferAllocator; +import org.apache.http.nio.util.HeapByteBufferAllocator; +import org.apache.http.params.HttpParams; + +public class LoggingServerConnectionFactory extends DefaultNHttpServerConnectionFactory { + + public LoggingServerConnectionFactory(final HttpParams params) { + super(new DefaultHttpRequestFactory(), new HeapByteBufferAllocator(), params); + } + + @Override + protected NHttpServerIOTarget createConnection( + final IOSession session, + final HttpRequestFactory requestFactory, + final ByteBufferAllocator allocator, + final HttpParams params) { + return new LoggingNHttpServerConnection(session, requestFactory, allocator, params); + } + +} Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingServerConnectionFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingServerConnectionFactory.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingServerConnectionFactory.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/SSLTestContexts.java (from r1164868, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/SSLTestContexts.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/SSLTestContexts.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/SSLTestContexts.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/SSLTestContexts.java&r1=1164868&r2=1164918&rev=1164918&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/SSLTestContexts.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/SSLTestContexts.java Sat Sep 3 19:23:38 2011 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http; import java.net.URL; import java.security.KeyStore; Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/SSLTestContexts.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/SSLTestContexts.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/SSLTestContexts.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/Wire.java (from r1164217, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/Wire.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/Wire.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/Wire.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/Wire.java&r1=1164217&r2=1164918&rev=1164918&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/Wire.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/Wire.java Sat Sep 3 19:23:38 2011 @@ -25,7 +25,7 @@ * */ -package org.apache.http.testserver; +package org.apache.http; import java.nio.ByteBuffer; Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/Wire.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/Wire.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/Wire.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Sep 3 19:23:38 2011 @@ -0,0 +1 @@ +/httpcomponents/httpcore/branches/ibm_compat_branch/httpcore-contrib/src/main/java/org/apache/http/contrib/logging/Wire.java:755687-758898 Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/Wire.java ------------------------------------------------------------------------------ svn:mime-type = text/plain 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=1164918&r1=1164917&r2=1164918&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 Sat Sep 3 19:23:38 2011 @@ -43,10 +43,11 @@ import org.apache.http.HttpCoreNIOTestBa import org.apache.http.HttpException; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; +import org.apache.http.LoggingSSLClientConnectionFactory; +import org.apache.http.LoggingSSLServerConnectionFactory; +import org.apache.http.SSLTestContexts; import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.DefaultHttpResponseFactory; -import org.apache.http.impl.nio.SSLNHttpClientConnectionFactory; -import org.apache.http.impl.nio.SSLNHttpServerConnectionFactory; import org.apache.http.nio.NHttpClientIOTarget; import org.apache.http.nio.NHttpConnectionFactory; import org.apache.http.nio.NHttpServerIOTarget; @@ -58,7 +59,6 @@ import org.apache.http.params.HttpParams import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.HttpExpectationVerifier; import org.apache.http.protocol.HttpRequestHandler; -import org.apache.http.testserver.SSLTestContexts; import org.apache.http.testserver.SimpleHttpRequestHandlerResolver; import org.junit.After; import org.junit.Assert; @@ -79,14 +79,14 @@ public class TestBaseIOReactorSSL extend @Override protected NHttpConnectionFactory createServerConnectionFactory( - HttpParams params) throws Exception { - return new SSLNHttpServerConnectionFactory(SSLTestContexts.createServerSSLContext(), null, params); + final HttpParams params) throws Exception { + return new LoggingSSLServerConnectionFactory(SSLTestContexts.createServerSSLContext(), params); } @Override protected NHttpConnectionFactory createClientConnectionFactory( - HttpParams params) throws Exception { - return new SSLNHttpClientConnectionFactory(SSLTestContexts.createClientSSLContext(), null, params); + final HttpParams params) throws Exception { + return new LoggingSSLClientConnectionFactory(SSLTestContexts.createClientSSLContext(), params); } private NHttpServiceHandler createHttpServiceHandler( 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=1164918&r1=1164917&r2=1164918&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 Sat Sep 3 19:23:38 2011 @@ -41,11 +41,11 @@ import org.apache.http.HttpRequest; import org.apache.http.HttpRequestInterceptor; import org.apache.http.HttpResponse; import org.apache.http.HttpResponseInterceptor; +import org.apache.http.LoggingClientConnectionFactory; +import org.apache.http.LoggingServerConnectionFactory; import org.apache.http.OoopsieRuntimeException; import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.DefaultHttpResponseFactory; -import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory; -import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory; import org.apache.http.message.BasicHttpRequest; import org.apache.http.nio.NHttpClientIOTarget; import org.apache.http.nio.NHttpConnection; @@ -100,14 +100,14 @@ public class TestDefaultIOReactors exten @Override protected NHttpConnectionFactory createServerConnectionFactory( - final HttpParams params) { - return new DefaultNHttpServerConnectionFactory(params); + final HttpParams params) throws Exception { + return new LoggingServerConnectionFactory(params); } @Override protected NHttpConnectionFactory createClientConnectionFactory( - final HttpParams params) { - return new DefaultNHttpClientConnectionFactory(params); + final HttpParams params) throws Exception { + return new LoggingClientConnectionFactory(params); } @Test 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=1164918&r1=1164917&r2=1164918&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 Sat Sep 3 19:23:38 2011 @@ -40,10 +40,11 @@ import org.apache.http.HttpRequest; import org.apache.http.HttpRequestInterceptor; import org.apache.http.HttpResponse; import org.apache.http.HttpResponseInterceptor; +import org.apache.http.LoggingSSLClientConnectionFactory; +import org.apache.http.LoggingSSLServerConnectionFactory; +import org.apache.http.SSLTestContexts; import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.DefaultHttpResponseFactory; -import org.apache.http.impl.nio.SSLNHttpClientConnectionFactory; -import org.apache.http.impl.nio.SSLNHttpServerConnectionFactory; import org.apache.http.message.BasicHttpRequest; import org.apache.http.nio.NHttpClientIOTarget; import org.apache.http.nio.NHttpConnection; @@ -70,7 +71,6 @@ 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.SSLTestContexts; import org.apache.http.testserver.SimpleEventListener; import org.apache.http.testserver.SimpleHttpRequestHandlerResolver; import org.junit.After; @@ -98,14 +98,14 @@ public class TestDefaultIOReactorsSSL ex @Override protected NHttpConnectionFactory createServerConnectionFactory( - HttpParams params) throws Exception { - return new SSLNHttpServerConnectionFactory(SSLTestContexts.createServerSSLContext(), null, params); + final HttpParams params) throws Exception { + return new LoggingSSLServerConnectionFactory(SSLTestContexts.createServerSSLContext(), params); } @Override protected NHttpConnectionFactory createClientConnectionFactory( - HttpParams params) throws Exception { - return new SSLNHttpClientConnectionFactory(SSLTestContexts.createClientSSLContext(), null, params); + final HttpParams params) throws Exception { + return new LoggingSSLClientConnectionFactory(SSLTestContexts.createClientSSLContext(), params); } @Test Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestAsyncNHttpHandlers.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestAsyncNHttpHandlers.java?rev=1164918&r1=1164917&r2=1164918&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestAsyncNHttpHandlers.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestAsyncNHttpHandlers.java Sat Sep 3 19:23:38 2011 @@ -43,10 +43,10 @@ import org.apache.http.HttpResponse; import org.apache.http.HttpResponseInterceptor; import org.apache.http.HttpStatus; import org.apache.http.HttpVersion; +import org.apache.http.LoggingClientConnectionFactory; +import org.apache.http.LoggingServerConnectionFactory; import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.DefaultHttpResponseFactory; -import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory; -import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory; import org.apache.http.message.BasicHttpEntityEnclosingRequest; import org.apache.http.message.BasicHttpRequest; import org.apache.http.nio.NHttpClientIOTarget; @@ -100,14 +100,14 @@ public class TestAsyncNHttpHandlers exte @Override protected NHttpConnectionFactory createServerConnectionFactory( - final HttpParams params) { - return new DefaultNHttpServerConnectionFactory(params); + final HttpParams params) throws Exception { + return new LoggingServerConnectionFactory(params); } @Override protected NHttpConnectionFactory createClientConnectionFactory( - final HttpParams params) { - return new DefaultNHttpClientConnectionFactory(params); + final HttpParams params) throws Exception { + return new LoggingClientConnectionFactory(params); } private void executeStandardTest( Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingNHttpHandlers.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingNHttpHandlers.java?rev=1164918&r1=1164917&r2=1164918&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingNHttpHandlers.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingNHttpHandlers.java Sat Sep 3 19:23:38 2011 @@ -38,10 +38,10 @@ import org.apache.http.HttpEntityEnclosi import org.apache.http.HttpRequest; import org.apache.http.HttpStatus; import org.apache.http.HttpVersion; +import org.apache.http.LoggingClientConnectionFactory; +import org.apache.http.LoggingServerConnectionFactory; import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.DefaultHttpResponseFactory; -import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory; -import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory; import org.apache.http.message.BasicHttpEntityEnclosingRequest; import org.apache.http.message.BasicHttpRequest; import org.apache.http.nio.NHttpClientIOTarget; @@ -81,14 +81,14 @@ public class TestBufferingNHttpHandlers @Override protected NHttpConnectionFactory createServerConnectionFactory( - final HttpParams params) { - return new DefaultNHttpServerConnectionFactory(params); + final HttpParams params) throws Exception { + return new LoggingServerConnectionFactory(params); } @Override protected NHttpConnectionFactory createClientConnectionFactory( - final HttpParams params) { - return new DefaultNHttpClientConnectionFactory(params); + final HttpParams params) throws Exception { + return new LoggingClientConnectionFactory(params); } private void executeStandardTest( Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncHandlers.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncHandlers.java?rev=1164918&r1=1164917&r2=1164918&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncHandlers.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncHandlers.java Sat Sep 3 19:23:38 2011 @@ -38,9 +38,9 @@ import org.apache.http.HttpEntityEnclosi import org.apache.http.HttpRequest; import org.apache.http.HttpStatus; import org.apache.http.HttpVersion; +import org.apache.http.LoggingClientConnectionFactory; +import org.apache.http.LoggingServerConnectionFactory; import org.apache.http.impl.DefaultConnectionReuseStrategy; -import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory; -import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory; import org.apache.http.message.BasicHttpEntityEnclosingRequest; import org.apache.http.message.BasicHttpRequest; import org.apache.http.nio.NHttpClientIOTarget; @@ -79,14 +79,14 @@ public class TestHttpAsyncHandlers exten @Override protected NHttpConnectionFactory createServerConnectionFactory( - final HttpParams params) { - return new DefaultNHttpServerConnectionFactory(params); + final HttpParams params) throws Exception { + return new LoggingServerConnectionFactory(params); } @Override protected NHttpConnectionFactory createClientConnectionFactory( - final HttpParams params) { - return new DefaultNHttpClientConnectionFactory(params); + final HttpParams params) throws Exception { + return new LoggingClientConnectionFactory(params); } static class BasicHttpAsyncRequestHandlerResolver implements HttpAsyncRequestHandlerResolver { Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java?rev=1164918&r1=1164917&r2=1164918&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java Sat Sep 3 19:23:38 2011 @@ -38,10 +38,11 @@ import org.apache.http.HttpEntityEnclosi import org.apache.http.HttpRequest; import org.apache.http.HttpStatus; import org.apache.http.HttpVersion; +import org.apache.http.LoggingSSLClientConnectionFactory; +import org.apache.http.LoggingSSLServerConnectionFactory; +import org.apache.http.SSLTestContexts; import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.DefaultHttpResponseFactory; -import org.apache.http.impl.nio.SSLNHttpClientConnectionFactory; -import org.apache.http.impl.nio.SSLNHttpServerConnectionFactory; import org.apache.http.message.BasicHttpEntityEnclosingRequest; import org.apache.http.message.BasicHttpRequest; import org.apache.http.nio.NHttpClientIOTarget; @@ -53,7 +54,6 @@ import org.apache.http.nio.reactor.Liste import org.apache.http.nio.reactor.SessionRequest; import org.apache.http.params.CoreProtocolPNames; import org.apache.http.params.HttpParams; -import org.apache.http.testserver.SSLTestContexts; import org.apache.http.testserver.SimpleEventListener; import org.apache.http.testserver.SimpleNHttpRequestHandlerResolver; import org.junit.After; @@ -80,14 +80,14 @@ public class TestNIOSSLHttp extends Http @Override protected NHttpConnectionFactory createServerConnectionFactory( - HttpParams params) throws Exception { - return new SSLNHttpServerConnectionFactory(SSLTestContexts.createServerSSLContext(), null, params); + final HttpParams params) throws Exception { + return new LoggingSSLServerConnectionFactory(SSLTestContexts.createServerSSLContext(), params); } @Override protected NHttpConnectionFactory createClientConnectionFactory( - HttpParams params) throws Exception { - return new SSLNHttpClientConnectionFactory(SSLTestContexts.createClientSSLContext(), null, params); + final HttpParams params) throws Exception { + return new LoggingSSLClientConnectionFactory(SSLTestContexts.createClientSSLContext(), params); } private void executeStandardTest( Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java?rev=1164918&r1=1164917&r2=1164918&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java Sat Sep 3 19:23:38 2011 @@ -48,12 +48,12 @@ import org.apache.http.HttpResponse; import org.apache.http.HttpResponseInterceptor; import org.apache.http.HttpStatus; import org.apache.http.HttpVersion; +import org.apache.http.LoggingClientConnectionFactory; +import org.apache.http.LoggingServerConnectionFactory; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.DefaultHttpResponseFactory; -import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory; -import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory; import org.apache.http.message.BasicHttpEntityEnclosingRequest; import org.apache.http.message.BasicHttpRequest; import org.apache.http.nio.NHttpClientIOTarget; @@ -110,14 +110,14 @@ public class TestThrottlingNHttpHandlers @Override protected NHttpConnectionFactory createServerConnectionFactory( - final HttpParams params) { - return new DefaultNHttpServerConnectionFactory(params); + final HttpParams params) throws Exception { + return new LoggingServerConnectionFactory(params); } @Override protected NHttpConnectionFactory createClientConnectionFactory( - final HttpParams params) { - return new DefaultNHttpClientConnectionFactory(params); + final HttpParams params) throws Exception { + return new LoggingClientConnectionFactory(params); } private ExecutorService execService; Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestTruncatedChunks.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestTruncatedChunks.java?rev=1164918&r1=1164917&r2=1164918&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestTruncatedChunks.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestTruncatedChunks.java Sat Sep 3 19:23:38 2011 @@ -42,6 +42,8 @@ import org.apache.http.HttpRequest; import org.apache.http.HttpRequestFactory; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; +import org.apache.http.LoggingClientConnectionFactory; +import org.apache.http.LoggingNHttpServerConnection; import org.apache.http.MalformedChunkCodingException; import org.apache.http.TruncatedChunkException; import org.apache.http.entity.ContentLengthStrategy; @@ -49,8 +51,6 @@ import org.apache.http.entity.HttpEntity import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.DefaultHttpResponseFactory; import org.apache.http.impl.io.HttpTransportMetricsImpl; -import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory; -import org.apache.http.impl.nio.DefaultNHttpServerConnection; import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory; import org.apache.http.impl.nio.codecs.AbstractContentEncoder; import org.apache.http.message.BasicHttpRequest; @@ -98,14 +98,14 @@ public class TestTruncatedChunks extends @Override protected NHttpConnectionFactory createServerConnectionFactory( - final HttpParams params) { + final HttpParams params) throws Exception { return new CustomServerConnectionFactory(params); } @Override protected NHttpConnectionFactory createClientConnectionFactory( - final HttpParams params) { - return new DefaultNHttpClientConnectionFactory(params); + final HttpParams params) throws Exception { + return new LoggingClientConnectionFactory(params); } private static final byte[] GARBAGE = new byte[] {'1', '2', '3', '4', '5' }; @@ -165,7 +165,7 @@ public class TestTruncatedChunks extends final ByteBufferAllocator allocator, final HttpParams params) { - return new DefaultNHttpServerConnection(session, requestFactory, allocator, params) { + return new LoggingNHttpServerConnection(session, requestFactory, allocator, params) { @Override protected ContentEncoder createContentEncoder(