hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rola...@apache.org
Subject svn commit: r558111 - in /jakarta/httpcomponents/httpcore/trunk: ./ contrib/src/main/java/org/apache/http/contrib/benchmark/ contrib/src/main/java/org/apache/http/contrib/compress/ module-main/src/examples/org/apache/http/examples/ module-main/src/main...
Date Fri, 20 Jul 2007 20:01:55 GMT
Author: rolandw
Date: Fri Jul 20 13:01:50 2007
New Revision: 558111

URL: http://svn.apache.org/viewvc?view=rev&rev=558111
Log:
HTTPCORE-100: revised HttpContext hierarchy

Added:
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/BasicHttpContext.java
      - copied, changed from r558089, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpExecutionContext.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/ExecutionContext.java
      - copied, changed from r558089, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpExecutionContext.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java
      - copied, changed from r558089, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/SyncHttpExecutionContext.java
Removed:
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpExecutionContext.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/SyncHttpExecutionContext.java
Modified:
    jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
    jakarta/httpcomponents/httpcore/trunk/contrib/src/main/java/org/apache/http/contrib/benchmark/BenchmarkWorker.java
    jakarta/httpcomponents/httpcore/trunk/contrib/src/main/java/org/apache/http/contrib/compress/ResponseGzipCompress.java
    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/impl/DefaultConnectionReuseStrategy.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpContext.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpService.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/RequestTargetHost.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/ResponseConnControl.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/mockup/TestHttpClient.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/mockup/TestHttpServer.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/protocol/TestStandardInterceptors.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/NHttpReverseProxy.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOHttp.java
    jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/reactor/TestNIOSSLHttp.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=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt (original)
+++ jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt Fri Jul 20 13:01:50 2007
@@ -1,5 +1,8 @@
 Changes since release 4.0 Alpha 5
 
+* [HTTPCORE-100] revised HttpContext hierarchy
+  Contributed by Roland Weber <rolandw at apache.org>
+
 * [HTTPCORE-103] NIO connections now attempt to consume all available session 
   data while parsing HTTP messages. This can  potentially improve performance 
   of non-blocking SSL connections.

Modified: jakarta/httpcomponents/httpcore/trunk/contrib/src/main/java/org/apache/http/contrib/benchmark/BenchmarkWorker.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/contrib/src/main/java/org/apache/http/contrib/benchmark/BenchmarkWorker.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/contrib/src/main/java/org/apache/http/contrib/benchmark/BenchmarkWorker.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/contrib/src/main/java/org/apache/http/contrib/benchmark/BenchmarkWorker.java Fri Jul 20 13:01:50 2007
@@ -53,7 +53,8 @@
 import org.apache.http.protocol.BasicHttpProcessor;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpRequestExecutor;
 import org.apache.http.protocol.RequestConnControl;
 import org.apache.http.protocol.RequestContent;
@@ -97,7 +98,7 @@
 
         super();
         this.params = params;
-        this.context = new HttpExecutionContext(null);
+        this.context = new BasicHttpContext(null);
         this.request = request;
         this.targetHost = targetHost;
         this.count = count;
@@ -130,9 +131,9 @@
         }
 
         // Populate the execution context
-        this.context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, conn);
-        this.context.setAttribute(HttpExecutionContext.HTTP_TARGET_HOST, this.targetHost);
-        this.context.setAttribute(HttpExecutionContext.HTTP_REQUEST, this.request);
+        this.context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
+        this.context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, this.targetHost);
+        this.context.setAttribute(ExecutionContext.HTTP_REQUEST, this.request);
 
         stats.start();
         HttpParamsLinker.link(this.request, this.params);

Modified: jakarta/httpcomponents/httpcore/trunk/contrib/src/main/java/org/apache/http/contrib/compress/ResponseGzipCompress.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/contrib/src/main/java/org/apache/http/contrib/compress/ResponseGzipCompress.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/contrib/src/main/java/org/apache/http/contrib/compress/ResponseGzipCompress.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/contrib/src/main/java/org/apache/http/contrib/compress/ResponseGzipCompress.java Fri Jul 20 13:01:50 2007
@@ -40,6 +40,7 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseInterceptor;
 import org.apache.http.protocol.HttpContext;
