hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1174794 - in /httpcomponents/httpasyncclient/trunk/httpasyncclient/src: main/java/org/apache/http/impl/nio/client/ main/java/org/apache/http/impl/nio/conn/ main/java/org/apache/http/nio/client/ main/java/org/apache/http/nio/conn/ main/java...
Date Fri, 23 Sep 2011 14:16:41 GMT
Author: olegk
Date: Fri Sep 23 14:16:40 2011
New Revision: 1174794

URL: http://svn.apache.org/viewvc?rev=1174794&view=rev
Log:
Renamed interfaces and classes in HttpAsyncClient with the same name as thier blocking counterparts in HttpClient

Added:
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java   (contents, props changed)
      - copied, changed from r1174316, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/SchemeRegistryFactory.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultAsyncClientConnection.java   (contents, props changed)
      - copied, changed from r1174357, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientConnection.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java   (contents, props changed)
      - copied, changed from r1174357, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientConnectionImpl.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingAsyncClientConnectionManager.java   (contents, props changed)
      - copied, changed from r1174357, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientConnectionManager.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionManager.java   (contents, props changed)
      - copied, changed from r1174316, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientConnectionManager.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedAsyncClientConnection.java   (contents, props changed)
      - copied, changed from r1174316, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedClientConnection.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/OperatedAsyncClientConnection.java   (contents, props changed)
      - copied, changed from r1174357, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/OperatedClientConnection.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncScheme.java   (contents, props changed)
      - copied, changed from r1174316, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/Scheme.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncSchemeRegistry.java   (contents, props changed)
      - copied, changed from r1174316, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/SchemeRegistry.java
Removed:
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientConnection.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientConnectionImpl.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientConnectionManager.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/SchemeRegistryFactory.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientConnectionManager.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedClientConnection.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/OperatedClientConnection.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/Scheme.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/SchemeRegistry.java
Modified:
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpNIOConnPool.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpPoolEntry.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/HttpAsyncClient.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/HttpAsyncTestBase.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpsAsync.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpsRedirects.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestStatefulConnManagement.java

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java?rev=1174794&r1=1174793&r2=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java Fri Sep 23 14:16:40 2011
@@ -77,12 +77,12 @@ import org.apache.http.impl.cookie.RFC21
 import org.apache.http.impl.cookie.RFC2965SpecFactory;
 import org.apache.http.impl.nio.DefaultClientIODispatch;
 import org.apache.http.impl.nio.conn.DefaultHttpAsyncRoutePlanner;
-import org.apache.http.impl.nio.conn.PoolingClientConnectionManager;
+import org.apache.http.impl.nio.conn.PoolingAsyncClientConnectionManager;
 import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
 import org.apache.http.impl.nio.reactor.IOReactorConfig;
 import org.apache.http.nio.client.HttpAsyncClient;
 import org.apache.http.nio.client.methods.HttpAsyncMethods;
-import org.apache.http.nio.conn.ClientConnectionManager;
+import org.apache.http.nio.conn.ClientAsyncConnectionManager;
 import org.apache.http.nio.protocol.HttpAsyncClientExchangeHandler;
 import org.apache.http.nio.protocol.HttpAsyncRequestProducer;
 import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
