hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r179130 - in /jakarta/httpclient/trunk/http-common/src: java/org/apache/http/ java/org/apache/http/impl/ java/org/apache/http/impl/io/ java/org/apache/http/io/ test/org/apache/http/ test/org/apache/http/impl/ test/org/apache/http/mockup/
Date Mon, 30 May 2005 18:44:27 GMT
Author: olegk
Date: Mon May 30 11:44:26 2005
New Revision: 179130

URL: http://svn.apache.org/viewcvs?rev=179130&view=rev
Log:
Reorganized the package structure

Added:
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/DefaultHttpDataReceiverFactory.java
      - copied, changed from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpDataReceiverFactory.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/DefaultHttpDataTransmitterFactory.java
      - copied, changed from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpDataTransmitterFactory.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataReceiver.java
      - copied, changed from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOHttpDataReceiver.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataTransmitter.java
      - copied, changed from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOHttpDataTransmitter.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketFactory.java
      - copied, changed from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketFactory.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataReceiver.java
      - copied, changed from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketHttpDataReceiver.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataTransmitter.java
      - copied, changed from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketHttpDataTransmitter.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketFactory.java
      - copied, changed from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketFactory.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketHttpDataReceiver.java
      - copied, changed from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataReceiver.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketHttpDataTransmitter.java
      - copied, changed from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataTransmitter.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/SSLSocketFactory.java
      - copied, changed from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/SSLSocketFactory.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/SecureSocketFactory.java
      - copied, changed from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/SecureSocketFactory.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/SocketFactory.java
      - copied, changed from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/SocketFactory.java