+import org.apache.http.protocol.ExecutionContext;
 
 /**
  * Server-side interceptor to handle Gzip-encoded responses.
@@ -62,7 +63,8 @@
         if (context == null) {
             throw new IllegalArgumentException("HTTP context may not be null");
         }
-        HttpRequest request = (HttpRequest) context.getAttribute(HttpContext.HTTP_REQUEST);
+        HttpRequest request = (HttpRequest)
+            context.getAttribute(ExecutionContext.HTTP_REQUEST);
         Header aeheader = request.getFirstHeader(ACCEPT_ENCODING);
         if (aeheader != null) {
             HeaderElement[] codecs = aeheader.getElements();

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=558111&r1=558110&r2=558111
==============================================================================
--- 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 Fri Jul 20 13:01:50 2007
@@ -45,7 +45,8 @@
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.BasicHttpProcessor;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpRequestExecutor;
 import org.apache.http.protocol.RequestConnControl;
 import org.apache.http.protocol.RequestContent;
@@ -84,14 +85,14 @@
 
         HttpRequestExecutor httpexecutor = new HttpRequestExecutor();
         
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpHost host = new HttpHost("localhost", 8080);
 
         DefaultHttpClientConnection conn = new DefaultHttpClientConnection();
         ConnectionReuseStrategy connStrategy = new DefaultConnectionReuseStrategy();
 
-        context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, conn);
-        context.setAttribute(HttpExecutionContext.HTTP_TARGET_HOST, host);
+        context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
+        context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, host);
 
         try {
             
@@ -108,7 +109,7 @@
                 BasicHttpRequest request = new BasicHttpRequest("GET", targets[i]);
                 System.out.println(">> Request URI: " + request.getRequestLine().getUri());
                 
-                context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request);
+                context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
                 request.setParams(params);
                 httpexecutor.preProcess(request, httpproc, context);
                 HttpResponse response = httpexecutor.execute(request, conn, context);

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=558111&r1=558110&r2=558111
==============================================================================
--- 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 Fri Jul 20 13:01:50 2007
@@ -50,7 +50,8 @@
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.BasicHttpProcessor;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpRequestExecutor;
 import org.apache.http.protocol.RequestConnControl;
 import org.apache.http.protocol.RequestContent;
@@ -89,15 +90,15 @@
         
         HttpRequestExecutor httpexecutor = new HttpRequestExecutor();
 
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         
         HttpHost host = new HttpHost("localhost", 8080);
         
         DefaultHttpClientConnection conn = new DefaultHttpClientConnection();
         ConnectionReuseStrategy connStrategy = new DefaultConnectionReuseStrategy();
 
-        context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, conn);
-        context.setAttribute(HttpExecutionContext.HTTP_TARGET_HOST, host);
+        context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
+        context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, host);
 
         try {
             
@@ -122,7 +123,7 @@
                 request.setEntity(requestBodies[i]);
                 System.out.println(">> Request URI: " + request.getRequestLine().getUri());
 
-                context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request);
+                context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
                 request.setParams(params);
                 httpexecutor.preProcess(request, httpproc, context);
                 HttpResponse response = httpexecutor.execute(request, conn, context);

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=558111&r1=558110&r2=558111
==============================================================================
--- 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 Fri Jul 20 13:01:50 2007
@@ -61,7 +61,7 @@
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.BasicHttpProcessor;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.protocol.HttpRequestHandler;
 import org.apache.http.protocol.HttpRequestHandlerRegistry;
 import org.apache.http.protocol.HttpService;
@@ -244,7 +244,7 @@
         
         public void run() {
             System.out.println("New connection thread");
-            HttpContext context = new HttpExecutionContext(null);
+            HttpContext context = new BasicHttpContext(null);
             try {
                 while (!Thread.interrupted() && this.conn.isOpen()) {
                     this.httpservice.handleRequest(this.conn, context);

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategy.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategy.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategy.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategy.java Fri Jul 20 13:01:50 2007
@@ -39,7 +39,7 @@
 import org.apache.http.HttpVersion;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.ExecutionContext;
 
 /**
  * Default implementation of a strategy deciding about connection re-use.
@@ -65,8 +65,8 @@
             throw new IllegalArgumentException("HTTP context may not be null");
         }
         
-        HttpConnection conn = (HttpConnection) context.getAttribute(
-                HttpExecutionContext.HTTP_CONNECTION);
+        HttpConnection conn = (HttpConnection)
+            context.getAttribute(ExecutionContext.HTTP_CONNECTION);
 
         if (conn != null && !conn.isOpen())
             return false;

Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/BasicHttpContext.java (from r558089, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpExecutionContext.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/BasicHttpContext.java?view=diff&rev=558111&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpExecutionContext.java&r1=558089&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/BasicHttpContext.java&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpExecutionContext.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/BasicHttpContext.java Fri Jul 20 13:01:50 2007
@@ -43,16 +43,12 @@
  * 
  * @since 4.0
  */
