Use MESSAGE_ID instead of WS_MESSAGE_ID as Tuscany message header for handling callbacks' handling of WS-A headers.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1208790 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
index a68d7691ba..f251c97bb6 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
@@ -56,6 +56,7 @@ import javax.xml.ws.soap.SOAPFaultException;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.assembly.Endpoint;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
+import org.apache.tuscany.sca.core.invocation.Constants;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.interfacedef.util.FaultException;
 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
@@ -419,7 +420,6 @@ public class JAXWSBindingInvoker implements Invoker, DataExchangeSemantics {
 
     } // end method addWSAActionHeader
 
-    private static String WS_MESSAGE_ID = "WS_MESSAGE_ID";
     protected static String SCA_CALLBACK_REL = "http://docs.oasis-open.org/opencsa/sca-bindings/ws/callback";
 
     /**
@@ -432,7 +432,8 @@ public class JAXWSBindingInvoker implements Invoker, DataExchangeSemantics {
      * @throws SOAPException
      */
     private void addWSARelatesTo(SOAPHeader sh, Message msg) throws SOAPException {
-        String idValue = (String)msg.getHeaders().get(WS_MESSAGE_ID);
+        
+        String idValue = (String)msg.getHeaders().get(Constants.MESSAGE_ID);
         if (idValue != null) {
             SOAPHeaderElement relatesToH = sh.addHeaderElement(QNAME_WSA_RELATESTO);
             relatesToH.addAttribute(new QName(null, "RelationshipType"), SCA_CALLBACK_REL);