Removed:
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/SecureSocketFactory.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/SocketFactory.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpDataReceiverFactory.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpDataTransmitterFactory.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOHttpDataReceiver.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOHttpDataTransmitter.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketFactory.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketHttpDataReceiver.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketHttpDataTransmitter.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketFactory.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataReceiver.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataTransmitter.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/SSLSocketFactory.java
Modified:
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/Protocol.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpClientConnection.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpProxyConnection.java
    jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java
    jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestNIOHttpTransmitterAndReceiver.java
    jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpDataReceiverMockup.java
    jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpDataTransmitterMockup.java

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/Protocol.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/Protocol.java?rev=179130&r1=179129&r2=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/Protocol.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/Protocol.java Mon May 30
11:44:26 2005
@@ -32,6 +32,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.http.io.SecureSocketFactory;
+import org.apache.http.io.SocketFactory;
 import org.apache.http.util.LangUtils;
 
 /**

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java?rev=179130&r1=179129&r2=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java
Mon May 30 11:44:26 2005
@@ -33,6 +33,8 @@
 import java.net.Socket;
 
 import org.apache.http.HttpConnection;
+import org.apache.http.impl.io.DefaultHttpDataReceiverFactory;
+import org.apache.http.impl.io.DefaultHttpDataTransmitterFactory;
 import org.apache.http.io.HttpDataReceiver;
 import org.apache.http.io.HttpDataReceiverFactory;
 import org.apache.http.io.HttpDataTransmitter;

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpClientConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpClientConnection.java?rev=179130&r1=179129&r2=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpClientConnection.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpClientConnection.java
Mon May 30 11:44:26 2005
@@ -47,12 +47,12 @@
 import org.apache.http.HttpVersion;
 import org.apache.http.NoHttpResponseException;
 import org.apache.http.ProtocolException;
-import org.apache.http.SocketFactory;
 import org.apache.http.StatusLine;
 import org.apache.http.impl.entity.DefaultEntityGenerator;
 import org.apache.http.impl.entity.DefaultEntityWriter;
 import org.apache.http.impl.entity.EntityGenerator;
 import org.apache.http.impl.entity.EntityWriter;
+import org.apache.http.io.SocketFactory;
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.util.HeadersParser;

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpProxyConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpProxyConnection.java?rev=179130&r1=179129&r2=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpProxyConnection.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpProxyConnection.java
Mon May 30 11:44:26 2005
@@ -37,8 +37,8 @@
 import org.apache.http.HttpProxyConnection;
 import org.apache.http.Protocol;
 import org.apache.http.ProxyHost;
-import org.apache.http.SecureSocketFactory;
-import org.apache.http.SocketFactory;
+import org.apache.http.io.SecureSocketFactory;
+import org.apache.http.io.SocketFactory;
 import org.apache.http.params.HttpParams;
 
 /**

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/DefaultHttpDataReceiverFactory.java
(from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpDataReceiverFactory.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/DefaultHttpDataReceiverFactory.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/DefaultHttpDataReceiverFactory.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpDataReceiverFactory.java&r1=179036&r2=179130&rev=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpDataReceiverFactory.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/DefaultHttpDataReceiverFactory.java
Mon May 30 11:44:26 2005
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.http.impl.io;
 
 import java.io.IOException;
 import java.net.Socket;

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/DefaultHttpDataTransmitterFactory.java
(from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpDataTransmitterFactory.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/DefaultHttpDataTransmitterFactory.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/DefaultHttpDataTransmitterFactory.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpDataTransmitterFactory.java&r1=179036&r2=179130&rev=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpDataTransmitterFactory.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/DefaultHttpDataTransmitterFactory.java
Mon May 30 11:44:26 2005
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.http.impl.io;
 
 import java.io.IOException;
 import java.net.Socket;

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataReceiver.java
(from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOHttpDataReceiver.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataReceiver.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataReceiver.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOHttpDataReceiver.java&r1=179036&r2=179130&rev=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOHttpDataReceiver.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataReceiver.java
Mon May 30 11:44:26 2005
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.http.impl.io;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataTransmitter.java
(from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOHttpDataTransmitter.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataTransmitter.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataTransmitter.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOHttpDataTransmitter.java&r1=179036&r2=179130&rev=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOHttpDataTransmitter.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataTransmitter.java
Mon May 30 11:44:26 2005
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.http.impl.io;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketFactory.java
(from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketFactory.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketFactory.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketFactory.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketFactory.java&r1=179036&r2=179130&rev=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketFactory.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketFactory.java
Mon May 30 11:44:26 2005
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.http.impl.io;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -37,7 +37,7 @@
 import java.nio.channels.SocketChannel;
 
 import org.apache.http.ConnectTimeoutException;
-import org.apache.http.SocketFactory;
+import org.apache.http.io.SocketFactory;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
 

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataReceiver.java
(from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketHttpDataReceiver.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataReceiver.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataReceiver.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketHttpDataReceiver.java&r1=179036&r2=179130&rev=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketHttpDataReceiver.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataReceiver.java
Mon May 30 11:44:26 2005
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.http.impl.io;
 
 import java.io.IOException;
 import java.net.Socket;

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataTransmitter.java
(from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketHttpDataTransmitter.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataTransmitter.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataTransmitter.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketHttpDataTransmitter.java&r1=179036&r2=179130&rev=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOSocketHttpDataTransmitter.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataTransmitter.java
Mon May 30 11:44:26 2005
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.http.impl.io;
 
 import java.io.IOException;
 import java.net.Socket;

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketFactory.java
(from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketFactory.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketFactory.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketFactory.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketFactory.java&r1=179036&r2=179130&rev=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketFactory.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketFactory.java
Mon May 30 11:44:26 2005
@@ -27,14 +27,14 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.http.impl.io;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
-import org.apache.http.SocketFactory;
+import org.apache.http.io.SocketFactory;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
 

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketHttpDataReceiver.java
(from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataReceiver.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketHttpDataReceiver.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketHttpDataReceiver.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataReceiver.java&r1=179036&r2=179130&rev=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataReceiver.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketHttpDataReceiver.java
Mon May 30 11:44:26 2005
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.http.impl.io;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketHttpDataTransmitter.java
(from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataTransmitter.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketHttpDataTransmitter.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketHttpDataTransmitter.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataTransmitter.java&r1=179036&r2=179130&rev=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/OldIOSocketHttpDataTransmitter.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketHttpDataTransmitter.java
Mon May 30 11:44:26 2005
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.http.impl.io;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/SSLSocketFactory.java
(from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/SSLSocketFactory.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/SSLSocketFactory.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/SSLSocketFactory.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/SSLSocketFactory.java&r1=179036&r2=179130&rev=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/SSLSocketFactory.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/SSLSocketFactory.java
Mon May 30 11:44:26 2005
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.http.impl.io;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -49,7 +49,7 @@
 import javax.net.ssl.TrustManagerFactory;
 
 import org.apache.http.ConnectTimeoutException;
-import org.apache.http.SecureSocketFactory;
+import org.apache.http.io.SecureSocketFactory;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
 

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/SecureSocketFactory.java
(from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/SecureSocketFactory.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/SecureSocketFactory.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/SecureSocketFactory.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/SecureSocketFactory.java&r1=179036&r2=179130&rev=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/SecureSocketFactory.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/SecureSocketFactory.java
Mon May 30 11:44:26 2005
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http;
+package org.apache.http.io;
 
 import java.io.IOException;
 import java.net.Socket;

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/SocketFactory.java
(from r179036, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/SocketFactory.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/SocketFactory.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/SocketFactory.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/SocketFactory.java&r1=179036&r2=179130&rev=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/SocketFactory.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/SocketFactory.java Mon
May 30 11:44:26 2005
@@ -27,13 +27,15 @@
  *
  */
 
