svn commit: r1463889 - in /httpcomponents/httpasyncclient/trunk: httpasyncclient-osgi/pom.xml httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java

[ol...@apache.org]

Author: olegk
Date: Wed Apr  3 09:21:16 2013
New Revision: 1463889

URL: http://svn.apache.org/r1463889
Log:
Fixed OSGi metadata

Modified:
    httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml?rev=1463889&r1=1463888&r2=1463889&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml Wed Apr  3 09:21:16 2013
@@ -76,6 +76,7 @@
             org.apache.http;version=${httpcore.version},
             org.apache.http.entity;version=${httpcore.version},
             org.apache.http.concurrent;version=${httpcore.version},
+            org.apache.http.config;version=${httpcore.version},
             org.apache.http.io;version=${httpcore.version},
             org.apache.http.message;version=${httpcore.version},
             org.apache.http.params;version=${httpcore.version},
@@ -91,6 +92,7 @@
             org.apache.http.nio.reactor;version=${httpcore.version},
             org.apache.http.nio.reactor.ssl;version=${httpcore.version},
             org.apache.http.nio.util;version=${httpcore.version},
+            org.apache.http.impl.nio.codecs;version=${httpcore.version},
             org.apache.http.impl.nio;version=${httpcore.version},
             org.apache.http.impl.nio.reactor;version=${httpcore.version},
             org.apache.http.auth;version=${httpclient.version},
@@ -100,6 +102,7 @@
             org.apache.http.conn.routing;version=${httpclient.version},
             org.apache.http.conn.ssl;version=${httpclient.version},
             org.apache.http.client;version=${httpclient.version},
+            org.apache.http.client.config;version=${httpcore.version},
             org.apache.http.client.methods;version=${httpclient.version},
             org.apache.http.client.params;version=${httpclient.version},
             org.apache.http.client.protocol;version=${httpclient.version},
@@ -107,7 +110,8 @@
             org.apache.http.impl.auth;version=${httpclient.version},
             org.apache.http.impl.cookie;version=${httpclient.version},
             org.apache.http.impl.conn;version=${httpclient.version},
-            org.apache.http.impl.client;version=${httpclient.version}
+            org.apache.http.impl.client;version=${httpclient.version},
+            org.apache.http.impl.execchain;version=${httpclient.version}
             </Import-Package>
             <Include-Resource />
             <!-- Stop the JAVA_1_n_HOME variables from being treated as headers by Bnd -->

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java?rev=1463889&r1=1463888&r2=1463889&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java Wed Apr  3 09:21:16 2013
@@ -88,7 +88,6 @@ import org.apache.http.impl.cookie.Ignor
 import org.apache.http.impl.cookie.NetscapeDraftSpecFactory;
 import org.apache.http.impl.cookie.RFC2109SpecFactory;
 import org.apache.http.impl.cookie.RFC2965SpecFactory;
-import org.apache.http.impl.execchain.ClientExecChain;
 import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
 import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
 import org.apache.http.impl.nio.reactor.IOReactorConfig;
@@ -337,14 +336,6 @@ public class HttpAsyncClientBuilder {
         return this;
     }
 
-    protected ClientExecChain decorateMainExec(final ClientExecChain mainExec) {
-        return mainExec;
-    }
-
-    protected ClientExecChain decorateProtocolExec(final ClientExecChain protocolExec) {
-        return protocolExec;
-    }
-
     private ConnectingIOReactor createIOReactor(final IOReactorConfig config) {
         try {
             return new DefaultConnectingIOReactor(config);