You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ro...@apache.org on 2007/02/11 12:32:01 UTC
svn commit: r505893 - in /jakarta/httpcomponents/httpcore/trunk: ./
module-main/ module-main/src/examples/org/apache/http/examples/
module-main/src/main/java/org/apache/http/impl/
module-main/src/main/java/org/apache/http/impl/params/ module-main/src/m...
Author: rolandw
Date: Sun Feb 11 03:31:59 2007
New Revision: 505893
URL: http://svn.apache.org/viewvc?view=rev&rev=505893
Log:
HTTPCORE-40
Added:
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/params/BasicHttpParams.java
- copied, changed from r505861, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/params/DefaultHttpParams.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/HeaderGroup.java
- copied, changed from r505861, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/HeaderGroup.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestHeaderGroup.java
- copied, changed from r505861, jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHeaderGroup.java
Removed:
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/HeaderGroup.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/params/DefaultHttpParams.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHeaderGroup.java
Modified:
jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
jakarta/httpcomponents/httpcore/trunk/module-main/build.xml
jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpGet.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpPost.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpServer.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/AbstractHttpMessage.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestAllImpl.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHttpDataReceiverAndTransmitter.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestAbstractMessage.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestAllUtil.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/AsyncHttpServer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/ElementalEchoServer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/mockup/TestHttpServiceBase.java
jakarta/httpcomponents/httpcore/trunk/module-niossl/src/examples/org/apache/http/examples/nio/NHttpSSLServer.java
jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/mockup/TestHttpSSLServiceBase.java
jakarta/httpcomponents/httpcore/trunk/src/contrib/org/apache/http/contrib/benchmark/HttpBenchmark.java
Modified: jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt (original)
+++ jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt Sun Feb 11 03:31:59 2007
@@ -1,6 +1,9 @@
Changes since release 4.0 Alpha 3
-------------------
+* [HTTPCORE-40]: API classes no longer reference impl classes in module-main.
+ Contributed by Roland Weber <rolandw at apache.org>
+
* [HTTPCORE-39]: Refactored HttpStatus, spun off [English]ReasonPhraseFactory.
Contributed by Roland Weber <rolandw at apache.org>
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/build.xml
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/build.xml?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/build.xml (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/build.xml Sun Feb 11 03:31:59 2007
@@ -153,6 +153,22 @@
<src>
<pathelement location="${comp.core.main.src}"/>
</src>
+ <exclude name="org/apache/http/impl/**" />
+ </javac>
+
+ <javac destdir ="${build.core.main.classes}"
+ debug ="${compile.debug}"
+ deprecation ="${compile.deprecation}"
+ optimize ="${compile.optimize}"
+ encoding ="UTF-8"
+ source ="${compile.core.main.source}"
+ target ="${compile.core.main.target}"
+ sourcepath =""
+ >
+ <src>
+ <pathelement location="${comp.core.main.src}"/>
+ </src>
+ <include name="org/apache/http/impl/**" />
</javac>
</target>
<target name="clean-src">
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpGet.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpGet.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpGet.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpGet.java Sun Feb 11 03:31:59 2007
@@ -39,7 +39,7 @@
import org.apache.http.HttpVersion;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpClientConnection;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.message.HttpGet;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
@@ -67,7 +67,7 @@
public static void main(String[] args) throws Exception {
- HttpParams params = new DefaultHttpParams(null);
+ HttpParams params = new BasicHttpParams(null);
HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
HttpProtocolParams.setContentCharset(params, "UTF-8");
HttpProtocolParams.setUserAgent(params, "Jakarta-HttpComponents/1.1");
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpPost.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpPost.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpPost.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpPost.java Sun Feb 11 03:31:59 2007
@@ -44,7 +44,7 @@
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpClientConnection;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.message.HttpPost;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
@@ -72,7 +72,7 @@
public static void main(String[] args) throws Exception {
- HttpParams params = new DefaultHttpParams(null);
+ HttpParams params = new BasicHttpParams(null);
HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
HttpProtocolParams.setContentCharset(params, "UTF-8");
HttpProtocolParams.setUserAgent(params, "Jakarta-HttpComponents/1.1");
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpServer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpServer.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpServer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/examples/org/apache/http/examples/ElementalHttpServer.java Sun Feb 11 03:31:59 2007
@@ -55,7 +55,7 @@
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
import org.apache.http.impl.DefaultHttpServerConnection;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
@@ -175,7 +175,7 @@
public RequestListenerThread(int port, final String docroot) throws IOException {
this.serversocket = new ServerSocket(port);
- this.params = new DefaultHttpParams(null);
+ this.params = new BasicHttpParams(null);
this.params
.setIntParameter(HttpConnectionParams.SO_TIMEOUT, 5000)
.setIntParameter(HttpConnectionParams.SOCKET_BUFFER_SIZE, 8 * 1024)
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/AbstractHttpMessage.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/AbstractHttpMessage.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/AbstractHttpMessage.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/AbstractHttpMessage.java Sun Feb 11 03:31:59 2007
@@ -35,9 +35,9 @@
import org.apache.http.Header;
import org.apache.http.HttpMessage;
-import org.apache.http.impl.params.DefaultHttpParams;
-import org.apache.http.impl.HeaderGroup;
+import org.apache.http.util.HeaderGroup;
import org.apache.http.params.HttpParams;
+import org.apache.http.params.BasicHttpParams;
/**
* Basic implementation of an HTTP message that can be modified.
@@ -57,7 +57,7 @@
protected AbstractHttpMessage() {
super();
this.headergroup = new HeaderGroup();
- this.params = new DefaultHttpParams(null);
+ this.params = new BasicHttpParams(null);
}
public boolean containsHeader(String name) {
Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/params/BasicHttpParams.java (from r505861, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/params/DefaultHttpParams.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/params/BasicHttpParams.java?view=diff&rev=505893&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/params/DefaultHttpParams.java&r1=505861&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/params/BasicHttpParams.java&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/params/DefaultHttpParams.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/params/BasicHttpParams.java Sun Feb 11 03:31:59 2007
@@ -29,7 +29,7 @@
*
*/
-package org.apache.http.impl.params;
+package org.apache.http.params;
import java.io.Serializable;
import java.util.HashMap;
@@ -47,14 +47,14 @@
*
* @version $Revision$
*/
-public class DefaultHttpParams implements HttpParams, Serializable {
+public class BasicHttpParams implements HttpParams, Serializable {
- static final long serialVersionUID = -8296449161405728403L;
+ static final long serialVersionUID = -8296449161405728403L;
- /** The set of default values to defer to */
+ /** The set of default values to defer to. */
private HttpParams defaults = null;
- /** Hash map of HTTP parameters that this collection contains */
+ /** Map of HTTP parameters that this collection contains. */
private HashMap parameters = null;
/**
@@ -66,12 +66,12 @@
* @param defaults the parent collection to defer to, if a parameter
* is not explictly set in the collection itself.
*/
- public DefaultHttpParams(final HttpParams defaults) {
+ public BasicHttpParams(final HttpParams defaults) {
super();
this.defaults = defaults;
}
- public DefaultHttpParams() {
+ public BasicHttpParams() {
this(null);
}
Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/HeaderGroup.java (from r505861, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/HeaderGroup.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/HeaderGroup.java?view=diff&rev=505893&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/HeaderGroup.java&r1=505861&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/HeaderGroup.java&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/HeaderGroup.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/HeaderGroup.java Sun Feb 11 03:31:59 2007
@@ -29,7 +29,7 @@
*
*/
-package org.apache.http.impl;
+package org.apache.http.util;
import java.util.ArrayList;
import java.util.Iterator;
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestAllImpl.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestAllImpl.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestAllImpl.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestAllImpl.java Sun Feb 11 03:31:59 2007
@@ -40,7 +40,6 @@
public static Test suite() {
TestSuite suite = new TestSuite();
- suite.addTest(TestHeaderGroup.suite());
suite.addTest(TestHttpDataReceiverAndTransmitter.suite());
suite.addTest(TestDefaultConnectionReuseStrategy.suite());
suite.addTest(TestEnglishReasonPhraseCatalog.suite());
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHttpDataReceiverAndTransmitter.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHttpDataReceiverAndTransmitter.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHttpDataReceiverAndTransmitter.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHttpDataReceiverAndTransmitter.java Sun Feb 11 03:31:59 2007
@@ -39,7 +39,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.mockup.HttpDataReceiverMockup;
import org.apache.http.mockup.HttpDataTransmitterMockup;
import org.apache.http.params.HttpConnectionParams;
@@ -313,7 +313,7 @@
}
public void testLineLimit() throws Exception {
- HttpParams params = new DefaultHttpParams();
+ HttpParams params = new BasicHttpParams();
String s = "a very looooooooooooooooooooooooooooooooooooooong line\r\n ";
byte[] tmp = s.getBytes("US-ASCII");
HttpDataReceiverMockup receiver1 = new HttpDataReceiverMockup(tmp, 5);
@@ -358,7 +358,7 @@
String s2 = constructString(RUSSIAN_HELLO);
String s3 = "Like hello and stuff";
- HttpParams params = new DefaultHttpParams(null);
+ HttpParams params = new BasicHttpParams(null);
HttpProtocolParams.setHttpElementCharset(params, "UTF-8");
HttpDataTransmitterMockup transmitter = new HttpDataTransmitterMockup();
@@ -394,7 +394,7 @@
public void testNonAsciiReadWriteLine() throws Exception {
String s1 = constructString(SWISS_GERMAN_HELLO);
- HttpParams params = new DefaultHttpParams(null);
+ HttpParams params = new BasicHttpParams(null);
HttpProtocolParams.setHttpElementCharset(params, HTTP.ISO_8859_1);
HttpDataTransmitterMockup transmitter = new HttpDataTransmitterMockup();
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestAbstractMessage.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestAbstractMessage.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestAbstractMessage.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestAbstractMessage.java Sun Feb 11 03:31:59 2007
@@ -33,7 +33,7 @@
import org.apache.http.Header;
import org.apache.http.HttpMessage;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.mockup.HttpMessageMockup;
import org.apache.http.params.HttpParams;
@@ -131,7 +131,7 @@
public void testParameters() {
HttpMessage message = new HttpMessageMockup();
assertNotNull(message.getParams());
- HttpParams params = new DefaultHttpParams();
+ HttpParams params = new BasicHttpParams();
message.setParams(params);
assertTrue(params == message.getParams());
}
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestAllUtil.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestAllUtil.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestAllUtil.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestAllUtil.java Sun Feb 11 03:31:59 2007
@@ -46,6 +46,7 @@
suite.addTest(TestDateUtils.suite());
suite.addTest(TestEntityUtils.suite());
suite.addTest(TestHeaderUtils.suite());
+ suite.addTest(TestHeaderGroup.suite());
suite.addTest(TestByteArrayBuffer.suite());
suite.addTest(TestCharArrayBuffer.suite());
return suite;
Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestHeaderGroup.java (from r505861, jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHeaderGroup.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestHeaderGroup.java?view=diff&rev=505893&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHeaderGroup.java&r1=505861&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestHeaderGroup.java&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHeaderGroup.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestHeaderGroup.java Sun Feb 11 03:31:59 2007
@@ -29,7 +29,7 @@
*
*/
-package org.apache.http.impl;
+package org.apache.http.util;
import java.util.Iterator;
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/AsyncHttpServer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/AsyncHttpServer.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/AsyncHttpServer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/AsyncHttpServer.java Sun Feb 11 03:31:59 2007
@@ -21,7 +21,7 @@
import org.apache.http.entity.FileEntity;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.util.concurrent.Executor;
import org.apache.http.impl.nio.DefaultServerIOEventDispatch;
import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor;
@@ -50,7 +50,7 @@
System.err.println("Please specify document root directory");
System.exit(1);
}
- HttpParams params = new DefaultHttpParams(null);
+ HttpParams params = new BasicHttpParams(null);
params
.setIntParameter(HttpConnectionParams.SO_TIMEOUT, 5000)
.setIntParameter(HttpConnectionParams.SOCKET_BUFFER_SIZE, 8 * 1024)
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/ElementalEchoServer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/ElementalEchoServer.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/ElementalEchoServer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/ElementalEchoServer.java Sun Feb 11 03:31:59 2007
@@ -5,7 +5,7 @@
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor;
import org.apache.http.nio.reactor.EventMask;
import org.apache.http.nio.reactor.IOEventDispatch;
@@ -16,7 +16,7 @@
public class ElementalEchoServer {
public static void main(String[] args) throws Exception {
- HttpParams params = new DefaultHttpParams();
+ HttpParams params = new BasicHttpParams();
IOEventDispatch ioEventDispatch = new DefaultIoEventDispatch();
ListeningIOReactor ioReactor = new DefaultListeningIOReactor(2, params);
ioReactor.listen(new InetSocketAddress(8080));
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java Sun Feb 11 03:31:59 2007
@@ -11,7 +11,7 @@
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.message.HttpGet;
import org.apache.http.impl.nio.DefaultClientIOEventDispatch;
import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
@@ -37,7 +37,7 @@
public class NHttpClient {
public static void main(String[] args) throws Exception {
- HttpParams params = new DefaultHttpParams(null);
+ HttpParams params = new BasicHttpParams(null);
params
.setIntParameter(HttpConnectionParams.SO_TIMEOUT, 5000)
.setIntParameter(HttpConnectionParams.CONNECTION_TIMEOUT, 10000)
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java Sun Feb 11 03:31:59 2007
@@ -21,7 +21,7 @@
import org.apache.http.entity.FileEntity;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.impl.nio.DefaultServerIOEventDispatch;
import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor;
import org.apache.http.nio.protocol.EventListener;
@@ -48,7 +48,7 @@
System.err.println("Please specify document root directory");
System.exit(1);
}
- HttpParams params = new DefaultHttpParams(null);
+ HttpParams params = new BasicHttpParams(null);
params
.setIntParameter(HttpConnectionParams.SO_TIMEOUT, 5000)
.setIntParameter(HttpConnectionParams.SOCKET_BUFFER_SIZE, 8 * 1024)
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java Sun Feb 11 03:31:59 2007
@@ -42,7 +42,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.impl.nio.reactor.SessionInputBuffer;
import org.apache.http.impl.nio.reactor.SessionOutputBuffer;
import org.apache.http.params.HttpParams;
@@ -322,7 +322,7 @@
String s2 = constructString(RUSSIAN_HELLO);
String s3 = "Like hello and stuff";
- HttpParams params = new DefaultHttpParams(null);
+ HttpParams params = new BasicHttpParams(null);
HttpProtocolParams.setHttpElementCharset(params, "UTF-8");
SessionOutputBuffer outbuf = new SessionOutputBuffer(1024, 16);
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/mockup/TestHttpServiceBase.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/mockup/TestHttpServiceBase.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/mockup/TestHttpServiceBase.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/mockup/TestHttpServiceBase.java Sun Feb 11 03:31:59 2007
@@ -35,7 +35,7 @@
import java.net.InetAddress;
import org.apache.http.HttpException;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.nio.protocol.EventListener;
import org.apache.http.nio.reactor.IOReactor;
import org.apache.http.params.HttpParams;
@@ -52,7 +52,7 @@
public TestHttpServiceBase() {
super();
this.mutex = new Object();
- this.params = new DefaultHttpParams(null);
+ this.params = new BasicHttpParams(null);
}
protected abstract void execute() throws IOException;
Modified: jakarta/httpcomponents/httpcore/trunk/module-niossl/src/examples/org/apache/http/examples/nio/NHttpSSLServer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-niossl/src/examples/org/apache/http/examples/nio/NHttpSSLServer.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-niossl/src/examples/org/apache/http/examples/nio/NHttpSSLServer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-niossl/src/examples/org/apache/http/examples/nio/NHttpSSLServer.java Sun Feb 11 03:31:59 2007
@@ -58,7 +58,7 @@
import org.apache.http.entity.FileEntity;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor;
import org.apache.http.impl.nio.reactor.SSLServerIOEventDispatch;
import org.apache.http.nio.protocol.EventListener;
@@ -97,7 +97,7 @@
SSLContext sslcontext = SSLContext.getInstance("TLS");
sslcontext.init(keymanagers, null, null);
- HttpParams params = new DefaultHttpParams(null);
+ HttpParams params = new BasicHttpParams(null);
params
.setIntParameter(HttpConnectionParams.SO_TIMEOUT, 5000)
.setIntParameter(HttpConnectionParams.SOCKET_BUFFER_SIZE, 8 * 1024)
Modified: jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/mockup/TestHttpSSLServiceBase.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/mockup/TestHttpSSLServiceBase.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/mockup/TestHttpSSLServiceBase.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/mockup/TestHttpSSLServiceBase.java Sun Feb 11 03:31:59 2007
@@ -35,7 +35,7 @@
import java.net.InetAddress;
import org.apache.http.HttpException;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.nio.protocol.EventListener;
import org.apache.http.nio.reactor.IOReactor;
import org.apache.http.params.HttpParams;
@@ -52,7 +52,7 @@
public TestHttpSSLServiceBase() {
super();
this.mutex = new Object();
- this.params = new DefaultHttpParams(null);
+ this.params = new BasicHttpParams(null);
}
protected abstract void execute() throws IOException;
Modified: jakarta/httpcomponents/httpcore/trunk/src/contrib/org/apache/http/contrib/benchmark/HttpBenchmark.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/src/contrib/org/apache/http/contrib/benchmark/HttpBenchmark.java?view=diff&rev=505893&r1=505892&r2=505893
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/src/contrib/org/apache/http/contrib/benchmark/HttpBenchmark.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/src/contrib/org/apache/http/contrib/benchmark/HttpBenchmark.java Sun Feb 11 03:31:59 2007
@@ -44,7 +44,7 @@
import org.apache.http.HttpRequest;
import org.apache.http.HttpVersion;
import org.apache.http.entity.FileEntity;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.message.HttpGet;
import org.apache.http.message.HttpHead;
import org.apache.http.message.HttpPost;
@@ -68,7 +68,7 @@
public static void main(String[] args) throws Exception {
- HttpParams params = new DefaultHttpParams(null);
+ HttpParams params = new BasicHttpParams(null);
params.setParameter(HttpProtocolParams.PROTOCOL_VERSION, HttpVersion.HTTP_1_1)
.setParameter(HttpProtocolParams.USER_AGENT, "Jakarta-HttpComponents-Bench/1.1")
.setBooleanParameter(HttpProtocolParams.USE_EXPECT_CONTINUE, false)