-public class HttpExecutionContext implements HttpContext {
-    
-    public static final String HTTP_TARGET_HOST = "http.target_host"; 
-    public static final String HTTP_PROXY_HOST  = "http.proxy_host"; 
-    public static final String HTTP_REQ_SENT    = "http.request_sent"; 
+public class BasicHttpContext implements HttpContext {
     
     private final HttpContext parentContext;
     private Map map = null;
     
-    public HttpExecutionContext(final HttpContext parentContext) {
+    public BasicHttpContext(final HttpContext parentContext) {
         super();
         this.parentContext = parentContext;
     }

Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/ExecutionContext.java (from r558089, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpExecutionContext.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/ExecutionContext.java?view=diff&rev=558111&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpExecutionContext.java&r1=558089&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/ExecutionContext.java&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpExecutionContext.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/ExecutionContext.java Fri Jul 20 13:01:50 2007
@@ -35,7 +35,7 @@
 import java.util.Map;
 
 /**
- * Default implementation of the {@link HttpContext HttpContext}.
+ * {@link HttpContext Context} attribute names for protocol execution.
  *
  * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
  *
@@ -43,53 +43,13 @@
  * 
  * @since 4.0
  */
-public class HttpExecutionContext implements HttpContext {
+public interface ExecutionContext {
     
+    public static final String HTTP_CONNECTION  = "http.connection"; 
+    public static final String HTTP_REQUEST     = "http.request"; 
+    public static final String HTTP_RESPONSE    = "http.response"; 
     public static final String HTTP_TARGET_HOST = "http.target_host"; 
     public static final String HTTP_PROXY_HOST  = "http.proxy_host"; 
     public static final String HTTP_REQ_SENT    = "http.request_sent"; 
-    
-    private final HttpContext parentContext;
-    private Map map = null;
-    
-    public HttpExecutionContext(final HttpContext parentContext) {
-        super();
-        this.parentContext = parentContext;
-    }
-    
-    public Object getAttribute(final String id) {
-        if (id == null) {
-            throw new IllegalArgumentException("Id may not be null");
-        }
-        Object obj = null;
-        if (this.map != null) {
-            obj = this.map.get(id);
-        }
-        if (obj == null && this.parentContext != null) {
-            obj = this.parentContext.getAttribute(id);
-        }
-        return obj;
-    }
-
-    public void setAttribute(final String id, final Object obj) {
-        if (id == null) {
-            throw new IllegalArgumentException("Id may not be null");
-        }
-        if (this.map == null) {
-            this.map = new HashMap();
-        }
-        this.map.put(id, obj);
-    }
-    
-    public Object removeAttribute(final String id) {
-        if (id == null) {
-            throw new IllegalArgumentException("Id may not be null");
-        }
-        if (this.map != null) {
-            return this.map.remove(id);
-        } else {
-            return null;
-        }
-    }
 
 }

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpContext.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpContext.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpContext.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpContext.java Fri Jul 20 13:01:50 2007
@@ -48,9 +48,6 @@
 
     /** The prefix reserved for use by HTTP components. "http." */
     public static final String RESERVED_PREFIX  = "http.";
-    public static final String HTTP_CONNECTION  = "http.connection"; 
-    public static final String HTTP_REQUEST     = "http.request"; 
-    public static final String HTTP_RESPONSE    = "http.response"; 
     
     Object getAttribute(String id);
 

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java Fri Jul 20 13:01:50 2007
@@ -195,7 +195,7 @@
         }
 
         HttpResponse response = null;
-        context.setAttribute(HttpExecutionContext.HTTP_REQ_SENT, Boolean.FALSE);
+        context.setAttribute(ExecutionContext.HTTP_REQ_SENT, Boolean.FALSE);
 
         conn.sendRequestHeader(request);
         if (request instanceof HttpEntityEnclosingRequest) {
@@ -236,7 +236,7 @@
             }
         }
         conn.flush();
-        context.setAttribute(HttpExecutionContext.HTTP_REQ_SENT, Boolean.TRUE);
+        context.setAttribute(ExecutionContext.HTTP_REQ_SENT, Boolean.TRUE);
         return response;
     } 
 

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpService.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpService.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpService.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpService.java Fri Jul 20 13:01:50 2007
@@ -125,7 +125,7 @@
             final HttpServerConnection conn, 
             final HttpContext context) throws IOException, HttpException { 
         
-        context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, conn);
+        context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
 
         HttpResponse response = null;
         
@@ -174,8 +174,8 @@
                 response = this.responseFactory.newHttpResponse(ver, HttpStatus.SC_OK, context);
                 HttpParamsLinker.link(request, this.params);
 
-                context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request);
-                context.setAttribute(HttpExecutionContext.HTTP_RESPONSE, response);
+                context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
+                context.setAttribute(ExecutionContext.HTTP_RESPONSE, response);
 
                 this.processor.process(request, context);
                 doService(request, response, context);

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/RequestTargetHost.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/RequestTargetHost.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/RequestTargetHost.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/RequestTargetHost.java Fri Jul 20 13:01:50 2007
@@ -65,7 +65,7 @@
         }
         if (!request.containsHeader(HTTP.TARGET_HOST)) {
             HttpHost targethost = (HttpHost) context
-                .getAttribute(HttpExecutionContext.HTTP_TARGET_HOST);
+                .getAttribute(ExecutionContext.HTTP_TARGET_HOST);
             if (targethost == null) {
                 HttpVersion ver = request.getRequestLine().getHttpVersion();
                 if (ver.lessEquals(HttpVersion.HTTP_1_0)) {

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/ResponseConnControl.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/ResponseConnControl.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/ResponseConnControl.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/ResponseConnControl.java Fri Jul 20 13:01:50 2007
@@ -91,7 +91,8 @@
             }
         }
         // Drop connection if requested by the client
-        HttpRequest request = (HttpRequest) context.getAttribute(HttpContext.HTTP_REQUEST);
+        HttpRequest request = (HttpRequest)
+            context.getAttribute(ExecutionContext.HTTP_REQUEST);
         if (request != null) {
             Header header = request.getFirstHeader(HTTP.CONN_DIRECTIVE);
             if (header != null) {

Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java (from r558089, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/SyncHttpExecutionContext.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java?view=diff&rev=558111&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/SyncHttpExecutionContext.java&r1=558089&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/SyncHttpExecutionContext.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java Fri Jul 20 13:01:50 2007
@@ -32,7 +32,7 @@
 package org.apache.http.protocol;
 
 /**
- * Thread-safe extension of the {@link HttpExecutionContext}.
+ * Thread-safe extension of the {@link BasicHttpContext}.
  *
  * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
  *
@@ -40,9 +40,9 @@
  * 
  * @since 4.0
  */
-public class SyncHttpExecutionContext extends HttpExecutionContext {
+public class SyncBasicHttpContext extends BasicHttpContext {
     
-    public SyncHttpExecutionContext(final HttpContext parentContext) {
+    public SyncBasicHttpContext(final HttpContext parentContext) {
         super(parentContext);
     }
     

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java Fri Jul 20 13:01:50 2007
@@ -40,7 +40,8 @@
 import org.apache.http.message.BasicHttpResponse;
 import org.apache.http.message.BasicStatusLine;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.ExecutionContext;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -73,8 +74,8 @@
         // open and not stale is required for most of the tests here
         mockConnection = new MockConnection(true, false);
         reuseStrategy = new DefaultConnectionReuseStrategy();
-        context = new HttpExecutionContext(null);
-        context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, mockConnection);
+        context = new BasicHttpContext(null);
+        context.setAttribute(ExecutionContext.HTTP_CONNECTION, mockConnection);
     }
 
     public void tearDown() {
@@ -90,7 +91,7 @@
 
     public void testIllegalResponseArg() throws Exception {
 
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
 
         try {
             reuseStrategy.keepAlive(null, context);
@@ -140,7 +141,7 @@
             createResponse(HttpVersion.HTTP_1_1, 200, "OK", true, -1);
 
         HttpConnection mockonn = new MockConnection(false, false);
-        context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, mockonn);
+        context.setAttribute(ExecutionContext.HTTP_CONNECTION, mockonn);
         assertFalse("closed connection should not be kept alive",
                     reuseStrategy.keepAlive(response, context));
     }
@@ -153,7 +154,7 @@
             createResponse(HttpVersion.HTTP_1_1, 200, "OK", true, -1);
 
         HttpConnection mockonn = new MockConnection(true, true);
-        context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, mockonn);
+        context.setAttribute(ExecutionContext.HTTP_CONNECTION, mockonn);
         assertTrue("stale connection should not be detected",
                     reuseStrategy.keepAlive(response, context));
     }

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/mockup/TestHttpClient.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/mockup/TestHttpClient.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/mockup/TestHttpClient.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/mockup/TestHttpClient.java Fri Jul 20 13:01:50 2007
@@ -48,7 +48,8 @@
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.BasicHttpProcessor;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpRequestExecutor;
 import org.apache.http.protocol.RequestConnControl;
 import org.apache.http.protocol.RequestContent;
@@ -84,7 +85,7 @@
 
         this.httpexecutor = new HttpRequestExecutor();
         this.connStrategy = new DefaultConnectionReuseStrategy();
-        this.context = new HttpExecutionContext(null);
+        this.context = new BasicHttpContext(null);
     }
 
     public HttpParams getParams() {
@@ -95,9 +96,9 @@
             final HttpRequest request,
             final HttpHost targetHost,
             final HttpClientConnection conn) throws HttpException, IOException {
-        this.context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request);
-        this.context.setAttribute(HttpExecutionContext.HTTP_TARGET_HOST, targetHost);
-        this.context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, conn);
+        this.context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
+        this.context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, targetHost);
+        this.context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
         HttpParamsLinker.link(request, params);
         this.httpexecutor.preProcess(request, this.httpproc, this.context);
         HttpResponse response = this.httpexecutor.execute(request, conn, this.context);

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/mockup/TestHttpServer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/mockup/TestHttpServer.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/mockup/TestHttpServer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/mockup/TestHttpServer.java Fri Jul 20 13:01:50 2007
@@ -51,7 +51,7 @@
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.BasicHttpProcessor;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.protocol.HttpExpectationVerifier;
 import org.apache.http.protocol.HttpRequestHandler;
 import org.apache.http.protocol.HttpRequestHandlerRegistry;
@@ -184,7 +184,7 @@
         }
         
         public void run() {
-            HttpContext context = new HttpExecutionContext(null);
+            HttpContext context = new BasicHttpContext(null);
             try {
                 while (!Thread.interrupted() && this.conn.isOpen()) {
                     this.httpservice.handleRequest(this.conn, context);

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java Fri Jul 20 13:01:50 2007
@@ -32,6 +32,9 @@
 
 import junit.framework.*;
 
+
+// the name of this test is historic, the implementation classes of HttpContext
+// have been renamed to BasicHttpContext and SyncBasicHttpContext
 public class TestHttpExecutionContext extends TestCase {
 
     // ------------------------------------------------------------ Constructor
@@ -52,8 +55,8 @@
     }
 
     public void testContextOperations() {
-        HttpContext parentContext = new SyncHttpExecutionContext(null); 
-        HttpContext currentContext = new SyncHttpExecutionContext(parentContext); 
+        HttpContext parentContext = new SyncBasicHttpContext(null); 
+        HttpContext currentContext = new SyncBasicHttpContext(parentContext); 
 
         parentContext.setAttribute("param1", "1");
         parentContext.setAttribute("param2", "2");
@@ -81,14 +84,14 @@
     }
 
     public void testEmptyContextOperations() {
-        HttpContext currentContext = new SyncHttpExecutionContext(null); 
+        HttpContext currentContext = new SyncBasicHttpContext(null); 
         assertEquals(null, currentContext.getAttribute("param1"));
         currentContext.removeAttribute("param1");
         assertEquals(null, currentContext.getAttribute("param1"));
     }
 
     public void testContextInvalidInput() throws Exception {
-        HttpContext currentContext = new SyncHttpExecutionContext(null); 
+        HttpContext currentContext = new SyncBasicHttpContext(null); 
         try {
             currentContext.setAttribute(null, null);
             fail("IllegalArgumentException should have been thrown");

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java Fri Jul 20 13:01:50 2007
@@ -68,7 +68,7 @@
     }
 
     public void testRequestConnControlGenerated() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest("GET", "/");
         RequestConnControl interceptor = new RequestConnControl();
         interceptor.process(request, context);
@@ -78,7 +78,7 @@
     }
     
     public void testRequestConnControlCustom() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest("GET", "/");
         Header myheader = new BasicHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE);
         request.addHeader(myheader);
@@ -101,7 +101,7 @@
     }
     
     public void testRequestContentProtocolException() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request1 = new BasicHttpEntityEnclosingRequest("POST", "/");
         request1.addHeader(new BasicHeader(HTTP.TRANSFER_ENCODING, "chunked"));
         BasicHttpRequest request2 = new BasicHttpEntityEnclosingRequest("POST", "/");
@@ -123,7 +123,7 @@
    }
     
     public void testRequestContentNullEntity() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
 
         RequestContent interceptor = new RequestContent();
