You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2005/10/15 23:16:16 UTC
svn commit: r321494 - in /jakarta/httpclient/trunk:
coyote-httpconnector/src/tests/tests/performance/
http-common/src/java/org/apache/http/impl/io/
http-common/src/test/org/apache/http/impl/
http-common/src/test/org/apache/http/mockup/ http-common/src/...
Author: olegk
Date: Sat Oct 15 14:15:34 2005
New Revision: 321494
URL: http://svn.apache.org/viewcvs?rev=321494&view=rev
Log:
Move NIO related classes from HttpCommon to HttpNIO
Added:
jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOHttpDataReceiver.java
- copied, changed from r315053, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataReceiver.java
jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOHttpDataTransmitter.java
- copied, changed from r267282, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataTransmitter.java
jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOSocketHttpDataReceiver.java
- copied, changed from r267282, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataReceiver.java
jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOSocketHttpDataTransmitter.java
- copied, changed from r267282, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataTransmitter.java
jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/NIOHttpDataReceiverMockup.java
- copied, changed from r280907, jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/NIOHttpDataReceiverMockup.java
jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/NIOHttpDataTransmitterMockup.java
- copied, changed from r280907, jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/NIOHttpDataTransmitterMockup.java
jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/TestNIOHttpTransmitterAndReceiver.java
- copied, changed from r280907, jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestNIOHttpTransmitterAndReceiver.java
jakarta/httpclient/trunk/http-nio/src/test/tests/performance/ChunkedIOvsContentLengthDelimIOTest.java
- copied unchanged from r280920, jakarta/httpclient/trunk/http-common/src/test/tests/performance/ChunkedIOvsContentLengthDelimIOTest.java
jakarta/httpclient/trunk/http-nio/src/test/tests/performance/DefaultHttpDataReceiverFactory.java
- copied, changed from r280920, jakarta/httpclient/trunk/http-common/src/test/tests/performance/DefaultHttpDataReceiverFactory.java
jakarta/httpclient/trunk/http-nio/src/test/tests/performance/DefaultHttpDataTransmitterFactory.java
- copied, changed from r280920, jakarta/httpclient/trunk/http-common/src/test/tests/performance/DefaultHttpDataTransmitterFactory.java
jakarta/httpclient/trunk/http-nio/src/test/tests/performance/HttpNIOvsHttpOIOTest.java
- copied unchanged from r280920, jakarta/httpclient/trunk/http-common/src/test/tests/performance/HttpNIOvsHttpOIOTest.java
jakarta/httpclient/trunk/http-nio/src/test/tests/performance/NIOListenerThread.java
- copied unchanged from r234448, jakarta/httpclient/trunk/http-common/src/test/tests/performance/NIOListenerThread.java
jakarta/httpclient/trunk/http-nio/src/test/tests/performance/OldIOListenerThread.java
- copied unchanged from r234448, jakarta/httpclient/trunk/http-common/src/test/tests/performance/OldIOListenerThread.java
jakarta/httpclient/trunk/http-nio/src/test/tests/performance/RawNIOvsRawOIOTest.java
- copied unchanged from r234448, jakarta/httpclient/trunk/http-common/src/test/tests/performance/RawNIOvsRawOIOTest.java
jakarta/httpclient/trunk/http-nio/src/test/tests/performance/TestDataProcessor.java
- copied unchanged from r234448, jakarta/httpclient/trunk/http-common/src/test/tests/performance/TestDataProcessor.java
Removed:
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataReceiver.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataTransmitter.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataReceiver.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataTransmitter.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/NIOHttpDataReceiverMockup.java
jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/NIOHttpDataTransmitterMockup.java
jakarta/httpclient/trunk/http-common/src/test/tests/performance/ChunkedIOvsContentLengthDelimIOTest.java
jakarta/httpclient/trunk/http-common/src/test/tests/performance/DefaultHttpDataReceiverFactory.java
jakarta/httpclient/trunk/http-common/src/test/tests/performance/DefaultHttpDataTransmitterFactory.java
jakarta/httpclient/trunk/http-common/src/test/tests/performance/HttpNIOvsHttpOIOTest.java
jakarta/httpclient/trunk/http-common/src/test/tests/performance/NIOListenerThread.java
jakarta/httpclient/trunk/http-common/src/test/tests/performance/OldIOListenerThread.java
jakarta/httpclient/trunk/http-common/src/test/tests/performance/RawNIOvsRawOIOTest.java
jakarta/httpclient/trunk/http-common/src/test/tests/performance/TestDataProcessor.java
Modified:
jakarta/httpclient/trunk/coyote-httpconnector/src/tests/tests/performance/PerformanceTest.java
jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestAllImpl.java
Modified: jakarta/httpclient/trunk/coyote-httpconnector/src/tests/tests/performance/PerformanceTest.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/coyote-httpconnector/src/tests/tests/performance/PerformanceTest.java?rev=321494&r1=321493&r2=321494&view=diff
==============================================================================
--- jakarta/httpclient/trunk/coyote-httpconnector/src/tests/tests/performance/PerformanceTest.java (original)
+++ jakarta/httpclient/trunk/coyote-httpconnector/src/tests/tests/performance/PerformanceTest.java Sat Oct 15 14:15:34 2005
@@ -158,8 +158,6 @@
Thread.sleep(1000);
DefaultHttpClientConnection conn = new DefaultHttpClientConnection(host);
- conn.setReceiverFactory(new DefaultHttpDataReceiverFactory());
- conn.setTransmitterFactory(new DefaultHttpDataTransmitterFactory());
try {
for (int i = 0; i < requests.length; i++) {
test.execute(requests[i], conn, count);
Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestAllImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestAllImpl.java?rev=321494&r1=321493&r2=321494&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestAllImpl.java (original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestAllImpl.java Sat Oct 15 14:15:34 2005
@@ -39,7 +39,6 @@
public static Test suite() {
TestSuite suite = new TestSuite();
suite.addTest(TestHeaderGroup.suite());
- suite.addTest(TestNIOHttpTransmitterAndReceiver.suite());
suite.addTest(TestHttpDataReceiverAndTransmitter.suite());
suite.addTest(TestAutoCloseInputStream.suite());
suite.addTest(TestDefaultConnectionReuseStrategy.suite());
Copied: jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOHttpDataReceiver.java (from r315053, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataReceiver.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOHttpDataReceiver.java?p2=jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOHttpDataReceiver.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataReceiver.java&r1=315053&r2=321494&rev=321494&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataReceiver.java (original)
+++ jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOHttpDataReceiver.java Sat Oct 15 14:15:34 2005
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.impl.io;
+package org.apache.http.nio;
import java.io.IOException;
import java.nio.ByteBuffer;
Copied: jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOHttpDataTransmitter.java (from r267282, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataTransmitter.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOHttpDataTransmitter.java?p2=jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOHttpDataTransmitter.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataTransmitter.java&r1=267282&r2=321494&rev=321494&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOHttpDataTransmitter.java (original)
+++ jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOHttpDataTransmitter.java Sat Oct 15 14:15:34 2005
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.impl.io;
+package org.apache.http.nio;
import java.io.IOException;
import java.nio.ByteBuffer;
Copied: jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOSocketHttpDataReceiver.java (from r267282, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataReceiver.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOSocketHttpDataReceiver.java?p2=jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOSocketHttpDataReceiver.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataReceiver.java&r1=267282&r2=321494&rev=321494&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataReceiver.java (original)
+++ jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOSocketHttpDataReceiver.java Sat Oct 15 14:15:34 2005
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.impl.io;
+package org.apache.http.nio;
import java.io.IOException;
import java.net.Socket;
Copied: jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOSocketHttpDataTransmitter.java (from r267282, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataTransmitter.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOSocketHttpDataTransmitter.java?p2=jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOSocketHttpDataTransmitter.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataTransmitter.java&r1=267282&r2=321494&rev=321494&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketHttpDataTransmitter.java (original)
+++ jakarta/httpclient/trunk/http-nio/src/java/org/apache/http/nio/NIOSocketHttpDataTransmitter.java Sat Oct 15 14:15:34 2005
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.impl.io;
+package org.apache.http.nio;
import java.io.IOException;
import java.net.Socket;
Copied: jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/NIOHttpDataReceiverMockup.java (from r280907, jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/NIOHttpDataReceiverMockup.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/NIOHttpDataReceiverMockup.java?p2=jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/NIOHttpDataReceiverMockup.java&p1=jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/NIOHttpDataReceiverMockup.java&r1=280907&r2=321494&rev=321494&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/NIOHttpDataReceiverMockup.java (original)
+++ jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/NIOHttpDataReceiverMockup.java Sat Oct 15 14:15:34 2005
@@ -1,4 +1,4 @@
-package org.apache.http.mockup;
+package org.apache.http.nio.mockup;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -7,7 +7,7 @@
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
-import org.apache.http.impl.io.NIOHttpDataReceiver;
+import org.apache.http.nio.NIOHttpDataReceiver;
/**
* {@link HttpDataInputStream} mockup implementation.
Copied: jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/NIOHttpDataTransmitterMockup.java (from r280907, jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/NIOHttpDataTransmitterMockup.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/NIOHttpDataTransmitterMockup.java?p2=jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/NIOHttpDataTransmitterMockup.java&p1=jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/NIOHttpDataTransmitterMockup.java&r1=280907&r2=321494&rev=321494&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/mockup/NIOHttpDataTransmitterMockup.java (original)
+++ jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/NIOHttpDataTransmitterMockup.java Sat Oct 15 14:15:34 2005
@@ -1,4 +1,4 @@
-package org.apache.http.mockup;
+package org.apache.http.nio.mockup;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -6,7 +6,7 @@
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
-import org.apache.http.impl.io.NIOHttpDataTransmitter;
+import org.apache.http.nio.NIOHttpDataTransmitter;
/**
* {@link HttpDataTransmitter} mockup implementation.
Copied: jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/TestNIOHttpTransmitterAndReceiver.java (from r280907, jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestNIOHttpTransmitterAndReceiver.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/TestNIOHttpTransmitterAndReceiver.java?p2=jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/TestNIOHttpTransmitterAndReceiver.java&p1=jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestNIOHttpTransmitterAndReceiver.java&r1=280907&r2=321494&rev=321494&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/impl/TestNIOHttpTransmitterAndReceiver.java (original)
+++ jakarta/httpclient/trunk/http-nio/src/test/org/apache/http/nio/mockup/TestNIOHttpTransmitterAndReceiver.java Sat Oct 15 14:15:34 2005
@@ -26,17 +26,16 @@
*
*/
-package org.apache.http.impl;
+package org.apache.http.nio.mockup;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
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.mockup.NIOHttpDataReceiverMockup;
-import org.apache.http.mockup.NIOHttpDataTransmitterMockup;
+import org.apache.http.impl.DefaultHttpParams;
+import org.apache.http.nio.NIOHttpDataReceiver;
+import org.apache.http.nio.NIOHttpDataTransmitter;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
Copied: jakarta/httpclient/trunk/http-nio/src/test/tests/performance/DefaultHttpDataReceiverFactory.java (from r280920, jakarta/httpclient/trunk/http-common/src/test/tests/performance/DefaultHttpDataReceiverFactory.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-nio/src/test/tests/performance/DefaultHttpDataReceiverFactory.java?p2=jakarta/httpclient/trunk/http-nio/src/test/tests/performance/DefaultHttpDataReceiverFactory.java&p1=jakarta/httpclient/trunk/http-common/src/test/tests/performance/DefaultHttpDataReceiverFactory.java&r1=280920&r2=321494&rev=321494&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/tests/performance/DefaultHttpDataReceiverFactory.java (original)
+++ jakarta/httpclient/trunk/http-nio/src/test/tests/performance/DefaultHttpDataReceiverFactory.java Sat Oct 15 14:15:34 2005
@@ -34,10 +34,10 @@
import javax.net.ssl.SSLSocket;
-import org.apache.http.impl.io.NIOSocketHttpDataReceiver;
import org.apache.http.impl.io.SocketHttpDataReceiver;
import org.apache.http.io.HttpDataReceiver;
import org.apache.http.io.HttpDataReceiverFactory;
+import org.apache.http.nio.NIOSocketHttpDataReceiver;
/**
* <p>
Copied: jakarta/httpclient/trunk/http-nio/src/test/tests/performance/DefaultHttpDataTransmitterFactory.java (from r280920, jakarta/httpclient/trunk/http-common/src/test/tests/performance/DefaultHttpDataTransmitterFactory.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-nio/src/test/tests/performance/DefaultHttpDataTransmitterFactory.java?p2=jakarta/httpclient/trunk/http-nio/src/test/tests/performance/DefaultHttpDataTransmitterFactory.java&p1=jakarta/httpclient/trunk/http-common/src/test/tests/performance/DefaultHttpDataTransmitterFactory.java&r1=280920&r2=321494&rev=321494&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/tests/performance/DefaultHttpDataTransmitterFactory.java (original)
+++ jakarta/httpclient/trunk/http-nio/src/test/tests/performance/DefaultHttpDataTransmitterFactory.java Sat Oct 15 14:15:34 2005
@@ -34,10 +34,10 @@
import javax.net.ssl.SSLSocket;
-import org.apache.http.impl.io.NIOSocketHttpDataTransmitter;
import org.apache.http.impl.io.SocketHttpDataTransmitter;
import org.apache.http.io.HttpDataTransmitter;
import org.apache.http.io.HttpDataTransmitterFactory;
+import org.apache.http.nio.NIOSocketHttpDataTransmitter;
/**
* <p>