hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1215150 [1/2] - in /httpcomponents/httpcore/trunk/httpcore-nio/src: examples/org/apache/http/examples/nio/ main/java/org/apache/http/impl/nio/ main/java/org/apache/http/nio/ main/java/org/apache/http/nio/protocol/ test/java/org/apache/http...
Date Fri, 16 Dec 2011 14:24:44 GMT
Author: olegk
Date: Fri Dec 16 14:24:42 2011
New Revision: 1215150

URL: http://svn.apache.org/viewvc?rev=1215150&view=rev
Log:
Renamed some of new async classes and interfaces

Added:
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java   (contents, props changed)
      - copied, changed from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientProtocolHandlerAdaptor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java   (contents, props changed)
      - copied, changed from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerProtocolHandlerAdaptor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientEventHandler.java   (contents, props changed)
      - copied, changed from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientProtocolHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerEventHandler.java   (contents, props changed)
      - copied, changed from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerProtocolHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java   (contents, props changed)
      - copied, changed from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientExchangeHandlerImpl.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutionHandler.java   (contents, props changed)
      - copied, changed from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientExchangeHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncServerProtocolHandler.java   (contents, props changed)
      - copied, changed from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestExecutionHandler.java   (contents, props changed)
      - copied, changed from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientExchangeHandlerImpl.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncServerProtocolHandler.java   (contents, props changed)
      - copied, changed from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/NHttpClientEventHandlerAdaptor.java   (contents, props changed)
      - copied, changed from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/NHttpClientProtocolHandlerAdaptor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/NHttpServerEventHandlerAdaptor.java   (contents, props changed)
      - copied, changed from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/NHttpServerProtocolHandlerAdaptor.java
Removed:
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientProtocolHandlerAdaptor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerProtocolHandlerAdaptor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientProtocolHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerProtocolHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientExchangeHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientExchangeHandlerImpl.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientExchangeHandlerImpl.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/NHttpClientProtocolHandlerAdaptor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/NHttpServerProtocolHandlerAdaptor.java
Modified:
    httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIODispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIODispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientProtocolHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientProtocolHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpClientNio.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpServerNio.java

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java Fri Dec 16 14:24:42 2011
@@ -76,7 +76,7 @@ import org.apache.http.nio.protocol.Http
 import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
 import org.apache.http.nio.protocol.HttpAsyncResponseProducer;
 import org.apache.http.nio.protocol.HttpAsyncServiceExchange;
-import org.apache.http.nio.protocol.HttpAsyncServiceHandler;
+import org.apache.http.nio.protocol.HttpAsyncServerProtocolHandler;
 import org.apache.http.nio.reactor.ConnectingIOReactor;
 import org.apache.http.nio.reactor.IOEventDispatch;
 import org.apache.http.nio.reactor.ListeningIOReactor;
@@ -793,7 +793,7 @@ public class NHttpReverseProxy {
 
     };
 