@@ -135,7 +135,7 @@
    }
     
     public void testRequestContentEntityContentLengthDelimitedHTTP11() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
         String s = "whatever";
         StringEntity entity = new StringEntity(s, "US-ASCII");
@@ -150,7 +150,7 @@
    }
     
     public void testRequestContentEntityChunkedHTTP11() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
         String s = "whatever";
         StringEntity entity = new StringEntity(s, "US-ASCII");
@@ -166,7 +166,7 @@
    }
     
     public void testRequestContentEntityUnknownLengthHTTP11() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
         BasicHttpEntity entity = new BasicHttpEntity();
         entity.setContentLength(-1);
@@ -182,7 +182,7 @@
     }
 
     public void testRequestContentEntityChunkedHTTP10() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest(
                 "POST", "/", HttpVersion.HTTP_1_0);
         String s = "whatever";
@@ -200,7 +200,7 @@
     }
     
     public void testRequestContentTypeAndEncoding() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
         BasicHttpEntity entity = new BasicHttpEntity();
         entity.setContentType("whatever");
@@ -218,7 +218,7 @@
     }
     
     public void testRequestContentNullTypeAndEncoding() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
         BasicHttpEntity entity = new BasicHttpEntity();
         request.setEntity(entity);
@@ -230,7 +230,7 @@
     }
     
     public void testRequestContentEntityUnknownLengthHTTP10() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest(
                 "POST", "/", HttpVersion.HTTP_1_0);
         BasicHttpEntity entity = new BasicHttpEntity();
