Author: azeez Date: Mon Jun 9 03:59:00 2008 New Revision: 18212 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18212
Log: Adding patch sent by Amila Modified: branches/wsas/java/2.3/commons/mercury/modules/core/src/main/java/org/wso2/mercury/message/Accept.java branches/wsas/java/2.3/commons/mercury/modules/core/src/main/java/org/wso2/mercury/state/RMDSequence.java Modified: branches/wsas/java/2.3/commons/mercury/modules/core/src/main/java/org/wso2/mercury/message/Accept.java URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/commons/mercury/modules/core/src/main/java/org/wso2/mercury/message/Accept.java?rev=18212&r1=18211&r2=18212&view=diff ============================================================================== --- branches/wsas/java/2.3/commons/mercury/modules/core/src/main/java/org/wso2/mercury/message/Accept.java (original) +++ branches/wsas/java/2.3/commons/mercury/modules/core/src/main/java/org/wso2/mercury/message/Accept.java Mon Jun 9 03:59:00 2008 @@ -29,6 +29,7 @@ public class Accept extends RMMessageElement { private String acceptERP; + private String addressingNamespace; public Accept() { } @@ -44,6 +45,7 @@ OMElement accept = omFactory.createOMElement(MercuryConstants.ACCEPT, rmNamespace, MercuryConstants.RM_1_0_NAMESPACE_PREFIX); AcksTo acksTo = new AcksTo(this.rmNamespace); + acksTo.setAddressingNamespace(this.addressingNamespace); acksTo.setEndpointAddress(acceptERP); accept.addChild(acksTo.toOM()); return accept; @@ -72,4 +74,12 @@ public void setAcceptERP(String acceptERP) { this.acceptERP = acceptERP; } + + public String getAddressingNamespace() { + return addressingNamespace; + } + + public void setAddressingNamespace(String addressingNamespace) { + this.addressingNamespace = addressingNamespace; + } } Modified: branches/wsas/java/2.3/commons/mercury/modules/core/src/main/java/org/wso2/mercury/state/RMDSequence.java URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/commons/mercury/modules/core/src/main/java/org/wso2/mercury/state/RMDSequence.java?rev=18212&r1=18211&r2=18212&view=diff ============================================================================== --- branches/wsas/java/2.3/commons/mercury/modules/core/src/main/java/org/wso2/mercury/state/RMDSequence.java (original) +++ branches/wsas/java/2.3/commons/mercury/modules/core/src/main/java/org/wso2/mercury/state/RMDSequence.java Mon Jun 9 03:59:00 2008 @@ -18,6 +18,7 @@ import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.OperationContext; import org.apache.axis2.addressing.EndpointReference; +import org.apache.axis2.addressing.AddressingConstants; import org.apache.axis2.util.MessageContextBuilder; import org.apache.axis2.util.CallbackReceiver; import org.apache.axis2.AxisFault; @@ -182,6 +183,7 @@ if (this.selfAcksToEPR != null){ Accept accept = new Accept(); accept.setAcceptERP(this.selfAcksToEPR); + accept.setAddressingNamespace(this.axis2Info.getAddressingNamespaceURI()); createSequenceResponseMessage.setAccept(accept); } @@ -368,7 +370,8 @@ MessageContext messageContext = getNewMessageContext(sequenceAcknowledgmentMessage, inboundMessageContext); - + messageContext.getOptions().setProperty(AddressingConstants.WS_ADDRESSING_VERSION, + this.axis2Info.getAddressingNamespaceURI()); messageContext.getOptions().setAction(MercuryConstants.SEQUENCE_ACKNOWLEDGMENT_ACTION); AxisService axisServce = this.axis2Info.getAxisService(); AxisOperation inOnlyOperation = _______________________________________________ Wsas-java-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
