Return-Path: Delivered-To: apmail-jakarta-httpclient-commits-archive@www.apache.org Received: (qmail 94581 invoked from network); 25 Sep 2006 17:57:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Sep 2006 17:57:09 -0000 Received: (qmail 280 invoked by uid 500); 25 Sep 2006 17:57:09 -0000 Mailing-List: contact httpclient-commits-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: httpclient-dev@jakarta.apache.org Delivered-To: mailing list httpclient-commits@jakarta.apache.org Received: (qmail 268 invoked by uid 99); 25 Sep 2006 17:57:09 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Sep 2006 10:57:09 -0700 Authentication-Results: idunn.apache.osuosl.org smtp.mail=rolandw@apache.org; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 140.211.166.113 cause and error) Received: from [140.211.166.113] ([140.211.166.113:59200] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 4E/DD-13750-C6818154 for ; Mon, 25 Sep 2006 10:57:03 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 644E11A981A; Mon, 25 Sep 2006 10:56:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r449761 - in /jakarta/httpcomponents/httpasync/trunk/src: contrib/org/apache/http/async/contrib/routing/ examples/org/apache/http/examples/ java/org/apache/http/async/ Date: Mon, 25 Sep 2006 17:56:49 -0000 To: httpclient-commits@jakarta.apache.org From: rolandw@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060925175649.644E11A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rolandw Date: Mon Sep 25 10:56:48 2006 New Revision: 449761 URL: http://svn.apache.org/viewvc?view=rev&rev=449761 Log: minimal changes to adapt to HTTPCORE-13, take 1 Modified: jakarta/httpcomponents/httpasync/trunk/src/contrib/org/apache/http/async/contrib/routing/RoutingAsyncGet.java jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/ElementalAsyncGet.java jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/NotifiedAsyncGet.java jakarta/httpcomponents/httpasync/trunk/src/java/org/apache/http/async/AsyncHttpProcessor.java Modified: jakarta/httpcomponents/httpasync/trunk/src/contrib/org/apache/http/async/contrib/routing/RoutingAsyncGet.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpasync/trunk/src/contrib/org/apache/http/async/contrib/routing/RoutingAsyncGet.java?view=diff&rev=449761&r1=449760&r2=449761 ============================================================================== --- jakarta/httpcomponents/httpasync/trunk/src/contrib/org/apache/http/async/contrib/routing/RoutingAsyncGet.java (original) +++ jakarta/httpcomponents/httpasync/trunk/src/contrib/org/apache/http/async/contrib/routing/RoutingAsyncGet.java Mon Sep 25 10:56:48 2006 @@ -45,6 +45,7 @@ import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.DefaultHttpParams; import org.apache.http.impl.io.PlainSocketFactory; +import org.apache.http.impl.protocol.DefaultHttpProcessor; import org.apache.http.io.SocketFactory; import org.apache.http.message.HttpGet; import org.apache.http.params.HttpParams; @@ -234,15 +235,17 @@ HttpAsyncClientConnection conn = new SimpleHttpAsyncClientConnection(); - AsyncHttpProcessor proc = new AsyncHttpProcessor(); - proc.setParams(params); + DefaultHttpProcessor dhp = new DefaultHttpProcessor(); // Required request interceptors - proc.addInterceptor(new RequestContent()); - proc.addInterceptor(new RequestTargetHost()); + dhp.addInterceptor(new RequestContent()); + dhp.addInterceptor(new RequestTargetHost()); // Recommended request interceptors - proc.addInterceptor(new RequestConnControl()); - proc.addInterceptor(new RequestUserAgent()); - // not supported: proc.addInterceptor(new RequestExpectContinue()); + dhp.addInterceptor(new RequestConnControl()); + dhp.addInterceptor(new RequestUserAgent()); + // not supported: dhp.addInterceptor(new RequestExpectContinue()); + + AsyncHttpProcessor proc = new AsyncHttpProcessor(dhp); + proc.setParams(params); ConnectionReuseStrategy crs = new DefaultConnectionReuseStrategy(); Modified: jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/ElementalAsyncGet.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/ElementalAsyncGet.java?view=diff&rev=449761&r1=449760&r2=449761 ============================================================================== --- jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/ElementalAsyncGet.java (original) +++ jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/ElementalAsyncGet.java Mon Sep 25 10:56:48 2006 @@ -44,6 +44,7 @@ import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.DefaultHttpParams; import org.apache.http.impl.io.PlainSocketFactory; +import org.apache.http.impl.protocol.DefaultHttpProcessor; import org.apache.http.io.SocketFactory; import org.apache.http.message.HttpGet; import org.apache.http.params.HttpParams; @@ -162,15 +163,17 @@ HttpAsyncClientConnection conn = new SimpleHttpAsyncClientConnection(); - AsyncHttpProcessor proc = new AsyncHttpProcessor(); - proc.setParams(params); + DefaultHttpProcessor dhp = new DefaultHttpProcessor(); // Required request interceptors - proc.addInterceptor(new RequestContent()); - proc.addInterceptor(new RequestTargetHost()); + dhp.addInterceptor(new RequestContent()); + dhp.addInterceptor(new RequestTargetHost()); // Recommended request interceptors - proc.addInterceptor(new RequestConnControl()); - proc.addInterceptor(new RequestUserAgent()); - // not supported: proc.addInterceptor(new RequestExpectContinue()); + dhp.addInterceptor(new RequestConnControl()); + dhp.addInterceptor(new RequestUserAgent()); + // not supported: dhp.addInterceptor(new RequestExpectContinue()); + + AsyncHttpProcessor proc = new AsyncHttpProcessor(dhp); + proc.setParams(params); ConnectionReuseStrategy crs = new DefaultConnectionReuseStrategy(); Modified: jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/NotifiedAsyncGet.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/NotifiedAsyncGet.java?view=diff&rev=449761&r1=449760&r2=449761 ============================================================================== --- jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/NotifiedAsyncGet.java (original) +++ jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/NotifiedAsyncGet.java Mon Sep 25 10:56:48 2006 @@ -47,6 +47,7 @@ import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.DefaultHttpParams; import org.apache.http.impl.io.PlainSocketFactory; +import org.apache.http.impl.protocol.DefaultHttpProcessor; import org.apache.http.io.SocketFactory; import org.apache.http.message.HttpGet; import org.apache.http.params.HttpParams; @@ -261,15 +262,17 @@ HttpAsyncClientConnection conn = new SimpleHttpAsyncClientConnection(); - AsyncHttpProcessor proc = new AsyncHttpProcessor(); - proc.setParams(params); + DefaultHttpProcessor dhp = new DefaultHttpProcessor(); // Required request interceptors - proc.addInterceptor(new RequestContent()); - proc.addInterceptor(new RequestTargetHost()); + dhp.addInterceptor(new RequestContent()); + dhp.addInterceptor(new RequestTargetHost()); // Recommended request interceptors - proc.addInterceptor(new RequestConnControl()); - proc.addInterceptor(new RequestUserAgent()); - // not supported: proc.addInterceptor(new RequestExpectContinue()); + dhp.addInterceptor(new RequestConnControl()); + dhp.addInterceptor(new RequestUserAgent()); + // not supported: dhp.addInterceptor(new RequestExpectContinue()); + + AsyncHttpProcessor proc = new AsyncHttpProcessor(dhp); + proc.setParams(params); ConnectionReuseStrategy crs = new DefaultConnectionReuseStrategy(); Modified: jakarta/httpcomponents/httpasync/trunk/src/java/org/apache/http/async/AsyncHttpProcessor.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpasync/trunk/src/java/org/apache/http/async/AsyncHttpProcessor.java?view=diff&rev=449761&r1=449760&r2=449761 ============================================================================== --- jakarta/httpcomponents/httpasync/trunk/src/java/org/apache/http/async/AsyncHttpProcessor.java (original) +++ jakarta/httpcomponents/httpasync/trunk/src/java/org/apache/http/async/AsyncHttpProcessor.java Mon Sep 25 10:56:48 2006 @@ -42,6 +42,7 @@ import org.apache.http.params.HttpParams; import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.HttpExecutionContext; +import org.apache.http.protocol.HttpProcessor; import org.apache.http.protocol.HttpRequestExecutor; @@ -61,10 +62,12 @@ public class AsyncHttpProcessor extends HttpRequestExecutor { /** - * Create a new HTTP processor with empty default context. + * Create a new async HTTP processor. + * + * @param proc the underlying HTTP processor to use */ - public AsyncHttpProcessor() { - super(); + public AsyncHttpProcessor(HttpProcessor proc) { + super(proc); }