@@ -258,7 +258,7 @@
     }
     
     public void testRequestContentIgnoreNonenclosingRequests() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest("POST", "/");
         RequestContent interceptor = new RequestContent();
         interceptor.process(request, context);
@@ -266,7 +266,7 @@
     }
 
    public void testRequestExpectContinueGenerated() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
         String s = "whatever";
         StringEntity entity = new StringEntity(s, "US-ASCII");
@@ -280,7 +280,7 @@
     }
 
     public void testRequestExpectContinueNotGenerated() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
         String s = "whatever";
         StringEntity entity = new StringEntity(s, "US-ASCII");
@@ -293,7 +293,7 @@
     }
 
     public void testRequestExpectContinueHTTP10() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest(
                 "POST", "/", HttpVersion.HTTP_1_0);
         String s = "whatever";
@@ -307,7 +307,7 @@
     }
 
     public void testRequestExpectContinueZeroContent() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
         String s = "";
         StringEntity entity = new StringEntity(s, "US-ASCII");
@@ -330,7 +330,7 @@
     }
 
     public void testRequestExpectContinueIgnoreNonenclosingRequests() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest("POST", "/");
         RequestExpectContinue interceptor = new RequestExpectContinue();
         interceptor.process(request, context);
@@ -338,9 +338,9 @@
     }
 
     public void testRequestTargetHostGenerated() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpHost host = new HttpHost("somehost", 8080, "http");
-        context.setAttribute(HttpExecutionContext.HTTP_TARGET_HOST, host);
+        context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, host);
         BasicHttpRequest request = new BasicHttpRequest("GET", "/");
         RequestTargetHost interceptor = new RequestTargetHost();
         interceptor.process(request, context);
@@ -350,9 +350,9 @@
     }
 
     public void testRequestTargetHostNotGenerated() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpHost host = new HttpHost("somehost", 8080, "http");
-        context.setAttribute(HttpExecutionContext.HTTP_TARGET_HOST, host);
+        context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, host);
         BasicHttpRequest request = new BasicHttpRequest("GET", "/");
         request.addHeader(new BasicHeader(HTTP.TARGET_HOST, "whatever"));
         RequestTargetHost interceptor = new RequestTargetHost();
@@ -363,7 +363,7 @@
     }
 
     public void testRequestTargetHostMissingHostHTTP10() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest(
                 "GET", "/", HttpVersion.HTTP_1_0);
         RequestTargetHost interceptor = new RequestTargetHost();
@@ -373,7 +373,7 @@
     }
 
     public void testRequestTargetHostMissingHostHTTP11() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest("GET", "/");
         RequestTargetHost interceptor = new RequestTargetHost();
         try {
@@ -401,7 +401,7 @@
     }
 
     public void testRequestUserAgentGenerated() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest("GET", "/");
         request.getParams().setParameter(HttpProtocolParams.USER_AGENT, "some agent");
         RequestUserAgent interceptor = new RequestUserAgent();
@@ -412,7 +412,7 @@
     }
 
     public void testRequestUserAgentNotGenerated() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest("GET", "/");
         request.getParams().setParameter(HttpProtocolParams.USER_AGENT, "some agent");
         request.addHeader(new BasicHeader(HTTP.USER_AGENT, "whatever"));
@@ -424,7 +424,7 @@
     }
 
     public void testRequestUserAgentMissingUserAgent() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest("GET", "/");
         RequestUserAgent interceptor = new RequestUserAgent();
         interceptor.process(request, context);
@@ -443,7 +443,7 @@
     }
 
     public void testResponseConnControlNoEntity() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         ResponseConnControl interceptor = new ResponseConnControl();
         interceptor.process(response, context);
@@ -452,7 +452,7 @@
     }
     
     public void testResponseConnControlEntityContentLength() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         StringEntity entity = new StringEntity("whatever");
         response.setEntity(entity);
@@ -463,10 +463,10 @@
     }
     
     public void testResponseConnControlEntityUnknownContentLength() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest("GET", "/");
         request.addHeader(new BasicHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_KEEP_ALIVE));
-        context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request);
+        context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         BasicHttpEntity entity = new BasicHttpEntity();
         response.setEntity(entity);
@@ -478,7 +478,7 @@
     }
     
     public void testResponseConnControlEntityChunked() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         BasicHttpEntity entity = new BasicHttpEntity();
         entity.setChunked(true);
@@ -490,10 +490,10 @@
     }
     
     public void testResponseConnControlEntityUnknownContentLengthHTTP10() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest("GET", "/");
         request.addHeader(new BasicHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_KEEP_ALIVE));
-        context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request);
+        context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
 
         BasicHttpResponse response = new BasicHttpResponse(
                 HttpVersion.HTTP_1_0, HttpStatus.SC_OK, "OK");
@@ -507,10 +507,10 @@
     }
 
     public void testResponseConnControlClientRequest() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest("GET", "/");
         request.addHeader(new BasicHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_KEEP_ALIVE));
-        context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request);
+        context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
 
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         StringEntity entity = new StringEntity("whatever");
@@ -523,9 +523,9 @@
     }
     
     public void testResponseConnControlClientRequest2() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest("GET", "/");
