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/04/18 06:07:04 UTC
svn commit: r529852 - in /webservices/synapse/trunk/java:
modules/nhttp/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java
pom.xml
Author: asankha
Date: Tue Apr 17 21:07:03 2007
New Revision: 529852
URL: http://svn.apache.org/viewvc?view=rev&rev=529852
Log:
Use Axiom 1.2.3, XmlSchema 1.3.1 etc. to be compatible with latest Axis2
Use MessageFormatters for nhttp transport
Modified:
webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java
webservices/synapse/trunk/java/pom.xml
Modified: webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java?view=diff&rev=529852&r1=529851&r2=529852
==============================================================================
--- webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java (original)
+++ webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java Tue Apr 17 21:07:03 2007
@@ -43,6 +43,8 @@
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.transport.OutTransportInfo;
import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.transport.MessageFormatter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.HttpHost;
@@ -308,13 +310,10 @@
OutputStream out = worker.getOutputStream();
format.setDoOptimize(msgContext.isDoingMTOM());
- try {
- (msgContext.isDoingREST() ?
- msgContext.getEnvelope().getBody().getFirstElement() : msgContext.getEnvelope())
- .serializeAndConsume(out, format);
+ try {
+ MessageFormatter messageFormatter = TransportUtils.getMessageFormatter(msgContext);
+ messageFormatter.writeTo(msgContext, format, out, false);
out.close();
- } catch (XMLStreamException e) {
- handleException("Error serializing response message", e);
} catch (IOException e) {
handleException("IO Error sending response message", e);
}
Modified: webservices/synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/pom.xml?view=diff&rev=529852&r1=529851&r2=529852
==============================================================================
--- webservices/synapse/trunk/java/pom.xml (original)
+++ webservices/synapse/trunk/java/pom.xml Tue Apr 17 21:07:03 2007
@@ -613,40 +613,22 @@
<!-- Axis2 1.2 and its dependencies -->
<axis2.version>1.2-SNAPSHOT</axis2.version>
- <rampart.version>SNAPSHOT</rampart.version>
- <axiom.version>SNAPSHOT</axiom.version>
- <xml_schema.version>SNAPSHOT</xml_schema.version>
-
- <stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid>
- <stax.impl.artifactid>wstx</stax.impl.artifactid>
- <stax.impl.version>asl-3.2.0</stax.impl.version>
- <stax.api.version>1.0.1</stax.api.version>
-
- <woden.version>1.0.0M6</woden.version>
+ <axiom.version>1.2.3</axiom.version>
+ <xml_schema.version>1.3.1</xml_schema.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
- <annogen.version>0.1.0</annogen.version>
- <jaxen.version>1.1-beta-10</jaxen.version>
- <commons.codec.version>1.3</commons.codec.version>
- <commons.httpclient.version>3.0.1</commons.httpclient.version>
<commons.logging.version>1.1</commons.logging.version>
- <commons.fileupload.version>1.1.1</commons.fileupload.version>
-
<backport_util_concurrent.version>2.2</backport_util_concurrent.version>
- <servletapi.version>2.3</servletapi.version>
- <javamail.version>1.4</javamail.version>
- <activation.version>1.1</activation.version>
- <geronimo.spec.jms.version>1.1-rc4</geronimo.spec.jms.version>
- <!-- rampart, sandesha, neethi -->
+ <!-- addressing, rampart, sandesha, neethi -->
<addressing.version>1.2-SNAPSHOT</addressing.version>
+ <rampart.version>SNAPSHOT</rampart.version>
<sandesha2.version>1.1</sandesha2.version>
<neethi.version>SNAPSHOT</neethi.version>
<wss4j.version>SNAPSHOT</wss4j.version>
<xmlsec.version>1.3.0</xmlsec.version>
<xerces.version>2.8.1</xerces.version>
- <xml_apis.version>1.3.03</xml_apis.version>
<xalan.version>2.7.0</xalan.version>
<js.version>1.6R5</js.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org