Author: ruwan
Date: Wed Apr 1 13:56:32 2009
New Revision: 760894
URL: http://svn.apache.org/viewvc?rev=760894&view=rev
Log:
let the addressing headers pass through by default
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java?rev=760894&r1=760893&r2=760894&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
Wed Apr 1 13:56:32 2009
@@ -88,6 +88,8 @@
public static final String ADDRESSING_VERSION_FINAL = "final";
public static final String ADDRESSING_VERSION_SUBMISSION = "submission";
+ public static final String ADDRESSING_ADDED_BY_SYNAPSE =
"AddressingAddedBySynapse";
+
/** The Axis2 client options property name for the Rampart service policy
*/
public static final String RAMPART_POLICY = "rampartPolicy";
/** The Axis2 client options property name for the Rampart in message
policy */
@@ -141,7 +143,7 @@
public static final String OUT_ONLY = "OUT_ONLY";
/** The Synapse MC property that states that existing WS-A headers in
the envelope should
* be preserved */
- public static final String PRESERVE_WS_ADDRESSING =
"PRESERVE_WS_ADDRESSING";
+ public static final String REMOVE_WS_ADDRESSING =
"REMOVE_WS_ADDRESSING";
//-- error handling --
/** An Axis2 message context property indicating a transport send
failure */
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?rev=760894&r1=760893&r2=760894&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
Wed Apr 1 13:56:32 2009
@@ -114,12 +114,12 @@
// create a new MessageContext to be sent out as this should not
corrupt the original
// we need to create the response to the original message later on
MessageContext axisOutMsgCtx = cloneForSend(originalInMsgCtx,
- (String)
synapseOutMessageContext.getProperty(SynapseConstants.PRESERVE_WS_ADDRESSING));
+ (String)
synapseOutMessageContext.getProperty(SynapseConstants.REMOVE_WS_ADDRESSING));
if (log.isDebugEnabled()) {
- log.debug("Message [Original Request Message ID : " +
synapseOutMessageContext.getMessageID()
- + "]" + " [New Cloned Request Message ID : "
- + axisOutMsgCtx.getMessageID() + "]");
+ log.debug("Message [Original Request Message ID : "
+ + synapseOutMessageContext.getMessageID() + "]"
+ + " [New Cloned Request Message ID : " +
axisOutMsgCtx.getMessageID() + "]");
}
// set all the details of the endpoint only to the cloned message
context
// so that we can use the original message context for resending
through different endpoints
@@ -318,15 +318,16 @@
mepClient.execute(true);
}
- private static MessageContext cloneForSend(MessageContext ori, String
preserveWSAdd) throws AxisFault {
+ private static MessageContext cloneForSend(MessageContext ori, String
removeWSAdd)
+ throws AxisFault {
MessageContext newMC = MessageHelper.clonePartially(ori);
newMC.setEnvelope(ori.getEnvelope());
- if (preserveWSAdd != null && Boolean.parseBoolean(preserveWSAdd)) {
- newMC.setMessageID(ori.getMessageID());
- } else {
+ if (removeWSAdd != null && Boolean.parseBoolean(removeWSAdd)) {
MessageHelper.removeAddressingHeaders(newMC);
+ } else {
+ newMC.setMessageID(ori.getMessageID());
}
newMC.setProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS,
