Return-Path: Delivered-To: apmail-hc-commits-archive@www.apache.org Received: (qmail 94037 invoked from network); 15 Dec 2007 14:04:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Dec 2007 14:04:10 -0000 Received: (qmail 55476 invoked by uid 500); 15 Dec 2007 14:03:59 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 55451 invoked by uid 500); 15 Dec 2007 14:03:59 -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 55442 invoked by uid 500); 15 Dec 2007 14:03:59 -0000 Delivered-To: apmail-jakarta-httpcomponents-commits@jakarta.apache.org Received: (qmail 55439 invoked by uid 99); 15 Dec 2007 14:03:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Dec 2007 06:03:59 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Dec 2007 14:03:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4D3471A9838; Sat, 15 Dec 2007 06:03:49 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r604430 - in /jakarta/httpcomponents/httpcore/trunk/module-nio/src: examples/org/apache/http/examples/nio/ main/java/org/apache/http/impl/nio/ main/java/org/apache/http/impl/nio/reactor/ test/java/org/apache/http/mockup/ Date: Sat, 15 Dec 2007 14:03:48 -0000 To: httpcomponents-commits@jakarta.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071215140349.4D3471A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Sat Dec 15 06:03:47 2007 New Revision: 604430 URL: http://svn.apache.org/viewvc?rev=604430&view=rev Log: Moved SSL I/O event dispatch impls to o.a.h.impl.nio package Added: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java - copied, changed from r604429, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLClientIOEventDispatch.java jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java - copied, changed from r604429, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLServerIOEventDispatch.java Removed: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLClientIOEventDispatch.java jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLServerIOEventDispatch.java Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpSSLClient.java jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpSSLServer.java jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLClient.java jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLServer.java Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpSSLClient.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpSSLClient.java?rev=604430&r1=604429&r2=604430&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpSSLClient.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpSSLClient.java Sat Dec 15 06:03:47 2007 @@ -42,8 +42,8 @@ import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; import org.apache.http.impl.DefaultConnectionReuseStrategy; +import org.apache.http.impl.nio.SSLClientIOEventDispatch; import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor; -import org.apache.http.impl.nio.reactor.SSLClientIOEventDispatch; import org.apache.http.message.BasicHttpRequest; import org.apache.http.nio.NHttpConnection; import org.apache.http.nio.protocol.BufferingHttpClientHandler; Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpSSLServer.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpSSLServer.java?rev=604430&r1=604429&r2=604430&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpSSLServer.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpSSLServer.java Sat Dec 15 06:03:47 2007 @@ -58,8 +58,8 @@ import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.DefaultHttpResponseFactory; import org.apache.http.params.BasicHttpParams; +import org.apache.http.impl.nio.SSLServerIOEventDispatch; import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor; -import org.apache.http.impl.nio.reactor.SSLServerIOEventDispatch; import org.apache.http.nio.NHttpConnection; import org.apache.http.nio.protocol.EventListener; import org.apache.http.nio.protocol.BufferingHttpServiceHandler; Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java (from r604429, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLClientIOEventDispatch.java) URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java?p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLClientIOEventDispatch.java&r1=604429&r2=604430&rev=604430&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLClientIOEventDispatch.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java Sat Dec 15 06:03:47 2007 @@ -29,7 +29,7 @@ * */ -package org.apache.http.impl.nio.reactor; +package org.apache.http.impl.nio; import java.io.IOException; @@ -38,7 +38,9 @@ import org.apache.http.HttpResponseFactory; import org.apache.http.impl.DefaultHttpResponseFactory; -import org.apache.http.impl.nio.DefaultNHttpClientConnection; +import org.apache.http.impl.nio.reactor.SSLIOSession; +import org.apache.http.impl.nio.reactor.SSLIOSessionHandler; +import org.apache.http.impl.nio.reactor.SSLMode; import org.apache.http.nio.NHttpClientHandler; import org.apache.http.nio.NHttpClientIOTarget; import org.apache.http.nio.reactor.IOEventDispatch; Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java (from r604429, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLServerIOEventDispatch.java) URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java?p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLServerIOEventDispatch.java&r1=604429&r2=604430&rev=604430&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLServerIOEventDispatch.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java Sat Dec 15 06:03:47 2007 @@ -29,7 +29,7 @@ * */ -package org.apache.http.impl.nio.reactor; +package org.apache.http.impl.nio; import java.io.IOException; @@ -38,7 +38,9 @@ import org.apache.http.HttpRequestFactory; import org.apache.http.impl.DefaultHttpRequestFactory; -import org.apache.http.impl.nio.DefaultNHttpServerConnection; +import org.apache.http.impl.nio.reactor.SSLIOSession; +import org.apache.http.impl.nio.reactor.SSLIOSessionHandler; +import org.apache.http.impl.nio.reactor.SSLMode; import org.apache.http.nio.NHttpServerIOTarget; import org.apache.http.nio.NHttpServiceHandler; import org.apache.http.nio.reactor.IOEventDispatch; Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLClient.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLClient.java?rev=604430&r1=604429&r2=604430&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLClient.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLClient.java Sat Dec 15 06:03:47 2007 @@ -40,8 +40,8 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; +import org.apache.http.impl.nio.SSLClientIOEventDispatch; import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor; -import org.apache.http.impl.nio.reactor.SSLClientIOEventDispatch; import org.apache.http.nio.NHttpClientHandler; import org.apache.http.nio.reactor.ConnectingIOReactor; import org.apache.http.nio.reactor.IOEventDispatch; Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLServer.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLServer.java?rev=604430&r1=604429&r2=604430&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLServer.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLServer.java Sat Dec 15 06:03:47 2007 @@ -40,8 +40,8 @@ import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; +import org.apache.http.impl.nio.SSLServerIOEventDispatch; import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor; -import org.apache.http.impl.nio.reactor.SSLServerIOEventDispatch; import org.apache.http.nio.NHttpServiceHandler; import org.apache.http.nio.reactor.IOEventDispatch; import org.apache.http.nio.reactor.ListenerEndpoint;