-package org.apache.http;
+package org.apache.http.io;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
+import org.apache.http.ConnectTimeoutException;
+import org.apache.http.Protocol;
 import org.apache.http.params.HttpParams;
 
 /**

Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java?rev=179130&r1=179129&r2=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java (original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java Mon May
30 11:44:26 2005
@@ -29,8 +29,9 @@
 
 package org.apache.http;
 
-import org.apache.http.impl.NIOSocketFactory;
-import org.apache.http.impl.OldIOSocketFactory;
+import org.apache.http.impl.io.NIOSocketFactory;
+import org.apache.http.impl.io.OldIOSocketFactory;
+import org.apache.http.io.SocketFactory;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestNIOHttpTransmitterAndReceiver.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestNIOHttpTransmitterAndReceiver.java?rev=179130&r1=179129&r2=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestNIOHttpTransmitterAndReceiver.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestNIOHttpTransmitterAndReceiver.java
Mon May 30 11:44:26 2005
@@ -33,6 +33,8 @@
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 
+import org.apache.http.impl.io.NIOHttpDataReceiver;
+import org.apache.http.impl.io.NIOHttpDataTransmitter;
 import org.apache.http.io.HttpDataReceiver;
 import org.apache.http.io.HttpDataTransmitter;
 import org.apache.http.mockup.HttpDataReceiverMockup;

Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpDataReceiverMockup.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpDataReceiverMockup.java?rev=179130&r1=179129&r2=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpDataReceiverMockup.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpDataReceiverMockup.java
Mon May 30 11:44:26 2005
@@ -7,7 +7,7 @@
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 
-import org.apache.http.impl.NIOHttpDataReceiver;
+import org.apache.http.impl.io.NIOHttpDataReceiver;
 
 /**
  * {@link HttpDataInputStream} mockup implementation.

Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpDataTransmitterMockup.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpDataTransmitterMockup.java?rev=179130&r1=179129&r2=179130&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpDataTransmitterMockup.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/HttpDataTransmitterMockup.java
Mon May 30 11:44:26 2005
@@ -6,7 +6,7 @@
 import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
 
-import org.apache.http.impl.NIOHttpDataTransmitter;
+import org.apache.http.impl.io.NIOHttpDataTransmitter;
 
 /**
  * {@link HttpDataTransmitter} mockup implementation.



Mime
View raw message