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/07/20 22:27:07 UTC
svn commit: r558121 - in /jakarta/httpcomponents/httpclient/trunk: ./
module-client/src/examples/org/apache/http/examples/client/
module-client/src/examples/org/apache/http/examples/conn/
Author: rolandw
Date: Fri Jul 20 13:27:05 2007
New Revision: 558121
URL: http://svn.apache.org/viewvc?view=rev&rev=558121
Log:
adapted examples to HTTPCORE-100, updated release notes
Modified:
jakarta/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientCustomContext.java
jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java
jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java
jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java
jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java
jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java
Modified: jakarta/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt?view=diff&rev=558121&r1=558120&r2=558121
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt (original)
+++ jakarta/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt Fri Jul 20 13:27:05 2007
@@ -1,5 +1,8 @@
Changes since release 4.0 Alpha 1
+* [HTTPCORE-100] revised HttpContext hierarchy
+ Contributed by Roland Weber <rolandw at apache.org>
+
* [HTTPCLIENT-618] eliminate class HostConfiguration
Contributed by Roland Weber <rolandw at apache.org>
Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientCustomContext.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientCustomContext.java?view=diff&rev=558121&r1=558120&r2=558121
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientCustomContext.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientCustomContext.java Fri Jul 20 13:27:05 2007
@@ -36,10 +36,12 @@
import org.apache.http.client.HttpClient;
import org.apache.http.client.HttpState;
import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.client.protocol.ClientContext;
import org.apache.http.cookie.Cookie;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.protocol.BasicHttpContext;
+
/**
* This example demonstrates the use of a local HTTP context populated with
@@ -57,9 +59,9 @@
// Obtain default HTTP context
HttpContext defaultContext = httpclient.getDefaultContext();
// Create local HTTP context
- HttpContext localContext = new HttpClientContext(defaultContext);
+ HttpContext localContext = new BasicHttpContext(defaultContext);
// Bind custom HTTP state to the local context
- localContext.setAttribute(HttpClientContext.HTTP_STATE, localState);
+ localContext.setAttribute(ClientContext.HTTP_STATE, localState);
HttpGet httpget = new HttpGet("http://www.google.com/");
Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java?view=diff&rev=558121&r1=558120&r2=558121
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java Fri Jul 20 13:27:05 2007
@@ -35,7 +35,6 @@
import org.apache.http.HttpVersion;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.PlainSocketFactory;
import org.apache.http.conn.Scheme;
@@ -48,6 +47,7 @@
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.protocol.BasicHttpContext;
import org.apache.http.util.EntityUtils;
/**
@@ -110,7 +110,7 @@
public GetThread(HttpClient httpClient, HttpGet httpget, int id) {
this.httpClient = httpClient;
- this.context = new HttpClientContext(httpClient.getDefaultContext());
+ this.context = new BasicHttpContext(httpClient.getDefaultContext());
this.httpget = httpget;
this.id = id;
}
Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java?view=diff&rev=558121&r1=558120&r2=558121
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java Fri Jul 20 13:27:05 2007
@@ -50,7 +50,7 @@
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.BasicHttpContext;
@@ -211,7 +211,7 @@
* @return a new, empty context
*/
private final static HttpContext createContext() {
- return new HttpExecutionContext(null);
+ return new BasicHttpContext(null);
}
} // class ManagerConnectDirect
Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java?view=diff&rev=558121&r1=558120&r2=558121
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java Fri Jul 20 13:27:05 2007
@@ -51,7 +51,7 @@
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.BasicHttpContext;
@@ -264,7 +264,7 @@
* @return a new, empty context
*/
private final static HttpContext createContext() {
- return new HttpExecutionContext(null);
+ return new BasicHttpContext(null);
}
Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java?view=diff&rev=558121&r1=558120&r2=558121
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java Fri Jul 20 13:27:05 2007
@@ -49,7 +49,7 @@
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.BasicHttpContext;
@@ -188,7 +188,7 @@
* @return a new, empty context
*/
private final static HttpContext createContext() {
- return new HttpExecutionContext(null);
+ return new BasicHttpContext(null);
}
} // class OperatorConnectDirect
Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java?view=diff&rev=558121&r1=558120&r2=558121
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java Fri Jul 20 13:27:05 2007
@@ -50,7 +50,7 @@
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.BasicHttpContext;
@@ -245,7 +245,7 @@
* @return a new, empty context
*/
private final static HttpContext createContext() {
- return new HttpExecutionContext(null);
+ return new BasicHttpContext(null);
}