diff options
Diffstat (limited to '')
4 files changed, 16 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java index 3f3e63951b..c163117d59 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java @@ -54,6 +54,7 @@ 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.binding.ws.WebServiceBindingFactory; +import org.apache.tuscany.sca.binding.ws.axis2.context.WSAxis2BindingContext; import org.apache.tuscany.sca.context.CompositeContext; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.FactoryExtensionPoint; @@ -113,7 +114,12 @@ public class Axis2ReferenceBindingInvoker implements Invoker { public Message invoke(Message msg) { try { final OperationClient operationClient = createOperationClient(msg); - msg.setBindingContext(operationClient); + WSAxis2BindingContext bindingContext = new WSAxis2BindingContext(); + bindingContext.setAxisOperationClient(operationClient); + bindingContext.setAxisOutMessageContext(operationClient.getMessageContext("Out")); + bindingContext.setAxisOutMessageContext(operationClient.getMessageContext("In")); + msg.setBindingContext(bindingContext); + msg = endpointReference.getBindingInvocationChain().getHeadInvoker().invoke(msg); if (wsBinding.isRpcLiteral()){ diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInMessageReceiver.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInMessageReceiver.java index 65e95ba34e..d23dc7e8ca 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInMessageReceiver.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInMessageReceiver.java @@ -41,7 +41,7 @@ public class Axis2ServiceInMessageReceiver extends AbstractInMessageReceiver { try { OMElement requestOM = inMC.getEnvelope().getBody().getFirstElement(); - provider.invoke(requestOM, inMC); + provider.invoke(requestOM, inMC, null); } catch (InvocationTargetException e) { Throwable t = e.getCause(); diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInOutSyncMessageReceiver.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInOutSyncMessageReceiver.java index d6694c9f7d..9617ba036c 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInOutSyncMessageReceiver.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInOutSyncMessageReceiver.java @@ -48,7 +48,7 @@ public class Axis2ServiceInOutSyncMessageReceiver extends AbstractInOutSyncMessa try { OMElement requestOM = inMC.getEnvelope().getBody().getFirstElement(); - OMElement responseOM = (OMElement)provider.invoke(requestOM, inMC); + OMElement responseOM = (OMElement)provider.invoke(requestOM, inMC, outMC); SOAPEnvelope soapEnvelope = getSOAPFactory(inMC).getDefaultEnvelope(); if (null != responseOM ) { diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyServiceProvider.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyServiceProvider.java index 70875916df..4fe29da9c3 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyServiceProvider.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyServiceProvider.java @@ -43,6 +43,7 @@ import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
+import org.apache.tuscany.sca.binding.ws.axis2.context.WSAxis2BindingContext;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory;
@@ -110,13 +111,17 @@ public class TuscanyServiceProvider { }
} // end method checkCallbackAddress
- public OMElement invoke(OMElement requestOM, MessageContext inMC) throws InvocationTargetException, AxisFault {
+ public OMElement invoke(OMElement requestOM, MessageContext inMC, MessageContext outMC) throws InvocationTargetException, AxisFault {
String callbackAddress = null;
// create a message object and set the args as its body
Message msg = messageFactory.createMessage();
msg.setOperation(operation);
- msg.setBindingContext(inMC);
+ WSAxis2BindingContext bindingContext = new WSAxis2BindingContext();
+ bindingContext.setAxisOutMessageContext(inMC);
+ bindingContext.setAxisOutMessageContext(outMC); //TUSCANY-3881
+ msg.setBindingContext(bindingContext);
+
if (wsBinding.isRpcLiteral()){
// remove the wrapping element containing
|