[prev in list] [next in list] [prev in thread] [next in thread] 

List:       httpcomponents-commits
Subject:    svn commit: r451412 - in /jakarta/httpcomponents/httpclient/trunk/src:
From:       olegk () apache ! org
Date:       2006-09-29 20:06:45
Message-ID: 20060929200645.E121C1A984A () eris ! apache ! org
[Download RAW message or body]

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 @@
  * <http://www.apache.org/>.
  *
  */
-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;
 


[prev in list] [next in list] [prev in thread] [next in thread]