hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1056300 - in /httpcomponents/httpasyncclient/trunk/httpasyncclient/src: examples/org/apache/http/examples/nio/client/ main/java/org/apache/http/impl/nio/client/ main/resources/ main/resources/org/ main/resources/org/apache/ main/resources/...
Date Fri, 07 Jan 2011 13:02:22 GMT
Author: olegk
Date: Fri Jan  7 13:02:21 2011
New Revision: 1056300

URL: http://svn.apache.org/viewvc?rev=1056300&view=rev
Log:
Added AbstractHttpAsyncClient / DefaultHttpAsyncClient classes similar to those in the HttpClient
module

Added:
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java
      - copied, changed from r1056047, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/BasicHttpAsyncClient.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java
  (with props)
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/resources/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/resources/org/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/resources/org/apache/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/resources/org/apache/http/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/resources/org/apache/http/nio/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/resources/org/apache/http/nio/client/
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/resources/org/apache/http/nio/client/version.properties
  (with props)
Removed:
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/BasicHttpAsyncClient.java
Modified:
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientRequest.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpAsync.java
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpsAsync.java

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientRequest.java?rev=1056300&r1=1056299&r2=1056300&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientRequest.java
(original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientRequest.java
Fri Jan  7 13:02:21 2011
@@ -32,13 +32,13 @@ import java.util.concurrent.Future;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.nio.client.BasicHttpAsyncClient;
+import org.apache.http.impl.nio.client.DefaultHttpAsyncClient;
 import org.apache.http.nio.client.HttpAsyncClient;
 
 public class AsyncClientRequest {
 
     public static void main(String[] args) throws Exception {
-        HttpAsyncClient httpclient = new BasicHttpAsyncClient();
+        HttpAsyncClient httpclient = new DefaultHttpAsyncClient();
         httpclient.start();
         try {
             Queue<Future<HttpResponse>> queue = new LinkedList<Future<HttpResponse>>();

Copied: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java
(from r1056047, httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/BasicHttpAsyncClient.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java?p2=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java&p1=httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/BasicHttpAsyncClient.java&r1=1056047&r2=1056300&rev=1056300&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/BasicHttpAsyncClient.java
(original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java
Fri Jan  7 13:02:21 2011
@@ -38,9 +38,11 @@ import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.http.HttpResponse;
+import org.apache.http.HttpResponseInterceptor;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.RedirectStrategy;
 import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.protocol.ClientContext;
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
 import org.apache.http.conn.routing.HttpRoutePlanner;
 import org.apache.http.impl.DefaultConnectionReuseStrategy;
@@ -59,111 +61,209 @@ import org.apache.http.nio.reactor.Conne
 import org.apache.http.nio.reactor.IOEventDispatch;
 import org.apache.http.nio.reactor.IOReactorException;
 import org.apache.http.nio.reactor.IOReactorStatus;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.params.HttpParams;
-import org.apache.http.params.SyncBasicHttpParams;
 import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.BasicHttpProcessor;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpProcessor;
 import org.apache.http.protocol.ImmutableHttpProcessor;
-import org.apache.http.protocol.RequestConnControl;
-import org.apache.http.protocol.RequestContent;
-import org.apache.http.protocol.RequestExpectContinue;
-import org.apache.http.protocol.RequestTargetHost;
-import org.apache.http.protocol.RequestUserAgent;
 
-public class BasicHttpAsyncClient implements HttpAsyncClient {
+public abstract class AbstractHttpAsyncClient implements HttpAsyncClient {
 
-    private final Log log;
-    private final HttpParams params;
+    private final Log log = LogFactory.getLog(getClass());;
     private final ConnectingIOReactor ioReactor;
     private final ClientConnectionManager connmgr;
     private final HttpAsyncResponseSet pendingResponses;
 
     private Thread reactorThread;
+    private BasicHttpProcessor mutableProcessor;
+    private ImmutableHttpProcessor protocolProcessor;
+    private ConnectionReuseStrategy reuseStrategy;
+    private ConnectionKeepAliveStrategy keepAliveStrategy;
+    private RedirectStrategy redirectStrategy;
+    private HttpRoutePlanner routePlanner;
+    private HttpParams params;
 
-    public BasicHttpAsyncClient(
+    protected AbstractHttpAsyncClient(
             final ConnectingIOReactor ioReactor,
             final ClientConnectionManager connmgr,
             final HttpParams params) {
         super();
-        this.log = LogFactory.getLog(getClass());
-        if (params != null) {
-            this.params = params;
-        } else {
-            this.params = createDefaultHttpParams();
-        }
         this.ioReactor = ioReactor;
         this.connmgr = connmgr;
         this.pendingResponses = new HttpAsyncResponseSet();
+        this.params = params;
     }
 
-    public BasicHttpAsyncClient(
+    protected AbstractHttpAsyncClient(
             final HttpParams params) throws IOReactorException {
         super();
-        this.log = LogFactory.getLog(getClass());
-        if (params != null) {
-            this.params = params;
-        } else {
-            this.params = createDefaultHttpParams();
-        }
-        this.ioReactor = new DefaultConnectingIOReactor(2, this.params);
+        this.ioReactor = new DefaultConnectingIOReactor(2, params);
         this.connmgr = new PoolingClientConnectionManager(this.ioReactor);
         this.pendingResponses = new HttpAsyncResponseSet();
+        this.params = params;
     }
 
-    public BasicHttpAsyncClient() throws IOReactorException {
-        this(null);
+    protected abstract HttpParams createHttpParams();
+
+    protected abstract BasicHttpProcessor createHttpProcessor();
+
+    protected HttpContext createHttpContext() {
+        HttpContext context = new BasicHttpContext();
+        context.setAttribute(
+                ClientContext.SCHEME_REGISTRY,
+                getConnectionManager().getSchemeRegistry());
+        return context;
     }
 
-    public BasicHttpAsyncClient(
-            final ConnectingIOReactor ioReactor,
-            final ClientConnectionManager connmgr) throws IOReactorException {
-        this(ioReactor, connmgr, null);
+    protected ConnectionReuseStrategy createConnectionReuseStrategy() {
+        return new DefaultConnectionReuseStrategy();
+    }
+
+    protected ConnectionKeepAliveStrategy createConnectionKeepAliveStrategy() {
+        return new DefaultConnectionKeepAliveStrategy();
+    }
+
+    protected HttpRoutePlanner createHttpRoutePlanner() {
+        return new DefaultHttpAsyncRoutePlanner(getConnectionManager().getSchemeRegistry());
+    }
+
+    public synchronized final HttpParams getParams() {
+        if (this.params == null) {
+            this.params = createHttpParams();
+        }
+        return this.params;
     }
 
-    protected ClientConnectionManager getConnectionManager() {
+    public synchronized ClientConnectionManager getConnectionManager() {
         return this.connmgr;
     }
 
-    protected HttpParams createDefaultHttpParams() {
-        HttpParams params = new SyncBasicHttpParams();
-        params
-            .setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 5000)
-            .setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 10000)
-            .setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024)
-            .setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
-            .setParameter(CoreProtocolPNames.USER_AGENT, "HttpComponents/1.1");
-        return params;
-    }
-
-    protected HttpProcessor createHttpProcessor() {
-        HttpRequestInterceptor[] interceptors = new HttpRequestInterceptor[] {
-                new RequestContent(),
-                new RequestTargetHost(),
-                new RequestConnControl(),
-                new RequestUserAgent(),
-                new RequestExpectContinue()
-        };
-        ImmutableHttpProcessor httpProcessor = new ImmutableHttpProcessor(interceptors);
-        return httpProcessor;
+    public synchronized final ConnectionReuseStrategy getConnectionReuseStrategy() {
+        if (this.reuseStrategy == null) {
+            this.reuseStrategy = createConnectionReuseStrategy();
+        }
+        return this.reuseStrategy;
     }
 
-    protected HttpRoutePlanner createHttpRoutePlanner() {
-        return new DefaultHttpAsyncRoutePlanner(this.connmgr.getSchemeRegistry());
+    public synchronized void setReuseStrategy(final ConnectionReuseStrategy reuseStrategy)
{
+        this.reuseStrategy = reuseStrategy;
     }
 
-    protected ConnectionReuseStrategy createConnectionReuseStrategy() {
-        return new DefaultConnectionReuseStrategy();
+    public synchronized final ConnectionKeepAliveStrategy getConnectionKeepAliveStrategy()
{
+        if (this.keepAliveStrategy == null) {
+            this.keepAliveStrategy = createConnectionKeepAliveStrategy();
+        }
+        return this.keepAliveStrategy;
     }
 
-    protected ConnectionKeepAliveStrategy createConnectionKeepAliveStrategy() {
-        return new DefaultConnectionKeepAliveStrategy();
+    public synchronized void setKeepAliveStrategy(final ConnectionKeepAliveStrategy keepAliveStrategy)
{
+        this.keepAliveStrategy = keepAliveStrategy;
     }
 
-    protected RedirectStrategy createRedirectStrategy() {
-        return new DefaultRedirectStrategy();
+    public synchronized final RedirectStrategy getRedirectStrategy() {
+        if (this.redirectStrategy == null) {
+            this.redirectStrategy = new DefaultRedirectStrategy();
+        }
+        return this.redirectStrategy;
+    }
+
+    public synchronized void setRedirectStrategy(final RedirectStrategy redirectStrategy)
{
+        this.redirectStrategy = redirectStrategy;
+    }
+
+    public synchronized final HttpRoutePlanner getRoutePlanner() {
+        if (this.routePlanner == null) {
+            this.routePlanner = createHttpRoutePlanner();
+        }
+        return this.routePlanner;
+    }
+
+    public synchronized void setRoutePlanner(final HttpRoutePlanner routePlanner) {
+        this.routePlanner = routePlanner;
+    }
+
+    protected synchronized final BasicHttpProcessor getHttpProcessor() {
+        if (this.mutableProcessor == null) {
+            this.mutableProcessor = createHttpProcessor();
+        }
+        return this.mutableProcessor;
+    }
+
+    private synchronized final HttpProcessor getProtocolProcessor() {
+        if (this.protocolProcessor == null) {
+            // Get mutable HTTP processor
+            BasicHttpProcessor proc = getHttpProcessor();
+            // and create an immutable copy of it
+            int reqc = proc.getRequestInterceptorCount();
+            HttpRequestInterceptor[] reqinterceptors = new HttpRequestInterceptor[reqc];
+            for (int i = 0; i < reqc; i++) {
+                reqinterceptors[i] = proc.getRequestInterceptor(i);
+            }
+            int resc = proc.getResponseInterceptorCount();
+            HttpResponseInterceptor[] resinterceptors = new HttpResponseInterceptor[resc];
+            for (int i = 0; i < resc; i++) {
+                resinterceptors[i] = proc.getResponseInterceptor(i);
+            }
+            this.protocolProcessor = new ImmutableHttpProcessor(reqinterceptors, resinterceptors);
+        }
+        return this.protocolProcessor;
+    }
+
+    public synchronized int getResponseInterceptorCount() {
+        return getHttpProcessor().getResponseInterceptorCount();
+    }
+
+    public synchronized HttpResponseInterceptor getResponseInterceptor(int index) {
+        return getHttpProcessor().getResponseInterceptor(index);
+    }
+
+    public synchronized HttpRequestInterceptor getRequestInterceptor(int index) {
+        return getHttpProcessor().getRequestInterceptor(index);
+    }
+
+    public synchronized int getRequestInterceptorCount() {
+        return getHttpProcessor().getRequestInterceptorCount();
+    }
+
+    public synchronized void addResponseInterceptor(final HttpResponseInterceptor itcp) {
+        getHttpProcessor().addInterceptor(itcp);
+        this.protocolProcessor = null;
+    }
+
+    public synchronized void addResponseInterceptor(final HttpResponseInterceptor itcp, int
index) {
+        getHttpProcessor().addInterceptor(itcp, index);
+        this.protocolProcessor = null;
+    }
+
+    public synchronized void clearResponseInterceptors() {
+        getHttpProcessor().clearResponseInterceptors();
+        this.protocolProcessor = null;
+    }
+
+    public synchronized void removeResponseInterceptorByClass(Class<? extends HttpResponseInterceptor>
clazz) {
+        getHttpProcessor().removeResponseInterceptorByClass(clazz);
+        this.protocolProcessor = null;
+    }
+
+    public synchronized void addRequestInterceptor(final HttpRequestInterceptor itcp) {
+        getHttpProcessor().addInterceptor(itcp);
+        this.protocolProcessor = null;
+    }
+
+    public synchronized void addRequestInterceptor(final HttpRequestInterceptor itcp, int
index) {
+        getHttpProcessor().addInterceptor(itcp, index);
+        this.protocolProcessor = null;
+    }
+
+    public synchronized void clearRequestInterceptors() {
+        getHttpProcessor().clearRequestInterceptors();
+        this.protocolProcessor = null;
+    }
+
+    public synchronized void removeRequestInterceptorByClass(Class<? extends HttpRequestInterceptor>
clazz) {
+        getHttpProcessor().removeRequestInterceptorByClass(clazz);
+        this.protocolProcessor = null;
     }
 
     private void doExecute() {
@@ -182,10 +282,6 @@ public class BasicHttpAsyncClient implem
         }
     }
 
-    public HttpParams getParams() {
-        return this.params;
-    }
-
     public IOReactorStatus getStatus() {
         return this.ioReactor.getStatus();
     }
@@ -230,12 +326,12 @@ public class BasicHttpAsyncClient implem
                     new ResponseCompletedCallback<T>(callback,
                             responseConsumer, this.pendingResponses),
                     this.connmgr,
-                    createHttpProcessor(),
-                    createHttpRoutePlanner(),
-                    createConnectionReuseStrategy(),
-                    createConnectionKeepAliveStrategy(),
-                    createRedirectStrategy(),
-                    this.params);
+                    getProtocolProcessor(),
+                    getRoutePlanner(),
+                    getConnectionReuseStrategy(),
+                    getConnectionKeepAliveStrategy(),
+                    getRedirectStrategy(),
+                    getParams());
         }
         httpexchange.start();
         return httpexchange.getResultFuture();

Added: 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=1056300&view=auto
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java
(added)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java
Fri Jan  7 13:02:21 2011
@@ -0,0 +1,108 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+package org.apache.http.impl.nio.client;
+
+import org.apache.http.HttpVersion;
+import org.apache.http.client.protocol.RequestDefaultHeaders;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.nio.conn.ClientConnectionManager;
+import org.apache.http.nio.reactor.ConnectingIOReactor;
+import org.apache.http.nio.reactor.IOReactorException;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpParams;
+import org.apache.http.params.HttpProtocolParams;
+import org.apache.http.params.SyncBasicHttpParams;
+import org.apache.http.protocol.BasicHttpProcessor;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.protocol.RequestConnControl;
+import org.apache.http.protocol.RequestContent;
+import org.apache.http.protocol.RequestExpectContinue;
+import org.apache.http.protocol.RequestTargetHost;
+import org.apache.http.protocol.RequestUserAgent;
+import org.apache.http.util.VersionInfo;
+
+public class DefaultHttpAsyncClient extends AbstractHttpAsyncClient {
+
+    public DefaultHttpAsyncClient(
+            final ConnectingIOReactor ioReactor,
+            final ClientConnectionManager connmgr,
+            final HttpParams params) {
+        super(ioReactor, connmgr, params);
+    }
+
+    public DefaultHttpAsyncClient(
+            final HttpParams params) throws IOReactorException {
+        super(params);
+    }
+
+    public DefaultHttpAsyncClient() throws IOReactorException {
+        this(null);
+    }
+
+    public DefaultHttpAsyncClient(
+            final ConnectingIOReactor ioReactor,
+            final ClientConnectionManager connmgr) throws IOReactorException {
+        this(ioReactor, connmgr, null);
+    }
+
+    @Override
+    protected HttpParams createHttpParams() {
+        HttpParams params = new SyncBasicHttpParams();
+        setDefaultHttpParams(params);
+        return params;
+    }
+
+    public static void setDefaultHttpParams(HttpParams params) {
+        HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
+        HttpProtocolParams.setContentCharset(params, HTTP.DEFAULT_CONTENT_CHARSET);
+        HttpConnectionParams.setTcpNoDelay(params, true);
+        HttpConnectionParams.setSocketBufferSize(params, 8192);
+
+        // determine the release version from packaged version info
+        final VersionInfo vi = VersionInfo.loadVersionInfo
+            ("org.apache.http.nio.client", DefaultHttpClient.class.getClassLoader());
+        final String release = (vi != null) ?
+            vi.getRelease() : VersionInfo.UNAVAILABLE;
+        HttpProtocolParams.setUserAgent(params,
+                "Apache-HttpAsyncClient/" + release + " (java 1.5)");
+    }
+
+    @Override
+    protected BasicHttpProcessor createHttpProcessor() {
+        BasicHttpProcessor httpproc = new BasicHttpProcessor();
+        httpproc.addInterceptor(new RequestDefaultHeaders());
+        // Required protocol interceptors
+        httpproc.addInterceptor(new RequestContent());
+        httpproc.addInterceptor(new RequestTargetHost());
+        // Recommended protocol interceptors
+        httpproc.addInterceptor(new RequestConnControl());
+        httpproc.addInterceptor(new RequestUserAgent());
+        httpproc.addInterceptor(new RequestExpectContinue());
+        return httpproc;
+    }
+
+}

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

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

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

Added: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/resources/org/apache/http/nio/client/version.properties
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/resources/org/apache/http/nio/client/version.properties?rev=1056300&view=auto
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/resources/org/apache/http/nio/client/version.properties
(added)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/resources/org/apache/http/nio/client/version.properties
Fri Jan  7 13:02:21 2011
@@ -0,0 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+info.module    = HttpAsyncClient
+info.release   = ${pom.version}
+info.timestamp = ${mvn.timestamp}
+# timestamp requires Maven 2.1

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/resources/org/apache/http/nio/client/version.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/resources/org/apache/http/nio/client/version.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/resources/org/apache/http/nio/client/version.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpAsync.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpAsync.java?rev=1056300&r1=1056299&r2=1056300&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpAsync.java
(original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/impl/nio/client/TestHttpAsync.java
Fri Jan  7 13:02:21 2011
@@ -46,7 +46,7 @@ public class TestHttpAsync extends Serve
         SchemeRegistry schemeRegistry = new SchemeRegistry();
         schemeRegistry.register(new Scheme("http", 80, null));
         this.sessionManager = new PoolingClientConnectionManager(ioReactor, schemeRegistry);
-        this.httpclient = new BasicHttpAsyncClient(ioReactor, this.sessionManager);
+        this.httpclient = new DefaultHttpAsyncClient(ioReactor, this.sessionManager);
     }
 
     @After

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=1056300&r1=1056299&r2=1056300&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 Jan  7 13:02:21 2011
@@ -101,7 +101,7 @@ public class TestHttpsAsync extends Serv
         schemeRegistry.register(new Scheme("http", 80, null));
         schemeRegistry.register(new Scheme("https", 443, new SSLLayeringStrategy(this.clientSSLContext)));
         this.sessionManager = new PoolingClientConnectionManager(ioReactor, schemeRegistry);
-        this.httpclient = new BasicHttpAsyncClient(ioReactor, this.sessionManager);
+        this.httpclient = new DefaultHttpAsyncClient(ioReactor, this.sessionManager);
     }
 
     @After



Mime
View raw message