Author: rajith
Date: Sat Jan 26 13:59:46 2008
New Revision: 615505
URL: http://svn.apache.org/viewvc?rev=615505&view=rev
Log:
Applied Oleg's patch and also updated the qpid version to point to a revision
instead of M2-SNAPSHOT.
Most folks had issues with the M2-SNAPSHOT as maven downloaded old M2 snapshots
from the apache snapshot repo
Modified:
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
webservices/synapse/trunk/java/pom.xml
Modified:
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java?rev=615505&r1=615504&r2=615505&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
(original)
+++
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
Sat Jan 26 13:59:46 2008
@@ -18,38 +18,52 @@
*/
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 java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+
+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 java.nio.ByteBuffer;
-import java.nio.channels.Channels;
-import java.nio.channels.ReadableByteChannel;
-import java.nio.channels.WritableByteChannel;
-import java.io.IOException;
+import org.apache.http.ConnectionReuseStrategy;
+import org.apache.http.Header;
+import org.apache.http.HttpConnection;
+import org.apache.http.HttpException;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.HttpVersion;
+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.BasicHttpProcessor;
+import org.apache.http.protocol.ExecutionContext;
+import org.apache.http.protocol.HttpContext;
+import org.apache.http.protocol.HttpProcessor;
+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.synapse.transport.nhttp.util.PipeImpl;
+import org.apache.synapse.transport.nhttp.util.WorkerPool;
+import org.apache.synapse.transport.nhttp.util.WorkerPoolFactory;
/**
* The client connection handler. An instance of this class is used by each
IOReactor, to
@@ -126,7 +140,8 @@
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 +175,8 @@
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/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/pom.xml?rev=615505&r1=615504&r2=615505&view=diff
==============================================================================
--- webservices/synapse/trunk/java/pom.xml (original)
+++ webservices/synapse/trunk/java/pom.xml Sat Jan 26 13:59:46 2008
@@ -663,11 +663,6 @@
<version>${httpcore.nio.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-niossl</artifactId>
- <version>${httpcore.nio.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs</artifactId>
<version>${commons.vfs.version}</version>
@@ -1070,7 +1065,7 @@
<properties>
<!-- Synapse and related components -->
<synapse.version>1.1.1-SNAPSHOT</synapse.version>
- <httpcore.nio.version>4.0-alpha7-SNAPSHOT</httpcore.nio.version>
+ <httpcore.nio.version>4.0-beta1</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>
@@ -1131,7 +1126,7 @@
<groovy.version>1.0</groovy.version>
<servlet-api.version>2.3</servlet-api.version>
- <qpid.version>1.0-incubating-M2-SNAPSHOT</qpid.version>
+ <qpid.version>1.0-incubating-M3-615355</qpid.version>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
