adapted examples to HTTPCORE-100, updated release notes

git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@558121 13f79535-47bb-0310-9956-ffa450edef68

RELEASE_NOTES.txt

@@ -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>
 

module-client/src/examples/org/apache/http/examples/client/ClientCustomContext.java

@@ -36,10 +36,12 @@ import org.apache.http.HttpResponse;
 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 @@ public class ClientCustomContext {
         // 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/"); 
 

module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java

@@ -35,7 +35,6 @@ import org.apache.http.HttpResponse;
 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.BasicHttpParams;
 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 class ClientMultiThreadedExecution {
         
         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;
         }

module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java

@@ -50,7 +50,7 @@ import org.apache.http.params.BasicHttpParams;
 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 @@ public class ManagerConnectDirect {
      * @return  a new, empty context
      */
     private final static HttpContext createContext() {
-        return new HttpExecutionContext(null);
+        return new BasicHttpContext(null);
     }
 
 } // class ManagerConnectDirect

module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java

@@ -51,7 +51,7 @@ import org.apache.http.params.BasicHttpParams;
 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 @@ public class ManagerConnectProxy {
      * @return  a new, empty context
      */
     private final static HttpContext createContext() {
-        return new HttpExecutionContext(null);
+        return new BasicHttpContext(null);
     }
 
 

module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java

@@ -49,7 +49,7 @@ import org.apache.http.params.BasicHttpParams;
 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 @@ public class OperatorConnectDirect {
      * @return  a new, empty context
      */
     private final static HttpContext createContext() {
-        return new HttpExecutionContext(null);
+        return new BasicHttpContext(null);
     }
 
 } // class OperatorConnectDirect

module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java

@@ -50,7 +50,7 @@ import org.apache.http.params.BasicHttpParams;
 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 @@ public class OperatorConnectProxy {
      * @return  a new, empty context
      */
     private final static HttpContext createContext() {
-        return new HttpExecutionContext(null);
+        return new BasicHttpContext(null);
     }