-    static class ProxyServiceHandler extends HttpAsyncServiceHandler {
+    static class ProxyServiceHandler extends HttpAsyncServerProtocolHandler {
 
         public ProxyServiceHandler(
                 final HttpProcessor httpProcessor,

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java Fri Dec 16 14:24:42 2011
@@ -63,7 +63,7 @@ import org.apache.http.nio.protocol.Http
 import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
 import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
 import org.apache.http.nio.protocol.HttpAsyncServiceExchange;
-import org.apache.http.nio.protocol.HttpAsyncServiceHandler;
+import org.apache.http.nio.protocol.HttpAsyncServerProtocolHandler;
 import org.apache.http.nio.reactor.IOEventDispatch;
 import org.apache.http.nio.reactor.ListeningIOReactor;
 import org.apache.http.params.CoreConnectionPNames;
@@ -116,7 +116,7 @@ public class NHttpServer {
         // Register the default handler for all URIs
         reqistry.register("*", new HttpFileHandler(docRoot));
         // Create server-side HTTP protocol handler
-        HttpAsyncServiceHandler protocolHandler = new HttpAsyncServiceHandler(
+        HttpAsyncServerProtocolHandler protocolHandler = new HttpAsyncServerProtocolHandler(
                 httpproc, new DefaultConnectionReuseStrategy(), reqistry, params) {
 
             @Override

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIODispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIODispatch.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIODispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIODispatch.java Fri Dec 16 14:24:42 2011
@@ -32,7 +32,7 @@ import java.io.IOException;
 import javax.net.ssl.SSLContext;
 
 import org.apache.http.annotation.Immutable;
-import org.apache.http.nio.NHttpClientProtocolHandler;
+import org.apache.http.nio.NHttpClientEventHandler;
 import org.apache.http.nio.NHttpConnectionFactory;
 import org.apache.http.nio.reactor.IOEventDispatch;
 import org.apache.http.nio.reactor.IOSession;
@@ -49,7 +49,7 @@ import org.apache.http.params.HttpParams
 public class DefaultClientIODispatch
                     extends AbstractIODispatch<DefaultNHttpClientConnection> {
 
-    private final NHttpClientProtocolHandler handler;
+    private final NHttpClientEventHandler handler;
     private final NHttpConnectionFactory<DefaultNHttpClientConnection> connFactory;
 
     /**
@@ -60,7 +60,7 @@ public class DefaultClientIODispatch
      * @param connFactory HTTP client connection factory.
      */
     public DefaultClientIODispatch(
-            final NHttpClientProtocolHandler handler,
+            final NHttpClientEventHandler handler,
             final NHttpConnectionFactory<DefaultNHttpClientConnection> connFactory) {
         super();
         if (handler == null) {
@@ -74,13 +74,13 @@ public class DefaultClientIODispatch
     }
 
     public DefaultClientIODispatch(
-            final NHttpClientProtocolHandler handler,
+            final NHttpClientEventHandler handler,
             final HttpParams params) {
         this(handler, new DefaultNHttpClientConnectionFactory(params));
     }
 
     public DefaultClientIODispatch(
-            final NHttpClientProtocolHandler handler,
+            final NHttpClientEventHandler handler,
             final SSLContext sslcontext,
             final SSLSetupHandler sslHandler,
             final HttpParams params) {
@@ -88,7 +88,7 @@ public class DefaultClientIODispatch
     }
 
     public DefaultClientIODispatch(
-            final NHttpClientProtocolHandler handler,
+            final NHttpClientEventHandler handler,
             final SSLContext sslcontext,
             final HttpParams params) {
         this(handler, sslcontext, null, params);

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java Fri Dec 16 14:24:42 2011
@@ -42,7 +42,7 @@ import org.apache.http.impl.nio.codecs.D
 import org.apache.http.nio.NHttpClientConnection;
 import org.apache.http.nio.NHttpClientIOTarget;
 import org.apache.http.nio.NHttpClientHandler;
-import org.apache.http.nio.NHttpClientProtocolHandler;
+import org.apache.http.nio.NHttpClientEventHandler;
 import org.apache.http.nio.NHttpMessageParser;
 import org.apache.http.nio.NHttpMessageWriter;
 import org.apache.http.nio.reactor.EventMask;
@@ -143,7 +143,7 @@ public class DefaultNHttpClientConnectio
         this.requestWriter.reset();
     }
 
-    public void consumeInput(final NHttpClientProtocolHandler handler) {
+    public void consumeInput(final NHttpClientEventHandler handler) {
         if (this.status != ACTIVE) {
             this.session.clearEvent(EventMask.READ);
             return;
@@ -192,7 +192,7 @@ public class DefaultNHttpClientConnectio
         }
     }
 
-    public void produceOutput(final NHttpClientProtocolHandler handler) {
+    public void produceOutput(final NHttpClientEventHandler handler) {
         try {
             if (this.outbuf.hasData()) {
                 int bytesWritten = this.outbuf.flush(this.session.channel());
@@ -259,11 +259,11 @@ public class DefaultNHttpClientConnectio
     }
 
     public void consumeInput(final NHttpClientHandler handler) {
-        consumeInput(new NHttpClientProtocolHandlerAdaptor(handler));
+        consumeInput(new NHttpClientEventHandlerAdaptor(handler));
     }
 
     public void produceOutput(final NHttpClientHandler handler) {
-        produceOutput(new NHttpClientProtocolHandlerAdaptor(handler));
+        produceOutput(new NHttpClientEventHandlerAdaptor(handler));
     }
 
 }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java Fri Dec 16 14:24:42 2011
@@ -43,7 +43,7 @@ import org.apache.http.nio.NHttpMessageP
 import org.apache.http.nio.NHttpMessageWriter;
 import org.apache.http.nio.NHttpServerConnection;
 import org.apache.http.nio.NHttpServerIOTarget;
-import org.apache.http.nio.NHttpServerProtocolHandler;
+import org.apache.http.nio.NHttpServerEventHandler;
 import org.apache.http.nio.NHttpServiceHandler;
 import org.apache.http.nio.reactor.EventMask;
 import org.apache.http.nio.reactor.IOSession;
@@ -141,7 +141,7 @@ public class DefaultNHttpServerConnectio
         this.responseWriter.reset();
     }
 
-    public void consumeInput(final NHttpServerProtocolHandler handler) {
+    public void consumeInput(final NHttpServerEventHandler handler) {
         if (this.status != ACTIVE) {
             this.session.clearEvent(EventMask.READ);
             return;
@@ -193,7 +193,7 @@ public class DefaultNHttpServerConnectio
         }
     }
 
-    public void produceOutput(final NHttpServerProtocolHandler handler) {
+    public void produceOutput(final NHttpServerEventHandler handler) {
         try {
             if (this.outbuf.hasData()) {
                 int bytesWritten = this.outbuf.flush(this.session.channel());
@@ -262,11 +262,11 @@ public class DefaultNHttpServerConnectio
     }
 
     public void consumeInput(final NHttpServiceHandler handler) {
-        consumeInput(new NHttpServerProtocolHandlerAdaptor(handler));
+        consumeInput(new NHttpServerEventHandlerAdaptor(handler));
     }
 
     public void produceOutput(NHttpServiceHandler handler) {
-        produceOutput(new NHttpServerProtocolHandlerAdaptor(handler));
+        produceOutput(new NHttpServerEventHandlerAdaptor(handler));
     }
 
 }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIODispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIODispatch.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIODispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIODispatch.java Fri Dec 16 14:24:42 2011
@@ -33,7 +33,7 @@ import javax.net.ssl.SSLContext;
 
 import org.apache.http.annotation.Immutable;
 import org.apache.http.nio.NHttpConnectionFactory;
-import org.apache.http.nio.NHttpServerProtocolHandler;
+import org.apache.http.nio.NHttpServerEventHandler;
 import org.apache.http.nio.reactor.IOEventDispatch;
 import org.apache.http.nio.reactor.IOSession;
 import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
@@ -49,11 +49,11 @@ import org.apache.http.params.HttpParams
 public class DefaultServerIODispatch
                     extends AbstractIODispatch<DefaultNHttpServerConnection> {
 
-    private final NHttpServerProtocolHandler handler;
+    private final NHttpServerEventHandler handler;
     private final NHttpConnectionFactory<DefaultNHttpServerConnection> connFactory;
 
     public DefaultServerIODispatch(
-            final NHttpServerProtocolHandler handler,
+            final NHttpServerEventHandler handler,
             final NHttpConnectionFactory<DefaultNHttpServerConnection> connFactory) {
         super();
         if (handler == null) {
@@ -67,13 +67,13 @@ public class DefaultServerIODispatch
     }
 
     public DefaultServerIODispatch(
-            final NHttpServerProtocolHandler handler,
+            final NHttpServerEventHandler handler,
             final HttpParams params) {
         this(handler, new DefaultNHttpServerConnectionFactory(params));
     }
 
     public DefaultServerIODispatch(
-            final NHttpServerProtocolHandler handler,
+            final NHttpServerEventHandler handler,
             final SSLContext sslcontext,
             final SSLSetupHandler sslHandler,
             final HttpParams params) {
@@ -81,7 +81,7 @@ public class DefaultServerIODispatch
     }
 
     public DefaultServerIODispatch(
-            final NHttpServerProtocolHandler handler,
+            final NHttpServerEventHandler handler,
             final SSLContext sslcontext,
             final HttpParams params) {
         this(handler, sslcontext, null, params);

Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java (from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientProtocolHandlerAdaptor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientProtocolHandlerAdaptor.java&r1=1213035&r2=1215150&rev=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientProtocolHandlerAdaptor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java Fri Dec 16 14:24:42 2011
@@ -34,14 +34,14 @@ import org.apache.http.nio.ContentDecode
 import org.apache.http.nio.ContentEncoder;
 import org.apache.http.nio.NHttpClientConnection;
 import org.apache.http.nio.NHttpClientHandler;
-import org.apache.http.nio.NHttpClientProtocolHandler;
+import org.apache.http.nio.NHttpClientEventHandler;
 
 @Deprecated
-class NHttpClientProtocolHandlerAdaptor implements NHttpClientProtocolHandler {
+class NHttpClientEventHandlerAdaptor implements NHttpClientEventHandler {
 
     private final NHttpClientHandler handler;
 
-    public NHttpClientProtocolHandlerAdaptor(final NHttpClientHandler handler) {
+    public NHttpClientEventHandlerAdaptor(final NHttpClientHandler handler) {
         super();
         this.handler = handler;
     }

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java (from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerProtocolHandlerAdaptor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerProtocolHandlerAdaptor.java&r1=1213035&r2=1215150&rev=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerProtocolHandlerAdaptor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java Fri Dec 16 14:24:42 2011
@@ -33,15 +33,15 @@ import org.apache.http.HttpException;
 import org.apache.http.nio.ContentDecoder;
 import org.apache.http.nio.ContentEncoder;
 import org.apache.http.nio.NHttpServerConnection;
-import org.apache.http.nio.NHttpServerProtocolHandler;
+import org.apache.http.nio.NHttpServerEventHandler;
 import org.apache.http.nio.NHttpServiceHandler;
 
 @Deprecated
-class NHttpServerProtocolHandlerAdaptor implements NHttpServerProtocolHandler {
+class NHttpServerEventHandlerAdaptor implements NHttpServerEventHandler {
 
     private final NHttpServiceHandler handler;
 
-    public NHttpServerProtocolHandlerAdaptor(final NHttpServiceHandler handler) {
+    public NHttpServerEventHandlerAdaptor(final NHttpServiceHandler handler) {
         super();
         this.handler = handler;
     }

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientEventHandler.java (from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientProtocolHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientEventHandler.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientEventHandler.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientProtocolHandler.java&r1=1213035&r2=1215150&rev=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientProtocolHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientEventHandler.java Fri Dec 16 14:24:42 2011
@@ -36,7 +36,7 @@ import org.apache.http.HttpException;
  *
  * @since 4.2
  */
-public interface NHttpClientProtocolHandler {
+public interface NHttpClientEventHandler {
 
     /**
      * Triggered when a new outgoing connection is created.

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientEventHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientEventHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientEventHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientHandler.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientHandler.java Fri Dec 16 14:24:42 2011
@@ -36,7 +36,7 @@ import org.apache.http.HttpException;
  *
  * @since 4.0
  *
- * @deprecated use {@link NHttpClientProtocolHandler}
+ * @deprecated use {@link NHttpClientEventHandler}
  */
 @Deprecated
 public interface NHttpClientHandler {

Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerEventHandler.java (from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerProtocolHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerEventHandler.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerEventHandler.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerProtocolHandler.java&r1=1213035&r2=1215150&rev=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerProtocolHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerEventHandler.java Fri Dec 16 14:24:42 2011
@@ -32,11 +32,11 @@ import java.io.IOException;
 import org.apache.http.HttpException;
 
 /**
- * Abstract server-side HTTP protocol handler.
+ * Abstract server-side HTTP event handler.
  *
  * @since 4.2
  */
-public interface NHttpServerProtocolHandler {
+public interface NHttpServerEventHandler {
 
     /**
      * Triggered when a new incoming connection is created.

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerEventHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerEventHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerEventHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServiceHandler.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServiceHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServiceHandler.java Fri Dec 16 14:24:42 2011
@@ -36,7 +36,7 @@ import org.apache.http.HttpException;
  *
  * @since 4.0
  *
- * @deprecated use {@link NHttpServerProtocolHandler}
+ * @deprecated use {@link NHttpServerEventHandler}
  */
 @Deprecated
 public interface NHttpServiceHandler {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java Fri Dec 16 14:24:42 2011
@@ -95,7 +95,7 @@ import org.apache.http.util.EncodingUtil
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncServiceHandler}
+ * @deprecated use {@link HttpAsyncServerProtocolHandler}
  */
 @Deprecated
 @Immutable // provided injected dependencies are immutable

Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java (from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientExchangeHandlerImpl.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientExchangeHandlerImpl.java&r1=1213035&r2=1215150&rev=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientExchangeHandlerImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java Fri Dec 16 14:24:42 2011
@@ -45,7 +45,7 @@ import org.apache.http.protocol.Executio
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpProcessor;
 
-class HttpAsyncClientExchangeHandlerImpl<T> implements HttpAsyncClientExchangeHandler<T> {
+class BasicAsyncRequestExecutionHandler<T> implements HttpAsyncRequestExecutionHandler<T> {
 
     private final BasicFuture<T> future;
     private final HttpAsyncRequestProducer requestProducer;
@@ -56,7 +56,7 @@ class HttpAsyncClientExchangeHandlerImpl
     private final ConnectionReuseStrategy reuseStrategy;
     private final HttpParams params;
 
-    public HttpAsyncClientExchangeHandlerImpl(
+    public BasicAsyncRequestExecutionHandler(
             final BasicFuture<T> future,
             final HttpAsyncRequestProducer requestProducer,
             final HttpAsyncResponseConsumer<T> responseConsumer,

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java Fri Dec 16 14:24:42 2011
@@ -72,7 +72,7 @@ import org.apache.http.protocol.HttpRequ
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncServiceHandler}
+ * @deprecated use {@link HttpAsyncServerProtocolHandler}
  */
 @Deprecated
 @Immutable // provided injected dependencies are immutable

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientProtocolHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientProtocolHandler.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientProtocolHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientProtocolHandler.java Fri Dec 16 14:24:42 2011
@@ -41,7 +41,7 @@ import org.apache.http.annotation.Immuta
 import org.apache.http.nio.ContentDecoder;
 import org.apache.http.nio.ContentEncoder;
 import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.nio.NHttpClientProtocolHandler;
+import org.apache.http.nio.NHttpClientEventHandler;
 import org.apache.http.nio.NHttpConnection;
 import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.protocol.HttpContext;
@@ -50,7 +50,7 @@ import org.apache.http.protocol.HttpCont
  * @since 4.2
  */
 @Immutable
-public class HttpAsyncClientProtocolHandler implements NHttpClientProtocolHandler {
+public class HttpAsyncClientProtocolHandler implements NHttpClientEventHandler {
 
     public static final String HTTP_HANDLER = "http.nio.exchange-handler";
 
@@ -98,14 +98,14 @@ public class HttpAsyncClientProtocolHand
             if (state.getRequestState() != MessageState.READY) {
                 return;
             }
-            HttpAsyncClientExchangeHandler<?> handler = state.getHandler();
+            HttpAsyncRequestExecutionHandler<?> handler = state.getHandler();
             if (handler != null && handler.isDone()) {
                 closeHandler(state);
                 state.reset();
                 handler = null;
             }
             if (handler == null) {
-                handler = (HttpAsyncClientExchangeHandler<?>) conn.getContext().removeAttribute(
+                handler = (HttpAsyncRequestExecutionHandler<?>) conn.getContext().removeAttribute(
                         HTTP_HANDLER);
                 state.setHandler(handler);
             }
@@ -141,7 +141,7 @@ public class HttpAsyncClientProtocolHand
             final ContentEncoder encoder) throws IOException {
         State state = ensureNotNull(getState(conn));
         synchronized (state) {
-            HttpAsyncClientExchangeHandler<?> handler = ensureNotNull(state.getHandler());
+            HttpAsyncRequestExecutionHandler<?> handler = ensureNotNull(state.getHandler());
             if (state.getRequestState() == MessageState.ACK_EXPECTED) {
                 conn.suspendOutput();
                 return;
@@ -160,7 +160,7 @@ public class HttpAsyncClientProtocolHand
             final NHttpClientConnection conn) throws HttpException, IOException {
         State state = ensureNotNull(getState(conn));
         synchronized (state) {
-            HttpAsyncClientExchangeHandler<?> handler = ensureNotNull(state.getHandler());
+            HttpAsyncRequestExecutionHandler<?> handler = ensureNotNull(state.getHandler());
             HttpResponse response = conn.getHttpResponse();
             HttpRequest request = state.getRequest();
 
@@ -206,7 +206,7 @@ public class HttpAsyncClientProtocolHand
             final ContentDecoder decoder) throws IOException {
         State state = ensureNotNull(getState(conn));
         synchronized (state) {
-            HttpAsyncClientExchangeHandler<?> handler = ensureNotNull(state.getHandler());
+            HttpAsyncRequestExecutionHandler<?> handler = ensureNotNull(state.getHandler());
             handler.consumeContent(decoder, conn);
             state.setResponseState(MessageState.BODY_STREAM);
             if (decoder.isCompleted()) {
@@ -257,7 +257,7 @@ public class HttpAsyncClientProtocolHand
         return state;
     }
 
-    private HttpAsyncClientExchangeHandler<?> ensureNotNull(final HttpAsyncClientExchangeHandler<?> handler) {
+    private HttpAsyncRequestExecutionHandler<?> ensureNotNull(final HttpAsyncRequestExecutionHandler<?> handler) {
         if (handler == null) {
             throw new IllegalStateException("HTTP exchange handler is null");
         }
@@ -273,7 +273,7 @@ public class HttpAsyncClientProtocolHand
     }
 
     private void closeHandler(final State state, final Exception ex) {
-        HttpAsyncClientExchangeHandler<?> handler = state.getHandler();
+        HttpAsyncRequestExecutionHandler<?> handler = state.getHandler();
         if (handler != null) {
             try {
                 handler.failed(ex);
@@ -288,7 +288,7 @@ public class HttpAsyncClientProtocolHand
     }
 
     private void closeHandler(final State state) {
-        HttpAsyncClientExchangeHandler<?> handler = state.getHandler();
+        HttpAsyncRequestExecutionHandler<?> handler = state.getHandler();
         if (handler != null) {
             try {
                 handler.close();
@@ -301,7 +301,7 @@ public class HttpAsyncClientProtocolHand
     private void processResponse(
             final NHttpClientConnection conn,
             final State state,
-            final HttpAsyncClientExchangeHandler<?> handler) throws IOException {
+            final HttpAsyncRequestExecutionHandler<?> handler) throws IOException {
         HttpContext context = handler.getContext();
         if (state.isValid()) {
             HttpRequest request = state.getRequest();
@@ -342,7 +342,7 @@ public class HttpAsyncClientProtocolHand
 
     static class State {
 
-        private volatile HttpAsyncClientExchangeHandler<?> handler;
+        private volatile HttpAsyncRequestExecutionHandler<?> handler;
         private volatile MessageState requestState;
         private volatile MessageState responseState;
         private volatile HttpRequest request;
@@ -357,11 +357,11 @@ public class HttpAsyncClientProtocolHand
             this.responseState = MessageState.READY;
         }
 
-        public HttpAsyncClientExchangeHandler<?> getHandler() {
+        public HttpAsyncRequestExecutionHandler<?> getHandler() {
             return this.handler;
         }
 
-        public void setHandler(final HttpAsyncClientExchangeHandler<?> handler) {
+        public void setHandler(final HttpAsyncRequestExecutionHandler<?> handler) {
             this.handler = handler;
         }
 

Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutionHandler.java (from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientExchangeHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutionHandler.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutionHandler.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientExchangeHandler.java&r1=1213035&r2=1215150&rev=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncClientExchangeHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutionHandler.java Fri Dec 16 14:24:42 2011
@@ -33,7 +33,7 @@ import org.apache.http.protocol.HttpCont
 /**
  * @since 4.2
  */
-public interface HttpAsyncClientExchangeHandler<T> extends HttpAsyncRequestProducer, HttpAsyncResponseConsumer<T> {
+public interface HttpAsyncRequestExecutionHandler<T> extends HttpAsyncRequestProducer, HttpAsyncResponseConsumer<T> {
 
     HttpContext getContext();
 

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutionHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutionHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutionHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java Fri Dec 16 14:24:42 2011
@@ -81,7 +81,7 @@ public class HttpAsyncRequestExecutor {
             throw new IllegalArgumentException("HTTP context may not be null");
         }
         BasicFuture<T> future = new BasicFuture<T>(callback);
-        HttpAsyncClientExchangeHandler<T> handler = new HttpAsyncClientExchangeHandlerImpl<T>(
+        HttpAsyncRequestExecutionHandler<T> handler = new BasicAsyncRequestExecutionHandler<T>(
                 future, requestProducer, responseConsumer, context,
                 this.httppocessor, conn, this.reuseStrategy, this.params);
         conn.getContext().setAttribute(HttpAsyncClientProtocolHandler.HTTP_HANDLER, handler);
@@ -174,7 +174,7 @@ public class HttpAsyncRequestExecutor {
             NHttpClientConnection conn = result.getConnection();
             BasicFuture<T> execFuture = new BasicFuture<T>(new RequestExecutionCallback<T, E>(
                     this.requestFuture, result, this.connPool));
-            HttpAsyncClientExchangeHandler<T> handler = new HttpAsyncClientExchangeHandlerImpl<T>(
+            HttpAsyncRequestExecutionHandler<T> handler = new BasicAsyncRequestExecutionHandler<T>(
                     execFuture, this.requestProducer, this.responseConsumer, this.context,
                     httppocessor, conn, reuseStrategy, params);
             conn.getContext().setAttribute(HttpAsyncClientProtocolHandler.HTTP_HANDLER, handler);

Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncServerProtocolHandler.java (from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncServiceHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncServerProtocolHandler.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncServerProtocolHandler.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncServiceHandler.java&r1=1213035&r2=1215150&rev=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncServiceHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncServerProtocolHandler.java Fri Dec 16 14:24:42 2011
@@ -49,7 +49,7 @@ import org.apache.http.nio.ContentDecode
 import org.apache.http.nio.ContentEncoder;
 import org.apache.http.nio.NHttpConnection;
 import org.apache.http.nio.NHttpServerConnection;
-import org.apache.http.nio.NHttpServerProtocolHandler;
+import org.apache.http.nio.NHttpServerEventHandler;
 import org.apache.http.nio.entity.NStringEntity;
 import org.apache.http.params.DefaultedHttpParams;
 import org.apache.http.params.HttpParams;
@@ -62,7 +62,7 @@ import org.apache.http.protocol.HttpProc
  * @since 4.2
  */
 @Immutable // provided injected dependencies are immutable
-public class HttpAsyncServiceHandler implements NHttpServerProtocolHandler {
+public class HttpAsyncServerProtocolHandler implements NHttpServerEventHandler {
 
     static final String HTTP_EXCHANGE_STATE = "http.nio.http-exchange-state";
 
@@ -73,7 +73,7 @@ public class HttpAsyncServiceHandler imp
     private final HttpAsyncExpectationVerifier expectationVerifier;
     private final HttpParams params;
 
-    public HttpAsyncServiceHandler(
+    public HttpAsyncServerProtocolHandler(
             final HttpProcessor httpProcessor,
             final ConnectionReuseStrategy connStrategy,
             final HttpResponseFactory responseFactory,
@@ -101,7 +101,7 @@ public class HttpAsyncServiceHandler imp
         this.params = params;
     }
 
-    public HttpAsyncServiceHandler(
+    public HttpAsyncServerProtocolHandler(
             final HttpProcessor httpProcessor,
             final ConnectionReuseStrategy connStrategy,
             final HttpAsyncRequestHandlerResolver handlerResolver,

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncServerProtocolHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncServerProtocolHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncServerProtocolHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java Fri Dec 16 14:24:42 2011
@@ -105,7 +105,7 @@ import org.apache.http.util.EntityUtils;
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncServiceHandler}
+ * @deprecated use {@link HttpAsyncServerProtocolHandler}
  */
 @Deprecated
 @ThreadSafe // provided injected dependencies are immutable or thread safe

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpClientConnection.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpClientConnection.java Fri Dec 16 14:24:42 2011
@@ -39,7 +39,7 @@ import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseFactory;
 import org.apache.http.impl.nio.DefaultNHttpClientConnection;
-import org.apache.http.nio.NHttpClientProtocolHandler;
+import org.apache.http.nio.NHttpClientEventHandler;
 import org.apache.http.nio.NHttpMessageParser;
 import org.apache.http.nio.NHttpMessageWriter;
 import org.apache.http.nio.reactor.IOSession;
@@ -99,7 +99,7 @@ public class LoggingNHttpClientConnectio
     }
 
     @Override
-    public void consumeInput(final NHttpClientProtocolHandler handler) {
+    public void consumeInput(final NHttpClientEventHandler handler) {
         if (this.log.isDebugEnabled()) {
             this.log.debug(this.id + ": Consume input");
         }
@@ -107,7 +107,7 @@ public class LoggingNHttpClientConnectio
     }
 
     @Override
-    public void produceOutput(final NHttpClientProtocolHandler handler) {
+    public void produceOutput(final NHttpClientEventHandler handler) {
         if (this.log.isDebugEnabled()) {
             this.log.debug(this.id + ": Produce output");
         }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpServerConnection.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/LoggingNHttpServerConnection.java Fri Dec 16 14:24:42 2011
@@ -41,7 +41,7 @@ import org.apache.http.HttpResponse;
 import org.apache.http.impl.nio.DefaultNHttpServerConnection;
 import org.apache.http.nio.NHttpMessageParser;
 import org.apache.http.nio.NHttpMessageWriter;
-import org.apache.http.nio.NHttpServerProtocolHandler;
+import org.apache.http.nio.NHttpServerEventHandler;
 import org.apache.http.nio.reactor.IOSession;
 import org.apache.http.nio.reactor.SessionInputBuffer;
 import org.apache.http.nio.reactor.SessionOutputBuffer;
@@ -99,7 +99,7 @@ public class LoggingNHttpServerConnectio
     }
 
     @Override
-    public void consumeInput(final NHttpServerProtocolHandler handler) {
+    public void consumeInput(final NHttpServerEventHandler handler) {
         if (this.log.isDebugEnabled()) {
             this.log.debug(this.id + ": Consume input");
         }
@@ -107,7 +107,7 @@ public class LoggingNHttpServerConnectio
     }
 
     @Override
-    public void produceOutput(final NHttpServerProtocolHandler handler) {
+    public void produceOutput(final NHttpServerEventHandler handler) {
         if (this.log.isDebugEnabled()) {
             this.log.debug(this.id + ": Produce output");
         }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java Fri Dec 16 14:24:42 2011
@@ -58,7 +58,7 @@ import org.apache.http.nio.protocol.Basi
 import org.apache.http.nio.protocol.BufferingAsyncRequestHandler;
 import org.apache.http.nio.protocol.HttpAsyncClientProtocolHandler;
 import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
-import org.apache.http.nio.protocol.HttpAsyncServiceHandler;
+import org.apache.http.nio.protocol.HttpAsyncServerProtocolHandler;
 import org.apache.http.nio.reactor.IOReactorException;
 import org.apache.http.nio.reactor.IOReactorExceptionHandler;
 import org.apache.http.nio.reactor.IOReactorStatus;
@@ -114,7 +114,7 @@ public class TestDefaultIOReactors exten
         this.connpool.setMaxTotal(connNo);
 
         HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
-        HttpAsyncServiceHandler serviceHandler = new HttpAsyncServiceHandler(
+        HttpAsyncServerProtocolHandler serviceHandler = new HttpAsyncServerProtocolHandler(
                 this.serverHttpProc,
                 new DefaultConnectionReuseStrategy(),
                 registry,
@@ -200,7 +200,7 @@ public class TestDefaultIOReactors exten
 
         HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
         registry.register("*", new BufferingAsyncRequestHandler(requestHandler));
-        HttpAsyncServiceHandler serviceHandler = new HttpAsyncServiceHandler(
+        HttpAsyncServerProtocolHandler serviceHandler = new HttpAsyncServerProtocolHandler(
                 this.serverHttpProc,
                 new DefaultConnectionReuseStrategy(),
                 registry,
@@ -283,7 +283,7 @@ public class TestDefaultIOReactors exten
 
         HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
         registry.register("*", new BufferingAsyncRequestHandler(requestHandler));
-        HttpAsyncServiceHandler serviceHandler = new HttpAsyncServiceHandler(
+        HttpAsyncServerProtocolHandler serviceHandler = new HttpAsyncServerProtocolHandler(
                 this.serverHttpProc,
                 new DefaultConnectionReuseStrategy(),
                 registry,
@@ -367,7 +367,7 @@ public class TestDefaultIOReactors exten
 
         HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
         registry.register("*", new BufferingAsyncRequestHandler(requestHandler));
-        HttpAsyncServiceHandler serviceHandler = new HttpAsyncServiceHandler(
+        HttpAsyncServerProtocolHandler serviceHandler = new HttpAsyncServerProtocolHandler(
                 this.serverHttpProc,
                 new DefaultConnectionReuseStrategy(),
                 registry,

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java Fri Dec 16 14:24:42 2011
@@ -38,7 +38,7 @@ import org.apache.http.HttpResponseInter
 import org.apache.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.http.impl.nio.DefaultServerIODispatch;
 import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
-import org.apache.http.nio.protocol.HttpAsyncServiceHandler;
+import org.apache.http.nio.protocol.HttpAsyncServerProtocolHandler;
 import org.apache.http.nio.reactor.IOEventDispatch;
 import org.apache.http.nio.reactor.IOReactorExceptionHandler;
 import org.apache.http.nio.reactor.IOReactorStatus;
@@ -68,7 +68,7 @@ public class TestDefaultListeningIOReact
                 new ResponseContent(),
                 new ResponseConnControl()
         });
-        HttpAsyncServiceHandler serviceHandler = new HttpAsyncServiceHandler(
+        HttpAsyncServerProtocolHandler serviceHandler = new HttpAsyncServerProtocolHandler(
                 httpproc,
                 new DefaultConnectionReuseStrategy(),
                 new HttpAsyncRequestHandlerRegistry(),

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java Fri Dec 16 14:24:42 2011
@@ -65,7 +65,7 @@ import org.apache.http.nio.protocol.Http
 import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
 import org.apache.http.nio.protocol.HttpAsyncRequestHandlerResolver;
 import org.apache.http.nio.protocol.HttpAsyncServiceExchange;
-import org.apache.http.nio.protocol.HttpAsyncServiceHandler;
+import org.apache.http.nio.protocol.HttpAsyncServerProtocolHandler;
 import org.apache.http.nio.reactor.IOReactorStatus;
 import org.apache.http.nio.reactor.ListenerEndpoint;
 import org.apache.http.params.CoreProtocolPNames;
@@ -111,7 +111,7 @@ public class TestHttpAsyncHandlers exten
     private InetSocketAddress start(
             final HttpAsyncRequestHandlerResolver requestHandlerResolver,
             final HttpAsyncExpectationVerifier expectationVerifier) throws Exception {
-        HttpAsyncServiceHandler serviceHandler = new HttpAsyncServiceHandler(
+        HttpAsyncServerProtocolHandler serviceHandler = new HttpAsyncServerProtocolHandler(
                 this.serverHttpProc,
                 new DefaultConnectionReuseStrategy(),
                 new DefaultHttpResponseFactory(),

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java Fri Dec 16 14:24:42 2011
@@ -63,7 +63,7 @@ import org.apache.http.nio.protocol.Basi
 import org.apache.http.nio.protocol.BufferingAsyncRequestHandler;
 import org.apache.http.nio.protocol.HttpAsyncClientProtocolHandler;
 import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
-import org.apache.http.nio.protocol.HttpAsyncServiceHandler;
+import org.apache.http.nio.protocol.HttpAsyncServerProtocolHandler;
 import org.apache.http.nio.reactor.IOReactorStatus;
 import org.apache.http.nio.reactor.IOSession;
 import org.apache.http.nio.reactor.ListenerEndpoint;
@@ -193,7 +193,7 @@ public class TestTruncatedChunks extends
     public void testTruncatedChunkException() throws Exception {
         HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
         registry.register("*", new BufferingAsyncRequestHandler(new SimpleRequestHandler(true)));
-        HttpAsyncServiceHandler serviceHandler = new HttpAsyncServiceHandler(
+        HttpAsyncServerProtocolHandler serviceHandler = new HttpAsyncServerProtocolHandler(
                 this.serverHttpProc,
                 new DefaultConnectionReuseStrategy(),
                 registry,
@@ -274,7 +274,7 @@ public class TestTruncatedChunks extends
     public void testIgnoreTruncatedChunkException() throws Exception {
         HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
         registry.register("*", new BufferingAsyncRequestHandler(new SimpleRequestHandler(true)));
-        HttpAsyncServiceHandler serviceHandler = new HttpAsyncServiceHandler(
+        HttpAsyncServerProtocolHandler serviceHandler = new HttpAsyncServerProtocolHandler(
                 this.serverHttpProc,
                 new DefaultConnectionReuseStrategy(),
                 registry,

Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestExecutionHandler.java (from r1213035, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientExchangeHandlerImpl.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestExecutionHandler.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestExecutionHandler.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientExchangeHandlerImpl.java&r1=1213035&r2=1215150&rev=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientExchangeHandlerImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestExecutionHandler.java Fri Dec 16 14:24:42 2011
@@ -51,7 +51,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-public class TestHttpAsyncClientExchangeHandlerImpl {
+public class TestBasicAsyncRequestExecutionHandler {
 
     private BasicFuture<Object> future;
     private HttpAsyncRequestProducer requestProducer;
@@ -61,7 +61,7 @@ public class TestHttpAsyncClientExchange
     private NHttpClientConnection conn;
     private ConnectionReuseStrategy reuseStrategy;
     private HttpParams params;
-    private HttpAsyncClientExchangeHandlerImpl<Object> exchangeHandler;
+    private BasicAsyncRequestExecutionHandler<Object> exchangeHandler;
     private ContentEncoder encoder;
     private ContentDecoder decoder;
 
@@ -76,7 +76,7 @@ public class TestHttpAsyncClientExchange
         this.conn = Mockito.mock(NHttpClientConnection.class);
         this.reuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
         this.params = new BasicHttpParams();
-        this.exchangeHandler = new HttpAsyncClientExchangeHandlerImpl<Object>(
+        this.exchangeHandler = new BasicAsyncRequestExecutionHandler<Object>(
                 this.future,
                 this.requestProducer,
                 this.responseConsumer,
@@ -96,7 +96,7 @@ public class TestHttpAsyncClientExchange
     @Test
     public void testInvalidExecution() throws Exception {
         try {
-            new HttpAsyncClientExchangeHandlerImpl<Object>(
+            new BasicAsyncRequestExecutionHandler<Object>(
                     null,
                     this.requestProducer,
                     this.responseConsumer,
@@ -109,7 +109,7 @@ public class TestHttpAsyncClientExchange
         } catch (IllegalArgumentException ex) {
         }
         try {
-            new HttpAsyncClientExchangeHandlerImpl<Object>(
+            new BasicAsyncRequestExecutionHandler<Object>(
                     this.future,
                     null,
                     this.responseConsumer,
@@ -122,7 +122,7 @@ public class TestHttpAsyncClientExchange
         } catch (IllegalArgumentException ex) {
         }
         try {
-            new HttpAsyncClientExchangeHandlerImpl<Object>(
+            new BasicAsyncRequestExecutionHandler<Object>(
                     this.future,
                     this.requestProducer,
                     null,
@@ -135,7 +135,7 @@ public class TestHttpAsyncClientExchange
         } catch (IllegalArgumentException ex) {
         }
         try {
-            new HttpAsyncClientExchangeHandlerImpl<Object>(
+            new BasicAsyncRequestExecutionHandler<Object>(
                     this.future,
                     this.requestProducer,
                     this.responseConsumer,
@@ -148,7 +148,7 @@ public class TestHttpAsyncClientExchange
         } catch (IllegalArgumentException ex) {
         }
         try {
-            new HttpAsyncClientExchangeHandlerImpl<Object>(
+            new BasicAsyncRequestExecutionHandler<Object>(
                     this.future,
                     this.requestProducer,
                     this.responseConsumer,
@@ -161,7 +161,7 @@ public class TestHttpAsyncClientExchange
         } catch (IllegalArgumentException ex) {
         }
         try {
-            new HttpAsyncClientExchangeHandlerImpl<Object>(
+            new BasicAsyncRequestExecutionHandler<Object>(
                     this.future,
                     this.requestProducer,
                     this.responseConsumer,
@@ -174,7 +174,7 @@ public class TestHttpAsyncClientExchange
         } catch (IllegalArgumentException ex) {
         }
         try {
-            new HttpAsyncClientExchangeHandlerImpl<Object>(
+            new BasicAsyncRequestExecutionHandler<Object>(
                     this.future,
                     this.requestProducer,
                     this.responseConsumer,
@@ -187,7 +187,7 @@ public class TestHttpAsyncClientExchange
         } catch (IllegalArgumentException ex) {
         }
         try {
-            new HttpAsyncClientExchangeHandlerImpl<Object>(
+            new BasicAsyncRequestExecutionHandler<Object>(
                     this.future,
                     this.requestProducer,
                     this.responseConsumer,

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestExecutionHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestExecutionHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestExecutionHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientProtocolHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientProtocolHandler.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientProtocolHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientProtocolHandler.java Fri Dec 16 14:24:42 2011
@@ -59,7 +59,7 @@ public class TestHttpAsyncClientProtocol
     private HttpAsyncClientProtocolHandler protocolHandler;
     private HttpContext connContext;
     private NHttpClientConnection conn;
-    private HttpAsyncClientExchangeHandler<?> exchangeHandler;
+    private HttpAsyncRequestExecutionHandler<?> exchangeHandler;
     private HttpContext exchangeContext;
     private ContentEncoder encoder;
     private ContentDecoder decoder;
@@ -70,7 +70,7 @@ public class TestHttpAsyncClientProtocol
         this.protocolHandler = new HttpAsyncClientProtocolHandler();
         this.connContext = new BasicHttpContext();
         this.conn = Mockito.mock(NHttpClientConnection.class);
-        this.exchangeHandler = Mockito.mock(HttpAsyncClientExchangeHandler.class);
+        this.exchangeHandler = Mockito.mock(HttpAsyncRequestExecutionHandler.class);
         this.exchangeContext = new BasicHttpContext();
         this.encoder = Mockito.mock(ContentEncoder.class);
         this.decoder = Mockito.mock(ContentDecoder.class);

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java?rev=1215150&r1=1215149&r2=1215150&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java Fri Dec 16 14:24:42 2011
@@ -258,7 +258,7 @@ public class TestHttpAsyncRequestExecuto
 
         BasicNIOPoolEntry entry = new BasicNIOPoolEntry("id", host, this.conn);
         connRequestCallback.completed(entry);
-        HttpAsyncClientExchangeHandlerImpl exchangeHandler = (HttpAsyncClientExchangeHandlerImpl) this.connContext.getAttribute(
+        BasicAsyncRequestExecutionHandler exchangeHandler = (BasicAsyncRequestExecutionHandler) this.connContext.getAttribute(
                 HttpAsyncClientProtocolHandler.HTTP_HANDLER);
         Assert.assertNotNull(exchangeHandler);
         Mockito.verify(this.conn).requestOutput();
@@ -290,7 +290,7 @@ public class TestHttpAsyncRequestExecuto
 
         BasicNIOPoolEntry entry = new BasicNIOPoolEntry("id", host, this.conn);
         connRequestCallback.completed(entry);
-        HttpAsyncClientExchangeHandlerImpl exchangeHandler = (HttpAsyncClientExchangeHandlerImpl) this.connContext.getAttribute(
+        BasicAsyncRequestExecutionHandler exchangeHandler = (BasicAsyncRequestExecutionHandler) this.connContext.getAttribute(
                 HttpAsyncClientProtocolHandler.HTTP_HANDLER);
         Assert.assertNotNull(exchangeHandler);
         Mockito.verify(this.conn).requestOutput();
@@ -322,7 +322,7 @@ public class TestHttpAsyncRequestExecuto
 
         BasicNIOPoolEntry entry = new BasicNIOPoolEntry("id", host, this.conn);
         connRequestCallback.completed(entry);
-        HttpAsyncClientExchangeHandlerImpl exchangeHandler = (HttpAsyncClientExchangeHandlerImpl) this.connContext.getAttribute(
+        BasicAsyncRequestExecutionHandler exchangeHandler = (BasicAsyncRequestExecutionHandler) this.connContext.getAttribute(
                 HttpAsyncClientProtocolHandler.HTTP_HANDLER);
         Assert.assertNotNull(exchangeHandler);
         Mockito.verify(this.conn).requestOutput();



Mime
View raw message