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:33:31 UTC
svn commit: r505895 - in /jakarta/httpcomponents/httpclient/trunk/src:
examples/org/apache/http/examples/client/
examples/org/apache/http/examples/conn/ java/org/apache/http/impl/conn/
test/org/apache/http/conn/ssl/ test/org/apache/http/cookie/ test/or...
Author: rolandw
Date: Sun Feb 11 03:33:30 2007
New Revision: 505895
URL: http://svn.apache.org/viewvc?view=rev&rev=505895
Log:
HTTPCORE-40
Modified:
jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java
jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java
jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java
jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java
jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java
jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java
jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/MultiThreadedHttpConnectionManager.java
jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/SimpleHttpConnectionManager.java
jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestSSLSocketFactory.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestCookiePolicy.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/client/TestDefaultResponseConsumedWatcher.java
Modified: jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java?view=diff&rev=505895&r1=505894&r2=505895
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java Sun Feb 11 03:33:30 2007
@@ -40,7 +40,7 @@
import org.apache.http.message.BasicHttpRequest;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.protocol.BasicHttpProcessor;
import org.apache.http.protocol.RequestConnControl;
import org.apache.http.protocol.RequestContent;
@@ -160,7 +160,7 @@
supportedSchemes.register(new Scheme("http", sf, 80));
// prepare parameters
- HttpParams params = new DefaultHttpParams();
+ HttpParams params = new BasicHttpParams();
HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
HttpProtocolParams.setContentCharset(params, "UTF-8");
HttpProtocolParams.setUserAgent(params, "Jakarta-HttpClient/4.0");
Modified: jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java?view=diff&rev=505895&r1=505894&r2=505895
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java Sun Feb 11 03:33:30 2007
@@ -40,7 +40,7 @@
import org.apache.http.message.BasicHttpRequest;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.protocol.BasicHttpProcessor;
import org.apache.http.protocol.RequestConnControl;
import org.apache.http.protocol.RequestContent;
@@ -174,7 +174,7 @@
supportedSchemes.register(new Scheme("https", sf, 80));
// prepare parameters
- HttpParams params = new DefaultHttpParams();
+ HttpParams params = new BasicHttpParams();
HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
HttpProtocolParams.setContentCharset(params, "UTF-8");
HttpProtocolParams.setUserAgent(params, "Jakarta-HttpClient/4.0");
Modified: jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java?view=diff&rev=505895&r1=505894&r2=505895
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java Sun Feb 11 03:33:30 2007
@@ -40,7 +40,7 @@
import org.apache.http.message.BasicHttpRequest;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpExecutionContext;
@@ -178,7 +178,7 @@
// Prepare parameters.
// Since this example doesn't use the full core framework,
// only few parameters are actually required.
- HttpParams params = new DefaultHttpParams();
+ HttpParams params = new BasicHttpParams();
HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
HttpProtocolParams.setUseExpectContinue(params, false);
defaultParameters = params;
Modified: jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java?view=diff&rev=505895&r1=505894&r2=505895
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java Sun Feb 11 03:33:30 2007
@@ -40,7 +40,7 @@
import org.apache.http.message.BasicHttpRequest;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpExecutionContext;
@@ -208,7 +208,7 @@
// Prepare parameters.
// Since this example doesn't use the full core framework,
// only few parameters are actually required.
- HttpParams params = new DefaultHttpParams();
+ HttpParams params = new BasicHttpParams();
HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
HttpProtocolParams.setUseExpectContinue(params, false);
defaultParameters = params;
Modified: jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java?view=diff&rev=505895&r1=505894&r2=505895
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java Sun Feb 11 03:33:30 2007
@@ -40,7 +40,7 @@
import org.apache.http.message.BasicHttpRequest;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpExecutionContext;
@@ -153,7 +153,7 @@
// Prepare parameters.
// Since this example doesn't use the full core framework,
// only few parameters are actually required.
- HttpParams params = new DefaultHttpParams();
+ HttpParams params = new BasicHttpParams();
HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
HttpProtocolParams.setUseExpectContinue(params, false);
defaultParameters = params;
Modified: jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java?view=diff&rev=505895&r1=505894&r2=505895
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java Sun Feb 11 03:33:30 2007
@@ -40,7 +40,7 @@
import org.apache.http.message.BasicHttpRequest;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpExecutionContext;
@@ -187,7 +187,7 @@
// Prepare parameters.
// Since this example doesn't use the full core framework,
// only few parameters are actually required.
- HttpParams params = new DefaultHttpParams();
+ HttpParams params = new BasicHttpParams();
HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
HttpProtocolParams.setUseExpectContinue(params, false);
defaultParameters = params;
Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/MultiThreadedHttpConnectionManager.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/MultiThreadedHttpConnectionManager.java?view=diff&rev=505895&r1=505894&r2=505895
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/MultiThreadedHttpConnectionManager.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/MultiThreadedHttpConnectionManager.java Sun Feb 11 03:33:30 2007
@@ -54,7 +54,7 @@
import org.apache.http.conn.HttpConnectionManager;
import org.apache.http.conn.HttpHostConnection;
import org.apache.http.conn.params.HttpConnectionManagerParams;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
/**
@@ -233,7 +233,7 @@
/**
* Collection of parameters associated with this connection manager.
*/
- private HttpParams params = new DefaultHttpParams();
+ private HttpParams params = new BasicHttpParams();
/** Connection Pool */
private ConnectionPool connectionPool;
Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/SimpleHttpConnectionManager.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/SimpleHttpConnectionManager.java?view=diff&rev=505895&r1=505894&r2=505895
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/SimpleHttpConnectionManager.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/SimpleHttpConnectionManager.java Sun Feb 11 03:33:30 2007
@@ -40,7 +40,7 @@
import org.apache.http.conn.HostConfiguration;
import org.apache.http.conn.HttpConnectionManager;
import org.apache.http.conn.HttpHostConnection;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
/**
@@ -93,7 +93,7 @@
/**
* Collection of parameters associated with this connection manager.
*/
- private HttpParams params = new DefaultHttpParams();
+ private HttpParams params = new BasicHttpParams();
/**
* The time the connection was made idle.
Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java?view=diff&rev=505895&r1=505894&r2=505895
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java Sun Feb 11 03:33:30 2007
@@ -53,7 +53,7 @@
import org.apache.http.conn.ManagedClientConnection;
import org.apache.http.conn.OperatedClientConnection;
import org.apache.http.conn.params.HttpConnectionManagerParams;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HttpContext;
@@ -107,7 +107,7 @@
/** The parameters of this connection manager. */
- private HttpParams params = new DefaultHttpParams();
+ private HttpParams params = new BasicHttpParams();
/** The pool of connections being managed. */
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestSSLSocketFactory.java?view=diff&rev=505895&r1=505894&r2=505895
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestSSLSocketFactory.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestSSLSocketFactory.java Sun Feb 11 03:33:30 2007
@@ -34,7 +34,7 @@
import junit.framework.Test;
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.params.HttpParams;
import javax.net.ServerSocketFactory;
@@ -93,7 +93,7 @@
public void testToString() {}
public void testCreateSocket() throws Exception {
- HttpParams params = new DefaultHttpParams();
+ HttpParams params = new BasicHttpParams();
String password = "changeit";
char[] pwd = password.toCharArray();
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestCookiePolicy.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestCookiePolicy.java?view=diff&rev=505895&r1=505894&r2=505895
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestCookiePolicy.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestCookiePolicy.java Sun Feb 11 03:33:30 2007
@@ -35,7 +35,7 @@
import org.apache.http.impl.cookie.NetscapeDraftSpecFactory;
import org.apache.http.impl.cookie.RFC2109SpecFactory;
import org.apache.http.cookie.params.CookieSpecParams;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
import junit.framework.Test;
@@ -106,7 +106,7 @@
} catch (IllegalStateException ex) {
// expected
}
- HttpParams params = new DefaultHttpParams();
+ HttpParams params = new BasicHttpParams();
assertNotNull(CookiePolicy.getCookieSpec(CookieSpecParams.NETSCAPE, params));
assertNotNull(CookiePolicy.getCookieSpec(CookieSpecParams.RFC_2109, params));
assertNotNull(CookiePolicy.getCookieSpec(CookieSpecParams.BROWSER_COMPATIBILITY, params));
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/client/TestDefaultResponseConsumedWatcher.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/client/TestDefaultResponseConsumedWatcher.java?view=diff&rev=505895&r1=505894&r2=505895
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/client/TestDefaultResponseConsumedWatcher.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/client/TestDefaultResponseConsumedWatcher.java Sun Feb 11 03:33:30 2007
@@ -37,7 +37,7 @@
import org.apache.http.HttpResponse;
import org.apache.http.HttpVersion;
import org.apache.http.entity.BasicHttpEntity;
-import org.apache.http.impl.params.DefaultHttpParams;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.message.BasicHttpResponse;
import org.apache.http.mockup.HttpConnectionMockup;
import org.apache.http.protocol.HttpContext;
@@ -92,7 +92,7 @@
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_0, 200, "OK");
response.addHeader("Connection", "Close");
- response.setParams(new DefaultHttpParams(null));
+ response.setParams(new BasicHttpParams(null));
response.setEntity(entity);
// Wrap the entity input stream
@@ -115,7 +115,7 @@
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
response.addHeader("Connection", "Keep-alive");
- response.setParams(new DefaultHttpParams(null));
+ response.setParams(new BasicHttpParams(null));
response.setEntity(entity);
// Wrap the entity input stream