Hi Sagara, After updating axis2 version to the latest in transports project, noticed some compilation errors. It was due to some changes to transport base introduced in r153089 and i have added the fix accordingly in this commit. Please confirm whether this is the correct fix?
Thanks, Kishanthan. On Thu, Apr 25, 2013 at 2:35 PM, <[email protected]> wrote: > Author: [email protected] > Date: Thu Apr 25 14:35:33 2013 > New Revision: 171036 > URL: http://wso2.org/svn/browse/wso2?view=rev&revision=171036 > > Log: > updating axis2 version for transports, merging changes from r153089 > > Modified: > > > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java > > > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java > > > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/rabbitmq/src/main/java/org/apache/axis2/transport/rabbitmq/RabbitMQMessageSender.java > > > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/pom.xml > > Modified: > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java > URL: > http://wso2.org/svn/browse/wso2/carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java?rev=171036&r1=171035&r2=171036&view=diff > > ============================================================================== > --- > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java > (original) > +++ > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java > Thu Apr 25 14:35:33 2013 > @@ -34,6 +34,7 @@ > import org.apache.axis2.format.PlainTextFormatter; > import org.apache.axis2.transport.MessageFormatter; > import org.apache.axis2.transport.TransportUtils; > +import org.apache.axis2.util.MessageProcessorSelector; > import org.apache.commons.logging.Log; > import org.apache.commons.logging.LogFactory; > > @@ -156,7 +157,7 @@ > > // ... otherwise, let Axis choose the right message formatter: > try { > - return TransportUtils.getMessageFormatter(msgContext); > + return > MessageProcessorSelector.getMessageFormatter(msgContext); > } catch (AxisFault axisFault) { > throw new BaseTransportException("Unable to get the message > formatter to use"); > } > > Modified: > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java > URL: > http://wso2.org/svn/browse/wso2/carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java?rev=171036&r1=171035&r2=171036&view=diff > > ============================================================================== > --- > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java > (original) > +++ > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java > Thu Apr 25 14:35:33 2013 > @@ -15,30 +15,39 @@ > */ > package org.apache.axis2.transport.jms; > > -import org.apache.axiom.om.OMOutputFormat; > import org.apache.axiom.om.OMElement; > -import org.apache.axiom.om.OMText; > import org.apache.axiom.om.OMNode; > +import org.apache.axiom.om.OMOutputFormat; > +import org.apache.axiom.om.OMText; > import org.apache.axis2.AxisFault; > import org.apache.axis2.Constants; > -import org.apache.axis2.context.MessageContext; > import org.apache.axis2.context.ConfigurationContext; > +import org.apache.axis2.context.MessageContext; > import org.apache.axis2.description.TransportOutDescription; > -import org.apache.axis2.transport.TransportUtils; > import org.apache.axis2.transport.MessageFormatter; > import org.apache.axis2.transport.OutTransportInfo; > -import org.apache.axis2.transport.base.*; > +import org.apache.axis2.transport.base.AbstractTransportSender; > +import org.apache.axis2.transport.base.BaseConstants; > +import org.apache.axis2.transport.base.BaseUtils; > +import org.apache.axis2.transport.base.ManagementSupport; > import org.apache.axis2.transport.http.HTTPConstants; > import org.apache.axis2.transport.jms.iowrappers.BytesMessageOutputStream; > +import org.apache.axis2.util.MessageProcessorSelector; > import org.apache.commons.io.output.WriterOutputStream; > > -import javax.jms.*; > import javax.activation.DataHandler; > +import javax.jms.BytesMessage; > +import javax.jms.Destination; > +import javax.jms.JMSException; > +import javax.jms.Message; > +import javax.jms.MessageConsumer; > +import javax.jms.Session; > +import javax.jms.TextMessage; > import java.io.IOException; > import java.io.OutputStream; > import java.io.StringWriter; > import java.nio.charset.UnsupportedCharsetException; > -import java.util.*; > +import java.util.Map; > > /** > * The TransportSender for JMS > @@ -347,7 +356,7 @@ > OMOutputFormat format = > BaseUtils.getOMOutputFormat(msgContext); > MessageFormatter messageFormatter = null; > try { > - messageFormatter = > TransportUtils.getMessageFormatter(msgContext); > + messageFormatter = > MessageProcessorSelector.getMessageFormatter(msgContext); > } catch (AxisFault axisFault) { > throw new JMSException("Unable to get the message > formatter to use"); > } > > Modified: > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/rabbitmq/src/main/java/org/apache/axis2/transport/rabbitmq/RabbitMQMessageSender.java > URL: > http://wso2.org/svn/browse/wso2/carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/rabbitmq/src/main/java/org/apache/axis2/transport/rabbitmq/RabbitMQMessageSender.java?rev=171036&r1=171035&r2=171036&view=diff > > ============================================================================== > --- > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/rabbitmq/src/main/java/org/apache/axis2/transport/rabbitmq/RabbitMQMessageSender.java > (original) > +++ > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/rabbitmq/src/main/java/org/apache/axis2/transport/rabbitmq/RabbitMQMessageSender.java > Thu Apr 25 14:35:33 2013 > @@ -23,8 +23,8 @@ > import org.apache.axis2.AxisFault; > import org.apache.axis2.context.MessageContext; > import org.apache.axis2.transport.MessageFormatter; > -import org.apache.axis2.transport.TransportUtils; > import org.apache.axis2.transport.base.BaseUtils; > +import org.apache.axis2.util.MessageProcessorSelector; > import org.apache.commons.logging.Log; > import org.apache.commons.logging.LogFactory; > > @@ -97,7 +97,7 @@ > OMOutputFormat format = > BaseUtils.getOMOutputFormat(msgContext); > MessageFormatter messageFormatter = null; > try { > - messageFormatter = > TransportUtils.getMessageFormatter(msgContext); > + messageFormatter = > MessageProcessorSelector.getMessageFormatter(msgContext); > } catch (AxisFault axisFault) { > throw new AxisRabbitMQException("Unable to get > the message formatter to use", > axisFault); > > Modified: > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java > URL: > http://wso2.org/svn/browse/wso2/carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java?rev=171036&r1=171035&r2=171036&view=diff > > ============================================================================== > --- > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java > (original) > +++ > carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java > Thu Apr 25 14:35:33 2013 > @@ -18,28 +18,28 @@ > */ > package org.apache.axis2.transport.udp; > > -import java.io.IOException; > -import java.io.InputStream; > -import java.io.ByteArrayInputStream; > -import java.net.DatagramPacket; > -import java.net.DatagramSocket; > - > import org.apache.axiom.om.OMOutputFormat; > import org.apache.axiom.soap.SOAPEnvelope; > import org.apache.axis2.AxisFault; > import org.apache.axis2.context.ConfigurationContext; > import org.apache.axis2.context.MessageContext; > +import org.apache.axis2.description.OutInAxisOperation; > import org.apache.axis2.description.TransportOutDescription; > import org.apache.axis2.description.WSDL2Constants; > -import org.apache.axis2.description.OutInAxisOperation; > import org.apache.axis2.transport.MessageFormatter; > import org.apache.axis2.transport.OutTransportInfo; > import org.apache.axis2.transport.TransportUtils; > import org.apache.axis2.transport.base.AbstractTransportSender; > import org.apache.axis2.transport.base.BaseUtils; > +import org.apache.axis2.util.MessageProcessorSelector; > import org.apache.commons.logging.LogFactory; > > import javax.xml.stream.XMLStreamException; > +import java.io.ByteArrayInputStream; > +import java.io.IOException; > +import java.io.InputStream; > +import java.net.DatagramPacket; > +import java.net.DatagramSocket; > > /** > * Transport sender for the UDP protocol. > @@ -67,7 +67,7 @@ > } else { > udpOutInfo = new UDPOutTransportInfo(targetEPR); > } > - MessageFormatter messageFormatter = > TransportUtils.getMessageFormatter(msgContext); > + MessageFormatter messageFormatter = > MessageProcessorSelector.getMessageFormatter(msgContext); > OMOutputFormat format = BaseUtils.getOMOutputFormat(msgContext); > format.setContentType(udpOutInfo.getContentType()); > byte[] payload = messageFormatter.getBytes(msgContext, format); > > Modified: carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/pom.xml > URL: > http://wso2.org/svn/browse/wso2/carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/pom.xml?rev=171036&r1=171035&r2=171036&view=diff > > ============================================================================== > --- carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/pom.xml > (original) > +++ carbon/kernel/trunk/dependencies/transports/1.1.0-wso2v9/pom.xml > Thu Apr 25 14:35:33 2013 > @@ -522,7 +522,7 @@ > </reporting> > > <properties> > - <axis2.version>1.6.1-wso2v5</axis2.version> > + <axis2.version>1.6.1-wso2v10</axis2.version> > <failIfNoTests>false</failIfNoTests> > </properties> > > _______________________________________________ > Commits mailing list > [email protected] > http://wso2.org/cgi-bin/mailman/listinfo/commits > -- *Kishanthan Thangarajah* Software Engineer, Development Technologies Team, WSO2, Inc. lean.enterprise.middleware Mobile - +94773426635 Blog - *http://kishanthan.wordpress.com* Twitter - *http://twitter.com/kishanthan*
_______________________________________________ Dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/dev
