Return-Path: Delivered-To: apmail-jakarta-httpclient-commits-archive@www.apache.org Received: (qmail 43068 invoked from network); 29 Sep 2006 20:08:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 29 Sep 2006 20:08:31 -0000 Received: (qmail 42440 invoked by uid 500); 29 Sep 2006 20:08:31 -0000 Mailing-List: contact httpclient-commits-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: httpclient-dev@jakarta.apache.org Delivered-To: mailing list httpclient-commits@jakarta.apache.org Received: (qmail 42429 invoked by uid 99); 29 Sep 2006 20:08:31 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Sep 2006 13:08:31 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:53303] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id A9/AC-13110-81D7D154 for ; Fri, 29 Sep 2006 13:07:57 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E121C1A984A; Fri, 29 Sep 2006 13:06:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r451412 - in /jakarta/httpcomponents/httpclient/trunk/src: java/org/apache/http/conn/ java/org/apache/http/conn/ssl/ test/org/apache/http/conn/ Date: Fri, 29 Sep 2006 20:06:45 -0000 To: httpclient-commits@jakarta.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060929200645.E121C1A984A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: olegk Date: Fri Sep 29 13:06:44 2006 New Revision: 451412 URL: http://svn.apache.org/viewvc?view=rev&rev=451412 Log: [HTTPCORE-14] Consider decoupling HttpHost and Scheme and moving Scheme, SocketFactory and SecureSocketFactory to HttpConn Changelog: ---------- * Moved Scheme, SocketFactory, SecureSocketFactory and related classes to HttpConn Added: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/PlainSocketFactory.java jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/Scheme.java jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SecureSocketFactory.java jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SocketFactory.java jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/PlainSocketFactory.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/PlainSocketFactory.java?view=diff&rev=451412&r1=451411&r2=451412 ============================================================================== --- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/PlainSocketFactory.java (original) +++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/PlainSocketFactory.java Fri Sep 29 13:06:44 2006 @@ -27,14 +27,13 @@ * */ -package org.apache.http.impl.io; +package org.apache.http.conn; import java.io.IOException; import java.net.InetAddress; import java.net.Socket; import java.net.UnknownHostException; -import org.apache.http.io.SocketFactory; import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpParams; Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/Scheme.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/Scheme.java?view=diff&rev=451412&r1=451411&r2=451412 ============================================================================== --- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/Scheme.java (original) +++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/Scheme.java Fri Sep 29 13:06:44 2006 @@ -26,15 +26,13 @@ * . * */ -package org.apache.http; +package org.apache.http.conn; import java.util.Collections; import java.util.HashMap; import java.util.Map; import org.apache.http.io.CharArrayBuffer; -import org.apache.http.io.SecureSocketFactory; -import org.apache.http.io.SocketFactory; import org.apache.http.util.LangUtils; /** Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SecureSocketFactory.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SecureSocketFactory.java?view=diff&rev=451412&r1=451411&r2=451412 ============================================================================== --- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SecureSocketFactory.java (original) +++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SecureSocketFactory.java Fri Sep 29 13:06:44 2006 @@ -27,7 +27,7 @@ * */ -package org.apache.http.io; +package org.apache.http.conn; import java.io.IOException; import java.net.Socket; Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SocketFactory.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SocketFactory.java?view=diff&rev=451412&r1=451411&r2=451412 ============================================================================== --- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SocketFactory.java (original) +++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SocketFactory.java Fri Sep 29 13:06:44 2006 @@ -27,7 +27,7 @@ * */ -package org.apache.http.io; +package org.apache.http.conn; import java.io.IOException; import java.net.InetAddress; @@ -35,7 +35,6 @@ import java.net.UnknownHostException; import org.apache.http.ConnectTimeoutException; -import org.apache.http.Scheme; import org.apache.http.params.HttpParams; /** Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java?view=diff&rev=451412&r1=451411&r2=451412 ============================================================================== --- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java (original) +++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java Fri Sep 29 13:06:44 2006 @@ -49,7 +49,7 @@ import javax.net.ssl.TrustManagerFactory; import org.apache.http.ConnectTimeoutException; -import org.apache.http.io.SecureSocketFactory; +import org.apache.http.conn.SecureSocketFactory; import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpParams;