You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by ru...@apache.org on 2008/01/17 08:30:52 UTC
svn commit: r612743 - in /webservices/synapse/branches/1.1.1:
modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
pom.xml
Author: ruwan
Date: Wed Jan 16 23:30:49 2008
New Revision: 612743
URL: http://svn.apache.org/viewvc?rev=612743&view=rev
Log:
Moving to the httpcore-alpha7
Modified:
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
webservices/synapse/branches/1.1.1/pom.xml
Modified: webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
URL: http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java?rev=612743&r1=612742&r2=612743&view=diff
==============================================================================
--- webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java (original)
+++ webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java Wed Jan 16 23:30:49 2008
@@ -18,38 +18,37 @@
*/
package org.apache.synapse.transport.nhttp;
-import org.apache.http.nio.NHttpClientHandler;
-import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpParamsLinker;
-import org.apache.http.*;
-import org.apache.http.entity.BasicHttpEntity;
-import org.apache.http.impl.DefaultConnectionReuseStrategy;
-import org.apache.http.protocol.*;
+import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
+import org.apache.axiom.soap.impl.llom.soap12.SOAP12Factory;
+import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.synapse.transport.nhttp.util.PipeImpl;
-import org.apache.synapse.transport.nhttp.util.WorkerPool;
-import org.apache.synapse.transport.nhttp.util.WorkerPoolFactory;
import org.apache.axis2.description.WSDL2Constants;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.axis2.addressing.AddressingConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.impl.llom.soap12.SOAP12Factory;
-import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
+import org.apache.http.*;
+import org.apache.http.entity.BasicHttpEntity;
+import org.apache.http.impl.DefaultConnectionReuseStrategy;
+import org.apache.http.nio.ContentDecoder;
+import org.apache.http.nio.ContentEncoder;
+import org.apache.http.nio.NHttpClientConnection;
+import org.apache.http.nio.NHttpClientHandler;
+import org.apache.http.params.DefaultedHttpParams;
+import org.apache.http.params.HttpParams;
+import org.apache.http.protocol.*;
+import org.apache.synapse.transport.nhttp.util.PipeImpl;
+import org.apache.synapse.transport.nhttp.util.WorkerPool;
+import org.apache.synapse.transport.nhttp.util.WorkerPoolFactory;
+import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.nio.channels.WritableByteChannel;
-import java.io.IOException;
/**
* The client connection handler. An instance of this class is used by each IOReactor, to
@@ -126,7 +125,7 @@
context.setAttribute(REQUEST_SOURCE_CHANNEL, axis2Req.getSourceChannel());
HttpRequest request = axis2Req.getRequest();
- HttpParamsLinker.link(request, this.params);
+ request.setParams(new DefaultedHttpParams(request.getParams(), this.params));
this.httpProcessor.process(request, context);
conn.submitRequest(request);
@@ -160,7 +159,7 @@
context.setAttribute(REQUEST_SOURCE_CHANNEL, axis2Req.getSourceChannel());
HttpRequest request = axis2Req.getRequest();
- HttpParamsLinker.link(request, this.params);
+ request.setParams(new DefaultedHttpParams(request.getParams(), this.params));
this.httpProcessor.process(request, context);
conn.submitRequest(request);
Modified: webservices/synapse/branches/1.1.1/pom.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/pom.xml?rev=612743&r1=612742&r2=612743&view=diff
==============================================================================
--- webservices/synapse/branches/1.1.1/pom.xml (original)
+++ webservices/synapse/branches/1.1.1/pom.xml Wed Jan 16 23:30:49 2008
@@ -1050,7 +1050,7 @@
<properties>
<!-- Synapse and related components -->
<synapse.version>1.1.1</synapse.version>
- <httpcore.nio.version>4.0-alpha7-609527</httpcore.nio.version>
+ <httpcore.nio.version>4.0-alpha7</httpcore.nio.version>
<commons.dbcp.version>1.2.2</commons.dbcp.version>
<commons.pool.version>1.3</commons.pool.version>
<commons.vfs.version>1.1-587797</commons.vfs.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org