-        context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request);
+        context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
 
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         StringEntity entity = new StringEntity("whatever");
@@ -537,10 +537,10 @@
     }
 
     public void testResponseConnControlStatusCode() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest("GET", "/");
         request.addHeader(new BasicHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_KEEP_ALIVE));
-        context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request);
+        context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
 
         ResponseConnControl interceptor = new ResponseConnControl();
 
@@ -583,7 +583,7 @@
     }
 
     public void testResponseContentNoEntity() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         ResponseContent interceptor = new ResponseContent();
         interceptor.process(response, context);
@@ -593,7 +593,7 @@
     }
     
     public void testResponseContentStatusNoContent() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         response.setStatusCode(HttpStatus.SC_NO_CONTENT);
         ResponseContent interceptor = new ResponseContent();
@@ -603,7 +603,7 @@
     }
     
     public void testResponseContentStatusResetContent() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         response.setStatusCode(HttpStatus.SC_RESET_CONTENT);
         ResponseContent interceptor = new ResponseContent();
@@ -613,7 +613,7 @@
     }
 
     public void testResponseContentStatusNotModified() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         response.setStatusCode(HttpStatus.SC_NOT_MODIFIED);
         ResponseContent interceptor = new ResponseContent();
@@ -623,7 +623,7 @@
     }
 
     public void testResponseContentEntityChunked() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         BasicHttpEntity entity = new BasicHttpEntity();
         entity.setChunked(true);
@@ -638,7 +638,7 @@
     }
     
     public void testResponseContentEntityContentLenghtDelimited() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         BasicHttpEntity entity = new BasicHttpEntity();
         entity.setContentLength (10);
@@ -653,7 +653,7 @@
     }
     
     public void testResponseContentEntityUnknownContentLength() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         BasicHttpEntity entity = new BasicHttpEntity();
         response.setEntity(entity);
@@ -666,7 +666,7 @@
     }
     
     public void testResponseContentEntityChunkedHTTP10() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_0, HttpStatus.SC_OK, "OK");
         BasicHttpEntity entity = new BasicHttpEntity();
         entity.setChunked(true);
@@ -680,7 +680,7 @@
     }
 
     public void testResponseContentEntityNoContentTypeAndEncoding() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         BasicHttpEntity entity = new BasicHttpEntity();
         response.setEntity(entity);
@@ -693,7 +693,7 @@
     }
         
     public void testResponseContentEntityContentTypeAndEncoding() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         BasicHttpEntity entity = new BasicHttpEntity();
         entity.setContentEncoding("whatever");
@@ -721,7 +721,7 @@
         
     public void testResponseContentInvalidResponseState() throws Exception {
         ResponseContent interceptor = new ResponseContent();
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         try {
             HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
             response.addHeader(new BasicHeader(HTTP.CONTENT_LEN, "10"));
@@ -741,7 +741,7 @@
     }
 
     public void testResponseDateGenerated() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         ResponseDate interceptor = new ResponseDate();
         interceptor.process(response, context);
@@ -753,7 +753,7 @@
     }
         
     public void testResponseDateNotGenerated() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         response.setStatusCode(199);
         ResponseDate interceptor = new ResponseDate();
@@ -773,7 +773,7 @@
     }
 
     public void testRequestDateGenerated() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request =
             new BasicHttpEntityEnclosingRequest("POST", "/");
         //BasicHttpRequest request = new BasicHttpRequest("GET", "/");
@@ -788,7 +788,7 @@
     }
         
     public void testRequestDateNotGenerated() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         BasicHttpRequest request = new BasicHttpRequest("GET", "/");
 
         RequestDate interceptor = new RequestDate();
@@ -808,7 +808,7 @@
     }
             
     public void testResponseServerGenerated() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         response.getParams().setParameter(HttpProtocolParams.ORIGIN_SERVER, "some server");
         ResponseServer interceptor = new ResponseServer();
@@ -819,7 +819,7 @@
     }
         
     public void testResponseServerNotGenerated() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         response.getParams().setParameter(HttpProtocolParams.ORIGIN_SERVER, "some server");
         response.addHeader(new BasicHeader(HTTP.SERVER_HEADER, "whatever"));
@@ -831,7 +831,7 @@
     }
         
     public void testResponseServerMissing() throws Exception {
-        HttpContext context = new HttpExecutionContext(null);
+        HttpContext context = new BasicHttpContext(null);
         HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
         ResponseServer interceptor = new ResponseServer();
         interceptor.process(response, context);

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=558111&r1=558110&r2=558111
==============================================================================
--- 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 Fri Jul 20 13:01:50 2007
@@ -56,7 +56,7 @@
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.BasicHttpProcessor;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.RequestConnControl;
 import org.apache.http.protocol.RequestContent;
 import org.apache.http.protocol.RequestExpectContinue;
@@ -134,12 +134,12 @@
 
         public void initalizeContext(final HttpContext context, final Object attachment) {
             HttpHost targetHost = (HttpHost) attachment;
-            context.setAttribute(HttpExecutionContext.HTTP_TARGET_HOST, targetHost);
+            context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, targetHost);
         }
 
         public HttpRequest submitRequest(final HttpContext context) {
             HttpHost targetHost = (HttpHost) context.getAttribute(
-                    HttpExecutionContext.HTTP_TARGET_HOST);
+                    ExecutionContext.HTTP_TARGET_HOST);
             Integer countObj = (Integer) context.getAttribute(
                     "request-count");
             int counter = 0; 

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java Fri Jul 20 13:01:50 2007
@@ -70,7 +70,7 @@
 import org.apache.http.protocol.BasicHttpProcessor;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpProcessor;
 import org.apache.http.protocol.RequestConnControl;
 import org.apache.http.protocol.RequestContent;
@@ -362,8 +362,8 @@
                     response.setParams(this.params);
                     
                     // Pre-process HTTP request
-                    context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, conn);
-                    context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request);
+                    context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
+                    context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
                     this.httpProcessor.process(response, context);
                     
                     conn.submitResponse(response);
