Author: veithen
Date: Tue Feb 12 21:17:12 2013
New Revision: 1445385
URL: http://svn.apache.org/r1445385
Log:
AXIS2-5434: Removed r1387526 from the 1.6 branch. The change is only applicable
to 1.7.
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
axis/axis2/java/core/branches/1_6/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
axis/axis2/java/core/branches/1_6/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
axis/axis2/java/core/branches/1_6/modules/transport/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java?rev=1445385&r1=1445384&r2=1445385&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java
Tue Feb 12 21:17:12 2013
@@ -34,7 +34,6 @@ import org.apache.axis2.format.BinaryFor
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;
@@ -157,7 +156,7 @@ public class BaseUtils {
// ... otherwise, let Axis choose the right message formatter:
try {
- return MessageProcessorSelector.getMessageFormatter(msgContext);
+ return TransportUtils.getMessageFormatter(msgContext);
} catch (AxisFault axisFault) {
throw new BaseTransportException("Unable to get the message
formatter to use");
}
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java?rev=1445385&r1=1445384&r2=1445385&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
Tue Feb 12 21:17:12 2013
@@ -19,12 +19,12 @@ import org.apache.axiom.om.OMOutputForma
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMNode;
-import org.apache.axis2.util.MessageProcessorSelector;
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.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.*;
@@ -343,7 +343,7 @@ public class JMSSender extends AbstractT
OMOutputFormat format = BaseUtils.getOMOutputFormat(msgContext);
MessageFormatter messageFormatter = null;
try {
- messageFormatter =
MessageProcessorSelector.getMessageFormatter(msgContext);
+ messageFormatter =
TransportUtils.getMessageFormatter(msgContext);
} catch (AxisFault axisFault) {
throw new JMSException("Unable to get the message formatter to
use");
}
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java?rev=1445385&r1=1445384&r2=1445385&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
Tue Feb 12 21:17:12 2013
@@ -22,7 +22,6 @@ import org.apache.axis2.builder.Builder;
import org.apache.axis2.builder.BuilderUtil;
import org.apache.axis2.builder.SOAPBuilder;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.util.MessageProcessorSelector;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.format.DataSourceMessageBuilder;
import org.apache.axis2.format.TextMessageBuilder;
@@ -131,7 +130,7 @@ public class JMSUtils extends BaseUtils
int index = contentType.indexOf(';');
String type = index > 0 ? contentType.substring(0, index) :
contentType;
- Builder builder = MessageProcessorSelector.getMessageBuilder(type,
msgContext);
+ Builder builder = BuilderUtil.getBuilderFromSelector(type, msgContext);
if (builder == null) {
if (log.isDebugEnabled()) {
log.debug("No message builder found for type '" + type + "'.
Falling back to SOAP.");
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java?rev=1445385&r1=1445384&r2=1445385&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
Tue Feb 12 21:17:12 2013
@@ -31,7 +31,6 @@ import org.apache.axis2.transport.base.A
import org.apache.axis2.transport.base.BaseUtils;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axis2.util.MessageProcessorSelector;
import java.io.IOException;
import java.io.OutputStream;
@@ -85,7 +84,7 @@ public class TCPTransportSender extends
private void writeOut(MessageContext msgContext, Socket socket,
String contentType) throws IOException {
- MessageFormatter messageFormatter =
MessageProcessorSelector.getMessageFormatter(msgContext);
+ MessageFormatter messageFormatter =
TransportUtils.getMessageFormatter(msgContext);
OMOutputFormat format = BaseUtils.getOMOutputFormat(msgContext);
format.setContentType(contentType);
byte[] payload = messageFormatter.getBytes(msgContext, format);
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java?rev=1445385&r1=1445384&r2=1445385&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
Tue Feb 12 21:17:12 2013
@@ -118,8 +118,6 @@ public class AxisTestClient implements T
mc.setProperty(BaseConstants.METRICS_COLLECTOR, metrics);
}
mepClient.addMessageContext(mc);
- mepClient.getOptions().setAction("");
-
mepClient.execute(block);
// mepClient.complete(mc);
return resultMessageLabel == null ? null :
mepClient.getMessageContext(resultMessageLabel);
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java?rev=1445385&r1=1445384&r2=1445385&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/transport/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java
Tue Feb 12 21:17:12 2013
@@ -37,7 +37,6 @@ import org.apache.axis2.transport.OutTra
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;
@@ -68,7 +67,7 @@ public class UDPSender extends AbstractT
} else {
udpOutInfo = new UDPOutTransportInfo(targetEPR);
}
- MessageFormatter messageFormatter =
MessageProcessorSelector.getMessageFormatter(msgContext);
+ MessageFormatter messageFormatter =
TransportUtils.getMessageFormatter(msgContext);
OMOutputFormat format = BaseUtils.getOMOutputFormat(msgContext);
format.setContentType(udpOutInfo.getContentType());
byte[] payload = messageFormatter.getBytes(msgContext, format);