@@ -100,7 +100,7 @@ import org.apache.http.protocol.Immutabl
 public abstract class AbstractHttpAsyncClient implements HttpAsyncClient {
 
     private final Log log = LogFactory.getLog(getClass());;
-    private final ClientConnectionManager connmgr;
+    private final ClientAsyncConnectionManager connmgr;
     private final Queue<HttpAsyncClientExchangeHandler<?>> queue;
 
     private Thread reactorThread;
@@ -121,7 +121,7 @@ public abstract class AbstractHttpAsyncC
 
     private volatile boolean terminated;
 
-    protected AbstractHttpAsyncClient(final ClientConnectionManager connmgr) {
+    protected AbstractHttpAsyncClient(final ClientAsyncConnectionManager connmgr) {
         super();
         this.connmgr = connmgr;
         this.queue = new ConcurrentLinkedQueue<HttpAsyncClientExchangeHandler<?>>();
@@ -131,7 +131,7 @@ public abstract class AbstractHttpAsyncC
         super();
         DefaultConnectingIOReactor defaultioreactor = new DefaultConnectingIOReactor(config);
         defaultioreactor.setExceptionHandler(new InternalIOReactorExceptionHandler(this.log));
-        this.connmgr = new PoolingClientConnectionManager(defaultioreactor);
+        this.connmgr = new PoolingAsyncClientConnectionManager(defaultioreactor);
         this.queue = new ConcurrentLinkedQueue<HttpAsyncClientExchangeHandler<?>>();
     }
 
@@ -242,7 +242,7 @@ public abstract class AbstractHttpAsyncC
         this.params = params;
     }
 
-    public synchronized ClientConnectionManager getConnectionManager() {
+    public synchronized ClientAsyncConnectionManager getConnectionManager() {
         return this.connmgr;
     }
 

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java?rev=1174794&r1=1174793&r2=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java Fri Sep 23 14:16:40 2011
@@ -77,9 +77,9 @@ import org.apache.http.message.BasicHttp
 import org.apache.http.nio.ContentDecoder;
 import org.apache.http.nio.ContentEncoder;
 import org.apache.http.nio.IOControl;
-import org.apache.http.nio.conn.ClientConnectionManager;
-import org.apache.http.nio.conn.ManagedClientConnection;
-import org.apache.http.nio.conn.scheme.Scheme;
+import org.apache.http.nio.conn.ClientAsyncConnectionManager;
+import org.apache.http.nio.conn.ManagedAsyncClientConnection;
+import org.apache.http.nio.conn.scheme.AsyncScheme;
 import org.apache.http.nio.protocol.HttpAsyncClientExchangeHandler;
 import org.apache.http.nio.protocol.HttpAsyncClientProtocolHandler;
 import org.apache.http.nio.protocol.HttpAsyncRequestProducer;
@@ -99,7 +99,7 @@ class DefaultAsyncRequestDirector<T> imp
     private final HttpAsyncResponseConsumer<T> responseConsumer;
     private final HttpContext localContext;
     private final ResultCallback<T> resultCallback;
-    private final ClientConnectionManager connmgr;
+    private final ClientAsyncConnectionManager connmgr;
     private final HttpProcessor httppocessor;
     private final HttpRoutePlanner routePlanner;
     private final HttpRouteDirector routeDirector;
@@ -121,8 +121,8 @@ class DefaultAsyncRequestDirector<T> imp
     private RequestWrapper currentRequest;
     private HttpResponse currentResponse;
     private boolean routeEstablished;
-    private Future<ManagedClientConnection> connFuture;
-    private ManagedClientConnection managedConn;
+    private Future<ManagedAsyncClientConnection> connFuture;
+    private ManagedAsyncClientConnection managedConn;
     private int redirectCount;
     private ByteBuffer tmpbuf;
     private boolean requestContentProduced;
@@ -134,7 +134,7 @@ class DefaultAsyncRequestDirector<T> imp
             final HttpAsyncResponseConsumer<T> responseConsumer,
             final HttpContext localContext,
             final ResultCallback<T> callback,
-            final ClientConnectionManager connmgr,
+            final ClientAsyncConnectionManager connmgr,
             final HttpProcessor httppocessor,
             final HttpRoutePlanner routePlanner,
             final ConnectionReuseStrategy reuseStrategy,
@@ -473,7 +473,7 @@ class DefaultAsyncRequestDirector<T> imp
         return this.responseConsumer.getException();
     }
 
-    private synchronized void connectionRequestCompleted(final ManagedClientConnection conn) {
+    private synchronized void connectionRequestCompleted(final ManagedAsyncClientConnection conn) {
         if (this.log.isDebugEnabled()) {
             this.log.debug("Connection request suceeded: " + conn);
         }
@@ -514,9 +514,9 @@ class DefaultAsyncRequestDirector<T> imp
         }
     }
 
-    class InternalFutureCallback implements FutureCallback<ManagedClientConnection> {
+    class InternalFutureCallback implements FutureCallback<ManagedAsyncClientConnection> {
 
-        public void completed(final ManagedClientConnection session) {
+        public void completed(final ManagedAsyncClientConnection session) {
             connectionRequestCompleted(session);
         }
 
@@ -592,7 +592,7 @@ class DefaultAsyncRequestDirector<T> imp
         String host = target.getHostName();
         int port = target.getPort();
         if (port < 0) {
-            Scheme scheme = this.connmgr.getSchemeRegistry().getScheme(target.getSchemeName());
+            AsyncScheme scheme = this.connmgr.getSchemeRegistry().getScheme(target.getSchemeName());
             port = scheme.getDefaultPort();
         }
         StringBuilder buffer = new StringBuilder(host.length() + 6);
@@ -806,7 +806,7 @@ class DefaultAsyncRequestDirector<T> imp
         String hostname = host.getHostName();
         int port = host.getPort();
         if (port < 0) {
-            Scheme scheme = this.connmgr.getSchemeRegistry().getScheme(host);
+            AsyncScheme scheme = this.connmgr.getSchemeRegistry().getScheme(host);
             port = scheme.getDefaultPort();
         }
 

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java?rev=1174794&r1=1174793&r2=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java Fri Sep 23 14:16:40 2011
@@ -37,7 +37,7 @@ import org.apache.http.client.protocol.R
 import org.apache.http.client.protocol.ResponseProcessCookies;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.nio.reactor.IOReactorConfig;
-import org.apache.http.nio.conn.ClientConnectionManager;
+import org.apache.http.nio.conn.ClientAsyncConnectionManager;
 import org.apache.http.nio.reactor.IOReactorException;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
@@ -53,7 +53,7 @@ import org.apache.http.util.VersionInfo;
 
 public class DefaultHttpAsyncClient extends AbstractHttpAsyncClient {
 
-    public DefaultHttpAsyncClient(final ClientConnectionManager connmgr) {
+    public DefaultHttpAsyncClient(final ClientAsyncConnectionManager connmgr) {
         super(connmgr);
     }
 

Copied: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java (from r1174316, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/SchemeRegistryFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java?p2=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java&p1=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/SchemeRegistryFactory.java&r1=1174316&r2=1174794&rev=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/SchemeRegistryFactory.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java Fri Sep 23 14:16:40 2011
@@ -27,22 +27,22 @@
 package org.apache.http.impl.nio.conn;
 
 import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.conn.scheme.Scheme;
-import org.apache.http.nio.conn.scheme.SchemeRegistry;
+import org.apache.http.nio.conn.scheme.AsyncScheme;
+import org.apache.http.nio.conn.scheme.AsyncSchemeRegistry;
 import org.apache.http.nio.conn.ssl.SSLLayeringStrategy;
 
 /**
  * @since 4.1
  */
 @ThreadSafe
-public final class SchemeRegistryFactory {
+public final class AsyncSchemeRegistryFactory {
 
-    public static SchemeRegistry createDefault() {
-        SchemeRegistry registry = new SchemeRegistry();
+    public static AsyncSchemeRegistry createDefault() {
+        AsyncSchemeRegistry registry = new AsyncSchemeRegistry();
         registry.register(
-                new Scheme("http", 80, null));
+                new AsyncScheme("http", 80, null));
         registry.register(
-                new Scheme("https", 443, SSLLayeringStrategy.getDefaultStrategy()));
+                new AsyncScheme("https", 443, SSLLayeringStrategy.getDefaultStrategy()));
         return registry;
     }
 

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

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

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

Copied: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultAsyncClientConnection.java (from r1174357, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultAsyncClientConnection.java?p2=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultAsyncClientConnection.java&p1=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientConnection.java&r1=1174357&r2=1174794&rev=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientConnection.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultAsyncClientConnection.java Fri Sep 23 14:16:40 2011
@@ -39,15 +39,15 @@ import org.apache.http.HttpResponseFacto
 import org.apache.http.impl.nio.DefaultNHttpClientConnection;
 import org.apache.http.nio.NHttpMessageParser;
 import org.apache.http.nio.NHttpMessageWriter;
-import org.apache.http.nio.conn.OperatedClientConnection;
+import org.apache.http.nio.conn.OperatedAsyncClientConnection;
 import org.apache.http.nio.reactor.IOSession;
 import org.apache.http.nio.reactor.SessionInputBuffer;
 import org.apache.http.nio.reactor.SessionOutputBuffer;
 import org.apache.http.nio.util.ByteBufferAllocator;
 import org.apache.http.params.HttpParams;
 
-public class DefaultClientConnection
-                        extends DefaultNHttpClientConnection implements OperatedClientConnection {
+public class DefaultAsyncClientConnection
+                    extends DefaultNHttpClientConnection implements OperatedAsyncClientConnection {
 
     private final Log headerlog = LogFactory.getLog("org.apache.http.headers");
     private final Log wirelog   = LogFactory.getLog("org.apache.http.wire");
@@ -55,7 +55,7 @@ public class DefaultClientConnection
 
     private String id;
 
-    public DefaultClientConnection(
+    public DefaultAsyncClientConnection(
             final String id,
             final IOSession iosession,
             final HttpResponseFactory responseFactory,

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

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

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

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java?rev=1174794&r1=1174793&r2=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java Fri Sep 23 14:16:40 2011
@@ -33,8 +33,8 @@ import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.nio.conn.scheme.LayeringStrategy;
-import org.apache.http.nio.conn.scheme.Scheme;
-import org.apache.http.nio.conn.scheme.SchemeRegistry;
+import org.apache.http.nio.conn.scheme.AsyncScheme;
+import org.apache.http.nio.conn.scheme.AsyncSchemeRegistry;
 import org.apache.http.protocol.HttpContext;
 
 import org.apache.http.conn.routing.HttpRoute;
@@ -44,9 +44,9 @@ import org.apache.http.conn.params.ConnR
 
 public class DefaultHttpAsyncRoutePlanner implements HttpRoutePlanner {
 
-    private final SchemeRegistry schemeRegistry;
+    private final AsyncSchemeRegistry schemeRegistry;
 
-    public DefaultHttpAsyncRoutePlanner(final SchemeRegistry schemeRegistry) {
+    public DefaultHttpAsyncRoutePlanner(final AsyncSchemeRegistry schemeRegistry) {
         super();
         this.schemeRegistry = schemeRegistry;
     }
@@ -67,7 +67,7 @@ public class DefaultHttpAsyncRoutePlanne
         }
         InetAddress local = ConnRouteParams.getLocalAddress(request.getParams());
         HttpHost proxy = ConnRouteParams.getDefaultProxy(request.getParams());
-        Scheme scheme;
+        AsyncScheme scheme;
         try {
             scheme = this.schemeRegistry.getScheme(target);
         } catch (IllegalStateException ex) {

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpNIOConnPool.java?rev=1174794&r1=1174793&r2=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpNIOConnPool.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpNIOConnPool.java Fri Sep 23 14:16:40 2011
@@ -34,8 +34,8 @@ import java.util.concurrent.atomic.Atomi
 import org.apache.commons.logging.Log;
 import org.apache.http.HttpHost;
 import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.nio.conn.scheme.Scheme;
-import org.apache.http.nio.conn.scheme.SchemeRegistry;
+import org.apache.http.nio.conn.scheme.AsyncScheme;
+import org.apache.http.nio.conn.scheme.AsyncSchemeRegistry;
 import org.apache.http.nio.pool.AbstractNIOConnPool;
 import org.apache.http.nio.reactor.ConnectingIOReactor;
 import org.apache.http.nio.reactor.IOSession;
@@ -45,14 +45,14 @@ class HttpNIOConnPool extends AbstractNI
     private static AtomicLong COUNTER = new AtomicLong();
 
     private final Log log;
-    private final SchemeRegistry schemeRegistry;
+    private final AsyncSchemeRegistry schemeRegistry;
     private final long connTimeToLive;
     private final TimeUnit tunit;
 
     HttpNIOConnPool(
             final Log log,
             final ConnectingIOReactor ioreactor,
-            final SchemeRegistry schemeRegistry,
+            final AsyncSchemeRegistry schemeRegistry,
             long connTimeToLive, final TimeUnit tunit) {
         super(ioreactor, new HttpNIOConnPoolFactory(), 2, 20);
         this.log = log;
@@ -75,7 +75,7 @@ class HttpNIOConnPool extends AbstractNI
         String hostname = firsthop.getHostName();
         int port = firsthop.getPort();
         if (port < 0) {
-            Scheme scheme = this.schemeRegistry.getScheme(firsthop);
+            AsyncScheme scheme = this.schemeRegistry.getScheme(firsthop);
             port = scheme.resolvePort(port);
         }
         return new InetSocketAddress(hostname, port);

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpPoolEntry.java?rev=1174794&r1=1174793&r2=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpPoolEntry.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpPoolEntry.java Fri Sep 23 14:16:40 2011
@@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
 import org.apache.commons.logging.Log;
 import org.apache.http.conn.routing.HttpRoute;
 import org.apache.http.conn.routing.RouteTracker;
-import org.apache.http.nio.conn.OperatedClientConnection;
+import org.apache.http.nio.conn.OperatedAsyncClientConnection;
 import org.apache.http.nio.reactor.IOSession;
 import org.apache.http.pool.PoolEntry;
 import org.apache.http.protocol.ExecutionContext;
@@ -59,9 +59,9 @@ class HttpPoolEntry extends PoolEntry<Ht
         return expired;
     }
 
-    public OperatedClientConnection getOperatedClientConnection() {
+    public OperatedAsyncClientConnection getOperatedClientConnection() {
         IOSession session = getConnection();
-        return (OperatedClientConnection) session.getAttribute(
+        return (OperatedAsyncClientConnection) session.getAttribute(
                 ExecutionContext.HTTP_CONNECTION);
     }
 

Copied: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java (from r1174357, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientConnectionImpl.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java?p2=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java&p1=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientConnectionImpl.java&r1=1174357&r2=1174794&rev=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientConnectionImpl.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java Fri Sep 23 14:16:40 2011
@@ -42,11 +42,11 @@ import org.apache.http.conn.routing.Http
 import org.apache.http.conn.routing.RouteTracker;
 import org.apache.http.impl.DefaultHttpResponseFactory;
 import org.apache.http.impl.conn.ConnectionShutdownException;
-import org.apache.http.nio.conn.ClientConnectionManager;
-import org.apache.http.nio.conn.ManagedClientConnection;
-import org.apache.http.nio.conn.OperatedClientConnection;
+import org.apache.http.nio.conn.ClientAsyncConnectionManager;
+import org.apache.http.nio.conn.ManagedAsyncClientConnection;
+import org.apache.http.nio.conn.OperatedAsyncClientConnection;
 import org.apache.http.nio.conn.scheme.LayeringStrategy;
-import org.apache.http.nio.conn.scheme.Scheme;
+import org.apache.http.nio.conn.scheme.AsyncScheme;
 import org.apache.http.nio.reactor.IOSession;
 import org.apache.http.nio.reactor.ssl.SSLIOSession;
 import org.apache.http.nio.util.ByteBufferAllocator;
@@ -55,15 +55,15 @@ import org.apache.http.params.HttpParams
 import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpContext;
 
-class ManagedClientConnectionImpl implements ManagedClientConnection {
+class ManagedAsyncClientConnectionImpl implements ManagedAsyncClientConnection {
 
-    private final ClientConnectionManager manager;
+    private final ClientAsyncConnectionManager manager;
     private volatile HttpPoolEntry poolEntry;
     private volatile boolean reusable;
     private volatile long duration;
 
-    public ManagedClientConnectionImpl(
-            final ClientConnectionManager manager,
+    public ManagedAsyncClientConnectionImpl(
+            final ClientAsyncConnectionManager manager,
             final HttpPoolEntry poolEntry) {
         super();
         this.manager = manager;
@@ -82,27 +82,27 @@ class ManagedClientConnectionImpl implem
         return local;
     }
 
-    public ClientConnectionManager getManager() {
+    public ClientAsyncConnectionManager getManager() {
         return this.manager;
     }
 
-    private OperatedClientConnection getConnection() {
+    private OperatedAsyncClientConnection getConnection() {
         HttpPoolEntry local = this.poolEntry;
         if (local == null) {
             return null;
         }
         IOSession session = local.getConnection();
-        return (OperatedClientConnection) session.getAttribute(
+        return (OperatedAsyncClientConnection) session.getAttribute(
                 ExecutionContext.HTTP_CONNECTION);
     }
 
-    private OperatedClientConnection ensureConnection() {
+    private OperatedAsyncClientConnection ensureConnection() {
         HttpPoolEntry local = this.poolEntry;
         if (local == null) {
             throw new ConnectionShutdownException();
         }
         IOSession session = local.getConnection();
-        return (OperatedClientConnection) session.getAttribute(
+        return (OperatedAsyncClientConnection) session.getAttribute(
                 ExecutionContext.HTTP_CONNECTION);
     }
 
@@ -115,21 +115,21 @@ class ManagedClientConnectionImpl implem
     }
 
     public void close() throws IOException {
-        OperatedClientConnection conn = getConnection();
+        OperatedAsyncClientConnection conn = getConnection();
         if (conn != null) {
             conn.close();
         }
     }
 
     public void shutdown() throws IOException {
-        OperatedClientConnection conn = getConnection();
+        OperatedAsyncClientConnection conn = getConnection();
         if (conn != null) {
             conn.shutdown();
         }
     }
 
     public boolean isOpen() {
-        OperatedClientConnection conn = getConnection();
+        OperatedAsyncClientConnection conn = getConnection();
         if (conn != null) {
             return conn.isOpen();
         } else {
@@ -142,102 +142,102 @@ class ManagedClientConnectionImpl implem
     }
 
     public void setSocketTimeout(int timeout) {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         conn.setSocketTimeout(timeout);
     }
 
     public int getSocketTimeout() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         return conn.getSocketTimeout();
     }
 
     public HttpConnectionMetrics getMetrics() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         return conn.getMetrics();
     }
 
     public InetAddress getLocalAddress() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         return conn.getLocalAddress();
     }
 
     public int getLocalPort() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         return conn.getLocalPort();
     }
 
     public InetAddress getRemoteAddress() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         return conn.getRemoteAddress();
     }
 
     public int getRemotePort() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         return conn.getRemotePort();
     }
 
     public int getStatus() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         return conn.getStatus();
     }
 
     public HttpRequest getHttpRequest() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         return conn.getHttpRequest();
     }
 
     public HttpResponse getHttpResponse() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         return conn.getHttpResponse();
     }
 
     public HttpContext getContext() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         return conn.getContext();
     }
 
     public void requestInput() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         conn.requestInput();
     }
 
     public void suspendInput() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         conn.suspendInput();
     }
 
     public void requestOutput() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         conn.requestOutput();
     }
 
     public void suspendOutput() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         conn.suspendOutput();
     }
 
     public void submitRequest(final HttpRequest request) throws IOException, HttpException {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         conn.submitRequest(request);
     }
 
     public boolean isRequestSubmitted() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         return conn.isRequestSubmitted();
     }
 
     public void resetOutput() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         conn.resetOutput();
     }
 
     public void resetInput() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         conn.resetInput();
     }
 
     public boolean isSecure() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         return conn.getIOSession() instanceof SSLIOSession;
     }
 
@@ -247,7 +247,7 @@ class ManagedClientConnectionImpl implem
     }
 
     public SSLSession getSSLSession() {
-        OperatedClientConnection conn = ensureConnection();
+        OperatedAsyncClientConnection conn = ensureConnection();
         IOSession iosession = conn.getIOSession();
         if (iosession instanceof SSLIOSession) {
             return ((SSLIOSession) iosession).getSSLSession();
@@ -308,14 +308,14 @@ class ManagedClientConnectionImpl implem
         IOSession iosession = entry.getConnection();
 
         if (proxy == null) {
-            Scheme scheme = this.manager.getSchemeRegistry().getScheme(target);
+            AsyncScheme scheme = this.manager.getSchemeRegistry().getScheme(target);
             LayeringStrategy layeringStrategy = scheme.getLayeringStrategy();
             if (layeringStrategy != null) {
                 iosession = layeringStrategy.layer(iosession);
             }
         }
 
-        OperatedClientConnection conn = new DefaultClientConnection(
+        OperatedAsyncClientConnection conn = new DefaultAsyncClientConnection(
                 "http-outgoing-" + entry.getId(),
                 iosession,
                 createHttpResponseFactory(),
@@ -367,14 +367,14 @@ class ManagedClientConnectionImpl implem
             throw new IllegalStateException("Multiple protocol layering not supported");
         }
         HttpHost target = tracker.getTargetHost();
-        Scheme scheme = this.manager.getSchemeRegistry().getScheme(target);
+        AsyncScheme scheme = this.manager.getSchemeRegistry().getScheme(target);
         LayeringStrategy layeringStrategy = scheme.getLayeringStrategy();
         if (layeringStrategy == null) {
             throw new IllegalStateException(scheme.getName() +
                     " scheme does not provider support for protocol layering");
         }
         IOSession iosession = entry.getConnection();
-        OperatedClientConnection conn = (OperatedClientConnection) iosession.getAttribute(
+        OperatedAsyncClientConnection conn = (OperatedAsyncClientConnection) iosession.getAttribute(
                 ExecutionContext.HTTP_CONNECTION);
         conn.upgrade((SSLIOSession) layeringStrategy.layer(iosession));
         tracker.layerProtocol(layeringStrategy.isSecure());
@@ -394,7 +394,7 @@ class ManagedClientConnectionImpl implem
         }
         this.reusable = false;
         IOSession iosession = this.poolEntry.getConnection();
-        OperatedClientConnection conn = (OperatedClientConnection) iosession.getAttribute(
+        OperatedAsyncClientConnection conn = (OperatedAsyncClientConnection) iosession.getAttribute(
                 ExecutionContext.HTTP_CONNECTION);
         try {
             conn.shutdown();

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

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedAsyncClientConnectionImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

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

Copied: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingAsyncClientConnectionManager.java (from r1174357, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientConnectionManager.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingAsyncClientConnectionManager.java?p2=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingAsyncClientConnectionManager.java&p1=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientConnectionManager.java&r1=1174357&r2=1174794&rev=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientConnectionManager.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingAsyncClientConnectionManager.java Fri Sep 23 14:16:40 2011
@@ -35,9 +35,9 @@ import org.apache.commons.logging.LogFac
 import org.apache.http.concurrent.BasicFuture;
 import org.apache.http.concurrent.FutureCallback;
 import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.nio.conn.ManagedClientConnection;
-import org.apache.http.nio.conn.ClientConnectionManager;
-import org.apache.http.nio.conn.scheme.SchemeRegistry;
+import org.apache.http.nio.conn.ManagedAsyncClientConnection;
+import org.apache.http.nio.conn.ClientAsyncConnectionManager;
+import org.apache.http.nio.conn.scheme.AsyncSchemeRegistry;
 import org.apache.http.nio.reactor.ConnectingIOReactor;
 import org.apache.http.nio.reactor.IOEventDispatch;
 import org.apache.http.nio.reactor.IOReactorException;
@@ -45,17 +45,18 @@ import org.apache.http.nio.reactor.IORea
 import org.apache.http.pool.ConnPoolControl;
 import org.apache.http.pool.PoolStats;
 
-public class PoolingClientConnectionManager implements ClientConnectionManager, ConnPoolControl<HttpRoute> {
+public class PoolingAsyncClientConnectionManager
+                              implements ClientAsyncConnectionManager, ConnPoolControl<HttpRoute> {
 
     private final Log log = LogFactory.getLog(getClass());
 
     private final ConnectingIOReactor ioreactor;
     private final HttpNIOConnPool pool;
-    private final SchemeRegistry schemeRegistry;
+    private final AsyncSchemeRegistry schemeRegistry;
 
-    public PoolingClientConnectionManager(
+    public PoolingAsyncClientConnectionManager(
             final ConnectingIOReactor ioreactor,
-            final SchemeRegistry schemeRegistry,
+            final AsyncSchemeRegistry schemeRegistry,
             final long timeToLive, final TimeUnit tunit) {
         super();
         if (ioreactor == null) {
@@ -72,15 +73,15 @@ public class PoolingClientConnectionMana
         this.schemeRegistry = schemeRegistry;
     }
 
-    public PoolingClientConnectionManager(
+    public PoolingAsyncClientConnectionManager(
             final ConnectingIOReactor ioreactor,
-            final SchemeRegistry schemeRegistry) throws IOReactorException {
+            final AsyncSchemeRegistry schemeRegistry) throws IOReactorException {
         this(ioreactor, schemeRegistry, -1, TimeUnit.MILLISECONDS);
     }
 
-    public PoolingClientConnectionManager(
+    public PoolingAsyncClientConnectionManager(
             final ConnectingIOReactor ioreactor) throws IOReactorException {
-        this(ioreactor, SchemeRegistryFactory.createDefault());
+        this(ioreactor, AsyncSchemeRegistryFactory.createDefault());
     }
 
     @Override
@@ -92,7 +93,7 @@ public class PoolingClientConnectionMana
         }
     }
 
-    public SchemeRegistry getSchemeRegistry() {
+    public AsyncSchemeRegistry getSchemeRegistry() {
         return this.schemeRegistry;
     }
 
@@ -148,12 +149,12 @@ public class PoolingClientConnectionMana
         return buf.toString();
     }
 
-    public Future<ManagedClientConnection> leaseConnection(
+    public Future<ManagedAsyncClientConnection> leaseConnection(
             final HttpRoute route,
             final Object state,
             final long connectTimeout,
             final TimeUnit tunit,
-            final FutureCallback<ManagedClientConnection> callback) {
+            final FutureCallback<ManagedAsyncClientConnection> callback) {
         if (route == null) {
             throw new IllegalArgumentException("HTTP route may not be null");
         }
@@ -163,28 +164,28 @@ public class PoolingClientConnectionMana
         if (this.log.isDebugEnabled()) {
             this.log.debug("Connection request: " + format(route, state) + formatStats(route));
         }
-        BasicFuture<ManagedClientConnection> future = new BasicFuture<ManagedClientConnection>(
+        BasicFuture<ManagedAsyncClientConnection> future = new BasicFuture<ManagedAsyncClientConnection>(
                 callback);
         this.pool.lease(route, state, connectTimeout, tunit, new InternalPoolEntryCallback(future));
         return future;
     }
 
     public void releaseConnection(
-            final ManagedClientConnection conn,
+            final ManagedAsyncClientConnection conn,
             final long keepalive,
             final TimeUnit tunit) {
         if (conn == null) {
             throw new IllegalArgumentException("HTTP connection may not be null");
         }
-        if (!(conn instanceof ManagedClientConnectionImpl)) {
+        if (!(conn instanceof ManagedAsyncClientConnectionImpl)) {
             throw new IllegalArgumentException("Connection class mismatch, " +
                  "connection not obtained from this manager");
         }
         if (tunit == null) {
             throw new IllegalArgumentException("Time unit may not be null");
         }
-        ManagedClientConnectionImpl managedConn = (ManagedClientConnectionImpl) conn;
-        ClientConnectionManager manager = managedConn.getManager();
+        ManagedAsyncClientConnectionImpl managedConn = (ManagedAsyncClientConnectionImpl) conn;
+        ClientAsyncConnectionManager manager = managedConn.getManager();
         if (manager != null && manager != this) {
             throw new IllegalArgumentException("Connection not obtained from this manager");
         }
@@ -287,10 +288,10 @@ public class PoolingClientConnectionMana
 
     class InternalPoolEntryCallback implements FutureCallback<HttpPoolEntry> {
 
-        private final BasicFuture<ManagedClientConnection> future;
+        private final BasicFuture<ManagedAsyncClientConnection> future;
 
         public InternalPoolEntryCallback(
-                final BasicFuture<ManagedClientConnection> future) {
+                final BasicFuture<ManagedAsyncClientConnection> future) {
             super();
             this.future = future;
         }
@@ -299,8 +300,8 @@ public class PoolingClientConnectionMana
             if (log.isDebugEnabled()) {
                 log.debug("Connection leased: " + format(entry) + formatStats(entry.getRoute()));
             }
-            ManagedClientConnection conn = new ManagedClientConnectionImpl(
-                    PoolingClientConnectionManager.this,
+            ManagedAsyncClientConnection conn = new ManagedAsyncClientConnectionImpl(
+                    PoolingAsyncClientConnectionManager.this,
                     entry);
             if (!this.future.completed(conn)) {
                 pool.release(entry, true);

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

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingAsyncClientConnectionManager.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

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

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/HttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/HttpAsyncClient.java?rev=1174794&r1=1174793&r2=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/HttpAsyncClient.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/HttpAsyncClient.java Fri Sep 23 14:16:40 2011
@@ -33,7 +33,7 @@ import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.nio.conn.ClientConnectionManager;
+import org.apache.http.nio.conn.ClientAsyncConnectionManager;
 import org.apache.http.nio.protocol.HttpAsyncRequestProducer;
 import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
 import org.apache.http.nio.reactor.IOReactorStatus;
@@ -48,7 +48,7 @@ public interface HttpAsyncClient {
 
     IOReactorStatus getStatus();
 
-    ClientConnectionManager getConnectionManager();
+    ClientAsyncConnectionManager getConnectionManager();
 
     HttpParams getParams();
 

Copied: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionManager.java (from r1174316, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientConnectionManager.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionManager.java?p2=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionManager.java&p1=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientConnectionManager.java&r1=1174316&r2=1174794&rev=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientConnectionManager.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionManager.java Fri Sep 23 14:16:40 2011
@@ -31,19 +31,19 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.http.concurrent.FutureCallback;
 import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.nio.conn.scheme.SchemeRegistry;
+import org.apache.http.nio.conn.scheme.AsyncSchemeRegistry;
 import org.apache.http.nio.reactor.IOReactor;
 
-public interface ClientConnectionManager extends IOReactor {
+public interface ClientAsyncConnectionManager extends IOReactor {
 
-    SchemeRegistry getSchemeRegistry();
+    AsyncSchemeRegistry getSchemeRegistry();
 
-    Future<ManagedClientConnection> leaseConnection(
+    Future<ManagedAsyncClientConnection> leaseConnection(
             HttpRoute route, Object state,
             long connectTimeout, TimeUnit timeUnit,
-            FutureCallback<ManagedClientConnection> callback);
+            FutureCallback<ManagedAsyncClientConnection> callback);
 
-    void releaseConnection(ManagedClientConnection session,
+    void releaseConnection(ManagedAsyncClientConnection session,
             long validDuration, TimeUnit timeUnit);
 
 }

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionManager.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

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

Copied: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedAsyncClientConnection.java (from r1174316, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedClientConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedAsyncClientConnection.java?p2=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedAsyncClientConnection.java&p1=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedClientConnection.java&r1=1174316&r2=1174794&rev=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedClientConnection.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedAsyncClientConnection.java Fri Sep 23 14:16:40 2011
@@ -37,7 +37,7 @@ import org.apache.http.nio.NHttpClientCo
 import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
 
-public interface ManagedClientConnection
+public interface ManagedAsyncClientConnection
     extends HttpRoutedConnection, NHttpClientConnection, ConnectionReleaseTrigger {
 
     Object getState();

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedAsyncClientConnection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedAsyncClientConnection.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

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

Copied: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/OperatedAsyncClientConnection.java (from r1174357, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/OperatedClientConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/OperatedAsyncClientConnection.java?p2=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/OperatedAsyncClientConnection.java&p1=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/OperatedClientConnection.java&r1=1174357&r2=1174794&rev=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/OperatedClientConnection.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/OperatedAsyncClientConnection.java Fri Sep 23 14:16:40 2011
@@ -31,7 +31,7 @@ import org.apache.http.nio.NHttpClientCo
 import org.apache.http.nio.NHttpClientIOTarget;
 import org.apache.http.nio.reactor.IOSession;
 
-public interface OperatedClientConnection
+public interface OperatedAsyncClientConnection
     extends NHttpClientConnection, HttpInetConnection, NHttpClientIOTarget {
 
     void upgrade(IOSession iosession);

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/OperatedAsyncClientConnection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/OperatedAsyncClientConnection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

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

Copied: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncScheme.java (from r1174316, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/Scheme.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncScheme.java?p2=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncScheme.java&p1=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/Scheme.java&r1=1174316&r2=1174794&rev=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/Scheme.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncScheme.java Fri Sep 23 14:16:40 2011
@@ -30,7 +30,7 @@ import java.util.Locale;
 
 import org.apache.http.util.LangUtils;
 
-public final class Scheme {
+public final class AsyncScheme {
 
     /** The name of this scheme, in lowercase. (e.g. http, https) */
     private final String name;
@@ -49,7 +49,7 @@ public final class Scheme {
      *  need to synchronize, and it does not affect immutability.
     */
 
-    public Scheme(final String name, final int port, final LayeringStrategy strategy) {
+    public AsyncScheme(final String name, final int port, final LayeringStrategy strategy) {
         if (name == null) {
             throw new IllegalArgumentException("Scheme name may not be null");
         }
@@ -92,8 +92,8 @@ public final class Scheme {
     @Override
     public final boolean equals(Object obj) {
         if (this == obj) return true;
-        if (obj instanceof Scheme) {
-            Scheme that = (Scheme) obj;
+        if (obj instanceof AsyncScheme) {
+            AsyncScheme that = (AsyncScheme) obj;
             return this.name.equals(that.name)
                 && this.defaultPort == that.defaultPort
                 && this.strategy.equals(that.strategy);

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncScheme.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncScheme.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncScheme.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncSchemeRegistry.java (from r1174316, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/SchemeRegistry.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncSchemeRegistry.java?p2=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncSchemeRegistry.java&p1=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/SchemeRegistry.java&r1=1174316&r2=1174794&rev=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/SchemeRegistry.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncSchemeRegistry.java Fri Sep 23 14:16:40 2011
@@ -34,21 +34,21 @@ import java.util.concurrent.ConcurrentHa
 import org.apache.http.HttpHost;
 
 /**
- * A set of supported protocol {@link Scheme}s.
+ * A set of supported protocol {@link AsyncScheme}s.
  * Schemes are identified by lowercase names.
  *
  */
-public final class SchemeRegistry {
+public final class AsyncSchemeRegistry {
 
     /** The available schemes in this registry. */
-    private final Map<String, Scheme> registeredSchemes;
+    private final Map<String, AsyncScheme> registeredSchemes;
 
     /**
      * Creates a new, empty scheme registry.
      */
-    public SchemeRegistry() {
+    public AsyncSchemeRegistry() {
         super();
-        registeredSchemes = new ConcurrentHashMap<String, Scheme>();
+        registeredSchemes = new ConcurrentHashMap<String, AsyncScheme>();
     }
 
     /**
@@ -61,8 +61,8 @@ public final class SchemeRegistry {
      * @throws IllegalStateException
      *          if the scheme with the given name is not registered
      */
-    public final Scheme getScheme(String name) {
-        Scheme found = get(name);
+    public final AsyncScheme getScheme(String name) {
+        AsyncScheme found = get(name);
         if (found == null) {
             throw new IllegalStateException
                 ("Scheme '"+name+"' not registered.");
@@ -81,7 +81,7 @@ public final class SchemeRegistry {
      * @throws IllegalStateException
      *          if a scheme with the respective name is not registered
      */
-    public final Scheme getScheme(HttpHost host) {
+    public final AsyncScheme getScheme(HttpHost host) {
         if (host == null) {
             throw new IllegalArgumentException("Host must not be null.");
         }
@@ -96,13 +96,13 @@ public final class SchemeRegistry {
      * @return  the scheme, or
      *          <code>null</code> if there is none by this name
      */
-    public final Scheme get(String name) {
+    public final AsyncScheme get(String name) {
         if (name == null)
             throw new IllegalArgumentException("Name must not be null.");
 
         // leave it to the caller to use the correct name - all lowercase
         //name = name.toLowerCase();
-        Scheme found = registeredSchemes.get(name);
+        AsyncScheme found = registeredSchemes.get(name);
         return found;
     }
 
@@ -116,11 +116,11 @@ public final class SchemeRegistry {
      * @return  the scheme previously registered with that name, or
      *          <code>null</code> if none was registered
      */
-    public final Scheme register(Scheme sch) {
+    public final AsyncScheme register(AsyncScheme sch) {
         if (sch == null)
             throw new IllegalArgumentException("Scheme must not be null.");
 
-        Scheme old = registeredSchemes.put(sch.getName(), sch);
+        AsyncScheme old = registeredSchemes.put(sch.getName(), sch);
         return old;
     }
 
@@ -132,13 +132,13 @@ public final class SchemeRegistry {
      * @return  the unregistered scheme, or
      *          <code>null</code> if there was none
      */
-    public final Scheme unregister(String name) {
+    public final AsyncScheme unregister(String name) {
         if (name == null)
             throw new IllegalArgumentException("Name must not be null.");
 
         // leave it to the caller to use the correct name - all lowercase
         //name = name.toLowerCase();
-        Scheme gone = registeredSchemes.remove(name);
+        AsyncScheme gone = registeredSchemes.remove(name);
         return gone;
     }
 
@@ -152,12 +152,12 @@ public final class SchemeRegistry {
     }
 
     /**
-     * Populates the internal collection of registered {@link Scheme protocol schemes}
+     * Populates the internal collection of registered {@link AsyncScheme protocol schemes}
      * with the content of the map passed as a parameter.
      *
      * @param map protocol schemes
      */
-    public void setItems(final Map<String, Scheme> map) {
+    public void setItems(final Map<String, AsyncScheme> map) {
         if (map == null) {
             return;
         }

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncSchemeRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncSchemeRegistry.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncSchemeRegistry.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/HttpAsyncTestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/HttpAsyncTestBase.java?rev=1174794&r1=1174793&r2=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/HttpAsyncTestBase.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/HttpAsyncTestBase.java Fri Sep 23 14:16:40 2011
@@ -31,13 +31,13 @@ import java.io.IOException;
 
 import org.apache.http.HttpResponseInterceptor;
 import org.apache.http.impl.nio.client.DefaultHttpAsyncClient;
-import org.apache.http.impl.nio.conn.PoolingClientConnectionManager;
+import org.apache.http.impl.nio.conn.PoolingAsyncClientConnectionManager;
 import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
 import org.apache.http.localserver.HttpServerNio;
 import org.apache.http.nio.NHttpConnectionFactory;
 import org.apache.http.nio.NHttpServerIOTarget;
-import org.apache.http.nio.conn.scheme.Scheme;
-import org.apache.http.nio.conn.scheme.SchemeRegistry;
+import org.apache.http.nio.conn.scheme.AsyncScheme;
+import org.apache.http.nio.conn.scheme.AsyncSchemeRegistry;
 import org.apache.http.nio.reactor.IOReactorExceptionHandler;
 import org.apache.http.params.CoreConnectionPNames;
 import org.apache.http.params.CoreProtocolPNames;
@@ -57,7 +57,7 @@ public abstract class HttpAsyncTestBase 
     protected HttpServerNio server;
     protected HttpProcessor serverHttpProc;
     protected DefaultConnectingIOReactor ioreactor;
-    protected PoolingClientConnectionManager connMgr;
+    protected PoolingAsyncClientConnectionManager connMgr;
     protected DefaultHttpAsyncClient httpclient;
 
     protected abstract NHttpConnectionFactory<NHttpServerIOTarget> createServerConnectionFactory(
@@ -99,9 +99,9 @@ public abstract class HttpAsyncTestBase 
 
     public void initClient() throws Exception {
         this.ioreactor = new DefaultConnectingIOReactor();
-        SchemeRegistry schemeRegistry = new SchemeRegistry();
-        schemeRegistry.register(new Scheme("http", 80, null));
-        this.connMgr = new PoolingClientConnectionManager(this.ioreactor, schemeRegistry);
+        AsyncSchemeRegistry schemeRegistry = new AsyncSchemeRegistry();
+        schemeRegistry.register(new AsyncScheme("http", 80, null));
+        this.connMgr = new PoolingAsyncClientConnectionManager(this.ioreactor, schemeRegistry);
         this.httpclient = new DefaultHttpAsyncClient(this.connMgr);
         this.httpclient.getParams()
             .setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 60000)

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpsAsync.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpsAsync.java?rev=1174794&r1=1174793&r2=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpsAsync.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpsAsync.java Fri Sep 23 14:16:40 2011
@@ -30,7 +30,7 @@ import org.apache.http.SSLTestContexts;
 import org.apache.http.impl.nio.SSLNHttpServerConnectionFactory;
 import org.apache.http.nio.NHttpConnectionFactory;
 import org.apache.http.nio.NHttpServerIOTarget;
-import org.apache.http.nio.conn.scheme.Scheme;
+import org.apache.http.nio.conn.scheme.AsyncScheme;
 import org.apache.http.nio.conn.ssl.SSLLayeringStrategy;
 import org.apache.http.params.HttpParams;
 
@@ -50,7 +50,7 @@ public class TestHttpsAsync extends Test
     @Override
     public void initClient() throws Exception {
         super.initClient();
-        this.connMgr.getSchemeRegistry().register(new Scheme("https", 443,
+        this.connMgr.getSchemeRegistry().register(new AsyncScheme("https", 443,
                 new SSLLayeringStrategy(SSLTestContexts.createClientSSLContext())));
     }
 

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpsRedirects.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpsRedirects.java?rev=1174794&r1=1174793&r2=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpsRedirects.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpsRedirects.java Fri Sep 23 14:16:40 2011
@@ -30,7 +30,7 @@ import org.apache.http.SSLTestContexts;
 import org.apache.http.impl.nio.SSLNHttpServerConnectionFactory;
 import org.apache.http.nio.NHttpConnectionFactory;
 import org.apache.http.nio.NHttpServerIOTarget;
-import org.apache.http.nio.conn.scheme.Scheme;
+import org.apache.http.nio.conn.scheme.AsyncScheme;
 import org.apache.http.nio.conn.ssl.SSLLayeringStrategy;
 import org.apache.http.params.HttpParams;
 
@@ -50,7 +50,7 @@ public class TestHttpsRedirects extends 
     @Override
     public void initClient() throws Exception {
         super.initClient();
-        this.connMgr.getSchemeRegistry().register(new Scheme("https", 443,
+        this.connMgr.getSchemeRegistry().register(new AsyncScheme("https", 443,
                 new SSLLayeringStrategy(SSLTestContexts.createClientSSLContext())));
     }
 

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestStatefulConnManagement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestStatefulConnManagement.java?rev=1174794&r1=1174793&r2=1174794&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestStatefulConnManagement.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestStatefulConnManagement.java Fri Sep 23 14:16:40 2011
@@ -45,7 +45,7 @@ import org.apache.http.nio.IOControl;
 import org.apache.http.nio.NHttpConnectionFactory;
 import org.apache.http.nio.NHttpServerIOTarget;
 import org.apache.http.nio.client.HttpAsyncClient;
-import org.apache.http.nio.conn.ManagedClientConnection;
+import org.apache.http.nio.conn.ManagedAsyncClientConnection;
 import org.apache.http.nio.entity.NStringEntity;
 import org.apache.http.nio.protocol.AbstractAsyncResponseConsumer;
 import org.apache.http.nio.protocol.BasicAsyncRequestProducer;
@@ -242,7 +242,7 @@ public class TestStatefulConnManagement 
 
                                 @Override
                                 protected Object buildResult(final HttpContext context) throws Exception {
-                                    ManagedClientConnection conn = (ManagedClientConnection) context.getAttribute(
+                                    ManagedAsyncClientConnection conn = (ManagedAsyncClientConnection) context.getAttribute(
                                             ExecutionContext.HTTP_CONNECTION);
                                     return conn.getState();
                                 }



Mime
View raw message