@@ -502,8 +502,8 @@
                 response.setParams(this.params);
                 response.addHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE);
                 // Pre-process HTTP request
-                context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, conn);
-                context.setAttribute(HttpExecutionContext.HTTP_REQUEST, null);
+                context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
+                context.setAttribute(ExecutionContext.HTTP_REQUEST, null);
                 this.httpProcessor.process(response, context);
                 
                 conn.submitResponse(response);
@@ -613,8 +613,8 @@
                     request.setParams(this.params);
                     
                     // Pre-process HTTP request
-                    context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, conn);
-                    context.setAttribute(HttpExecutionContext.HTTP_TARGET_HOST, targetHost);
+                    context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
+                    context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, targetHost);
 
                     this.httpProcessor.process(request, context);
                     // and send it to the origin server

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java Fri Jul 20 13:01:50 2007
@@ -70,7 +70,7 @@
 import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.SyncHttpExecutionContext;
+import org.apache.http.protocol.SyncBasicHttpContext;
 import org.apache.http.util.CharArrayBuffer;
 
 public class NHttpConnectionBase 
@@ -111,7 +111,7 @@
             throw new IllegalArgumentException("HTTP params may not be null");
         }
         this.session = session;
-        this.context = new SyncHttpExecutionContext(null);
+        this.context = new SyncBasicHttpContext(null);
         
         int buffersize = HttpConnectionParams.getSocketBufferSize(params);
         int linebuffersize = buffersize;

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java Fri Jul 20 13:01:50 2007
@@ -59,7 +59,7 @@
 import org.apache.http.params.HttpParamsLinker;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpProcessor;
 
 /**
@@ -102,7 +102,7 @@
             int port = ((HttpInetConnection) conn).getRemotePort();
             if (address != null) {
                 HttpHost host = new HttpHost(address.getHostName(), port);
-                context.setAttribute(HttpExecutionContext.HTTP_TARGET_HOST, host);
+                context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, host);
             }
         }
         
@@ -141,7 +141,7 @@
             
             HttpParamsLinker.link(request, this.params);
             
-            context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request);
+            context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
             this.httpProcessor.process(request, context);
             connState.setRequest(request);
             conn.submitRequest(request);
@@ -307,7 +307,7 @@
             final Object attachment) {
         HttpContext context = conn.getContext();
 
-        context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, conn);
+        context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
         this.execHandler.initalizeContext(context, attachment);
     }
     
@@ -361,7 +361,7 @@
                     connState.getInbuffer()));
         }
         
-        context.setAttribute(HttpExecutionContext.HTTP_RESPONSE, response);
+        context.setAttribute(ExecutionContext.HTTP_RESPONSE, response);
         
         this.httpProcessor.process(response, context);
         
@@ -472,4 +472,4 @@
         }
     }
     
-}
\ No newline at end of file
+}

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java Fri Jul 20 13:01:50 2007
@@ -62,7 +62,7 @@
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpParamsLinker;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpProcessor;
 import org.apache.http.protocol.HttpRequestHandler;
 import org.apache.http.util.EncodingUtils;
@@ -324,9 +324,9 @@
                 conn.getContext());
         HttpParamsLinker.link(response, this.params);
         
-        context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request);
-        context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, conn);
-        context.setAttribute(HttpExecutionContext.HTTP_RESPONSE, response);
+        context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
+        context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
+        context.setAttribute(ExecutionContext.HTTP_RESPONSE, response);
         
         try {
 

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java Fri Jul 20 13:01:50 2007
@@ -64,7 +64,7 @@
 import org.apache.http.params.HttpParamsLinker;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpProcessor;
 import org.apache.http.util.concurrent.Executor;
 
@@ -123,7 +123,7 @@
             int port = ((HttpInetConnection) conn).getRemotePort();
             if (address != null) {
                 HttpHost host = new HttpHost(address.getHostName(), port);
-                context.setAttribute(HttpExecutionContext.HTTP_TARGET_HOST, host);
+                context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, host);
             }
         }
         
@@ -166,7 +166,7 @@
                 
                 HttpParamsLinker.link(request, this.params);
                 
-                context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request);
+                context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
                 this.httpProcessor.process(request, context);
                 connState.setRequest(request);
                 conn.submitRequest(request);
@@ -285,7 +285,7 @@
                             connState.getInbuffer()));
                 }
                 
-                context.setAttribute(HttpExecutionContext.HTTP_RESPONSE, response);
+                context.setAttribute(ExecutionContext.HTTP_RESPONSE, response);
                 
                 this.httpProcessor.process(response, context);
                 
@@ -372,7 +372,7 @@
             final Object attachment) {
         HttpContext context = conn.getContext();
 
-        context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, conn);
+        context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
         this.execHandler.initalizeContext(context, attachment);
     }
     
@@ -647,4 +647,4 @@
         
     }
     
-}
\ No newline at end of file
+}

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java Fri Jul 20 13:01:50 2007
@@ -65,7 +65,7 @@
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpParamsLinker;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpProcessor;
 import org.apache.http.protocol.HttpRequestHandler;
 import org.apache.http.util.EncodingUtils;
@@ -379,8 +379,8 @@
 
         HttpParamsLinker.link(request, this.params);
 
-        context.setAttribute(HttpExecutionContext.HTTP_CONNECTION, conn);
-        context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request);
+        context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
+        context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
 
         HttpVersion ver = request.getRequestLine().getHttpVersion();
 
@@ -462,7 +462,7 @@
                     context);
             HttpParamsLinker.link(response, this.params);
 
-            context.setAttribute(HttpExecutionContext.HTTP_RESPONSE, response);
+            context.setAttribute(ExecutionContext.HTTP_RESPONSE, response);
             
             try {
 

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOHttp.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOHttp.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOHttp.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOHttp.java Fri Jul 20 13:01:50 2007
@@ -72,7 +72,7 @@
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.BasicHttpProcessor;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpExpectationVerifier;
 import org.apache.http.protocol.HttpRequestHandler;
 import org.apache.http.protocol.RequestConnControl;
@@ -349,7 +349,7 @@
             
             public void handleResponse(final HttpResponse response, final HttpContext context) {
                 NHttpConnection conn = (NHttpConnection) context.getAttribute(
-                        HttpExecutionContext.HTTP_CONNECTION);
+                        ExecutionContext.HTTP_CONNECTION);
                 
                 List list = (List) context.getAttribute("LIST");
                 int i = ((Integer) context.getAttribute("RES-COUNT")).intValue();
@@ -494,7 +494,7 @@
             
             public void handleResponse(final HttpResponse response, final HttpContext context) {
                 NHttpConnection conn = (NHttpConnection) context.getAttribute(
-                        HttpExecutionContext.HTTP_CONNECTION);
+                        ExecutionContext.HTTP_CONNECTION);
                 
                 List list = (List) context.getAttribute("LIST");
                 int i = ((Integer) context.getAttribute("RES-COUNT")).intValue();
@@ -639,7 +639,7 @@
             
             public void handleResponse(final HttpResponse response, final HttpContext context) {
                 NHttpConnection conn = (NHttpConnection) context.getAttribute(
-                        HttpExecutionContext.HTTP_CONNECTION);
+                        ExecutionContext.HTTP_CONNECTION);
                 
                 List list = (List) context.getAttribute("LIST");
                 int i = ((Integer) context.getAttribute("RES-COUNT")).intValue();
@@ -789,7 +789,7 @@
             
             public void handleResponse(final HttpResponse response, final HttpContext context) {
                 NHttpConnection conn = (NHttpConnection) context.getAttribute(
-                        HttpExecutionContext.HTTP_CONNECTION);
+                        ExecutionContext.HTTP_CONNECTION);
 
                 List list = (List) context.getAttribute("LIST");
                 int i = ((Integer) context.getAttribute("RES-COUNT")).intValue();
@@ -937,7 +937,7 @@
             
             public void handleResponse(final HttpResponse response, final HttpContext context) {
                 NHttpConnection conn = (NHttpConnection) context.getAttribute(
-                        HttpExecutionContext.HTTP_CONNECTION);
+                        ExecutionContext.HTTP_CONNECTION);
                 
                 List list = (List) context.getAttribute("LIST");
                 int i = ((Integer) context.getAttribute("RES-COUNT")).intValue();
@@ -1087,7 +1087,7 @@
             
             public void handleResponse(final HttpResponse response, final HttpContext context) {
                 NHttpConnection conn = (NHttpConnection) context.getAttribute(
-                        HttpExecutionContext.HTTP_CONNECTION);
+                        ExecutionContext.HTTP_CONNECTION);
                 
                 List list = (List) context.getAttribute("LIST");
                 int i = ((Integer) context.getAttribute("RES-COUNT")).intValue();
@@ -1223,7 +1223,7 @@
             
             public void handleResponse(final HttpResponse response, final HttpContext context) {
                 NHttpConnection conn = (NHttpConnection) context.getAttribute(
-                        HttpExecutionContext.HTTP_CONNECTION);
+                        ExecutionContext.HTTP_CONNECTION);
                 
                 List list = (List) context.getAttribute("LIST");
                 int i = ((Integer) context.getAttribute("RES-COUNT")).intValue();

Modified: jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/reactor/TestNIOSSLHttp.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/reactor/TestNIOSSLHttp.java?view=diff&rev=558111&r1=558110&r2=558111
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/reactor/TestNIOSSLHttp.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/reactor/TestNIOSSLHttp.java Fri Jul 20 13:01:50 2007
@@ -67,7 +67,7 @@
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.BasicHttpProcessor;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpExpectationVerifier;
 import org.apache.http.protocol.HttpRequestHandler;
 import org.apache.http.protocol.RequestConnControl;
@@ -255,7 +255,7 @@
             
             public void handleResponse(final HttpResponse response, final HttpContext context) {
                 NHttpConnection conn = (NHttpConnection) context.getAttribute(
-                        HttpExecutionContext.HTTP_CONNECTION);
+                        ExecutionContext.HTTP_CONNECTION);
                 
                 List list = (List) context.getAttribute("LIST");
                 int i = ((Integer) context.getAttribute("RES-COUNT")).intValue();
@@ -401,7 +401,7 @@
             
             public void handleResponse(final HttpResponse response, final HttpContext context) {
                 NHttpConnection conn = (NHttpConnection) context.getAttribute(
-                        HttpExecutionContext.HTTP_CONNECTION);
+                        ExecutionContext.HTTP_CONNECTION);
                 
                 List list = (List) context.getAttribute("LIST");
                 int i = ((Integer) context.getAttribute("RES-COUNT")).intValue();
@@ -547,7 +547,7 @@
             
             public void handleResponse(final HttpResponse response, final HttpContext context) {
                 NHttpConnection conn = (NHttpConnection) context.getAttribute(
-                        HttpExecutionContext.HTTP_CONNECTION);
+                        ExecutionContext.HTTP_CONNECTION);
                 
                 List list = (List) context.getAttribute("LIST");
                 int i = ((Integer) context.getAttribute("RES-COUNT")).intValue();
@@ -698,7 +698,7 @@
             
             public void handleResponse(final HttpResponse response, final HttpContext context) {
                 NHttpConnection conn = (NHttpConnection) context.getAttribute(
-                        HttpExecutionContext.HTTP_CONNECTION);
+                        ExecutionContext.HTTP_CONNECTION);
 
                 List list = (List) context.getAttribute("LIST");
                 int i = ((Integer) context.getAttribute("RES-COUNT")).intValue();



Mime
View raw message