You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2007/08/20 07:40:18 UTC
svn commit: r567549 - in /webservices/synapse/trunk/java:
modules/transports/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
modules/transports/src/org/apache/axis2/transport/nhttp/NhttpConstants.java
src/main/assembly/bin.xml
Author: asankha
Date: Sun Aug 19 22:40:16 2007
New Revision: 567549
URL: http://svn.apache.org/viewvc?rev=567549&view=rev
Log:
fix SYNAPSE-115
Create a dummy patches directory for the distribution for possible application of patches later on
Modified:
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/NhttpConstants.java
webservices/synapse/trunk/java/src/main/assembly/bin.xml
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java?rev=567549&r1=567548&r2=567549&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java Sun Aug 19 22:40:16 2007
@@ -21,6 +21,7 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.util.Utils;
import org.apache.axis2.transport.nhttp.util.PipeImpl;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.transport.MessageFormatter;
@@ -35,6 +36,7 @@
import java.io.IOException;
import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.util.Map;
@@ -96,10 +98,21 @@
* @return the HttpRequest to be sent out
*/
public HttpRequest getRequest() throws IOException {
- HttpEntityEnclosingRequest httpRequest = new BasicHttpEntityEnclosingRequest(
- "POST",
- epr.getAddress());
- httpRequest.setEntity(new BasicHttpEntity());
+
+ HttpEntityEnclosingRequest httpRequest = null;
+ if(!Utils.isExplicitlyTrue(msgContext, NhttpConstants.FORCE_HTTP_1_0))
+ {
+ httpRequest = new BasicHttpEntityEnclosingRequest(
+ "POST", epr.getAddress(), HttpVersion.HTTP_1_0);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ messageFormatter.writeTo(msgContext, format, baos, true);
+ BasicHttpEntity entity = new BasicHttpEntity();
+ entity.setContentLength(baos.toByteArray().length);
+ httpRequest.setEntity(entity);
+ } else {
+ httpRequest = new BasicHttpEntityEnclosingRequest("POST", epr.getAddress());
+ httpRequest.setEntity(new BasicHttpEntity());
+ }
// set any transport headers
Object o = msgContext.getProperty(MessageContext.TRANSPORT_HEADERS);
Modified: webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/NhttpConstants.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/NhttpConstants.java?rev=567549&r1=567548&r2=567549&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/NhttpConstants.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/org/apache/axis2/transport/nhttp/NhttpConstants.java Sun Aug 19 22:40:16 2007
@@ -22,4 +22,5 @@
public class NhttpConstants {
public static final String SC_ACCEPTED = "SC_ACCEPTED";
public static final String SENDING_FAULT = "sending_fault";
+ public static final String FORCE_HTTP_1_0 = "FORCE_HTTP_1.0";
}
Modified: webservices/synapse/trunk/java/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/assembly/bin.xml?rev=567549&r1=567548&r2=567549&view=diff
==============================================================================
--- webservices/synapse/trunk/java/src/main/assembly/bin.xml (original)
+++ webservices/synapse/trunk/java/src/main/assembly/bin.xml Sun Aug 19 22:40:16 2007
@@ -249,6 +249,9 @@
</includes>
</dependencySet>
<dependencySet>
+ <outputDirectory>synapse-${synapse.version}/lib/patches</outputDirectory>
+ </dependencySet>
+ <dependencySet>
<outputDirectory>synapse-${synapse.version}/repository/modules</outputDirectory>
<includes>
<include>org.apache.axis2:addressing:mar</include>
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org