Author: slaws
Date: Thu Jun 23 14:31:42 2011
New Revision: 1138899
URL: http://svn.apache.org/viewvc?rev=1138899&view=rev
Log:
TUSCANY-3881 - create a context bean to hold a more consistent of Axis2 context
in the reference and service side chains.
Added:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/context/
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/context/WSAxis2BindingContext.java
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInMessageReceiver.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInOutSyncMessageReceiver.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyServiceProvider.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/transport/TransportReferenceInterceptor.java
Added:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/context/WSAxis2BindingContext.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/context/WSAxis2BindingContext.java?rev=1138899&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/context/WSAxis2BindingContext.java
(added)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/context/WSAxis2BindingContext.java
Thu Jun 23 14:31:42 2011
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.sca.binding.ws.axis2.context;
+
+import org.apache.axis2.client.OperationClient;
+import org.apache.axis2.context.MessageContext;
+
+/**
+ * Context that the WS Axis2 binding puts on the Tuscany wire
+ *
+ * @version $Rev: 813727 $ $Date: 2009-09-11 10:02:58 +0100 (Fri, 11 Sep 2009)
$
+ */
+public class WSAxis2BindingContext {
+
+ private OperationClient axisOperationClient;
+ private MessageContext axisInMessageContext;
+ private MessageContext axisOutMessageContext;
+
+ public OperationClient getAxisOperationClient() {
+ return axisOperationClient;
+ }
+
+ public void setAxisOperationClient(OperationClient axisOperationClient) {
+ this.axisOperationClient = axisOperationClient;
+ }
+
+ public MessageContext getAxisInMessageContext() {
+ return axisInMessageContext;
+ }
+
+ public void setAxisInMessageContext(MessageContext axisInMessageContext) {
+ this.axisInMessageContext = axisInMessageContext;
+ }
+
+ public MessageContext getAxisOutMessageContext() {
+ return axisOutMessageContext;
+ }
+
+ public void setAxisOutMessageContext(MessageContext axisOutMessageContext)
{
+ this.axisOutMessageContext = axisOutMessageContext;
+ }
+}
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java?rev=1138899&r1=1138898&r2=1138899&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
Thu Jun 23 14:31:42 2011
@@ -28,6 +28,7 @@ import org.apache.axis2.client.Operation
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.transport.http.HttpTransportProperties;
import org.apache.axis2.transport.http.HttpTransportProperties.Authenticator;
+import org.apache.tuscany.sca.binding.ws.axis2.context.WSAxis2BindingContext;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.invocation.Phase;
@@ -74,7 +75,8 @@ public class BasicAuthenticationReferenc
public Message invoke(Message msg) {
- OperationClient operationClient = msg.getBindingContext();
+ WSAxis2BindingContext bindingContext = msg.getBindingContext();
+ OperationClient operationClient =
bindingContext.getAxisOperationClient();
String username = null;
String password = null;
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java?rev=1138899&r1=1138898&r2=1138899&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
Thu Jun 23 14:31:42 2011
@@ -25,7 +25,9 @@ import javax.security.auth.Subject;
import javax.xml.namespace.QName;
import org.apache.axiom.util.base64.Base64Utils;
+import org.apache.axis2.client.OperationClient;
import org.apache.axis2.context.MessageContext;
+import org.apache.tuscany.sca.binding.ws.axis2.context.WSAxis2BindingContext;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.invocation.Phase;
@@ -74,7 +76,9 @@ public class BasicAuthenticationServiceP
public Message invoke(Message msg) {
- MessageContext messageContext = msg.getBindingContext();
+ WSAxis2BindingContext bindingContext = msg.getBindingContext();
+ MessageContext messageContext =
bindingContext.getAxisInMessageContext();
+
Map httpHeaderProperties =
(Map)messageContext.getProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS);
String basicAuthString =
(String)httpHeaderProperties.get("Authorization");
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java?rev=1138899&r1=1138898&r2=1138899&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java
Thu Jun 23 14:31:42 2011
@@ -54,6 +54,7 @@ import org.apache.tuscany.sca.assembly.C
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 Axis2ReferenceBindingInvoke
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()){
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInMessageReceiver.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInMessageReceiver.java?rev=1138899&r1=1138898&r2=1138899&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInMessageReceiver.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInMessageReceiver.java
Thu Jun 23 14:31:42 2011
@@ -41,7 +41,7 @@ public class Axis2ServiceInMessageReceiv
try {
OMElement requestOM =
inMC.getEnvelope().getBody().getFirstElement();
- provider.invoke(requestOM, inMC);
+ provider.invoke(requestOM, inMC, null);
} catch (InvocationTargetException e) {
Throwable t = e.getCause();
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInOutSyncMessageReceiver.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInOutSyncMessageReceiver.java?rev=1138899&r1=1138898&r2=1138899&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInOutSyncMessageReceiver.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInOutSyncMessageReceiver.java
Thu Jun 23 14:31:42 2011
@@ -48,7 +48,7 @@ public class Axis2ServiceInOutSyncMessag
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 ) {
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyServiceProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyServiceProvider.java?rev=1138899&r1=1138898&r2=1138899&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyServiceProvider.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyServiceProvider.java
Thu Jun 23 14:31:42 2011
@@ -43,6 +43,7 @@ import org.apache.tuscany.sca.assembly.E
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
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/transport/TransportReferenceInterceptor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/transport/TransportReferenceInterceptor.java?rev=1138899&r1=1138898&r2=1138899&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/transport/TransportReferenceInterceptor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/transport/TransportReferenceInterceptor.java
Thu Jun 23 14:31:42 2011
@@ -28,6 +28,7 @@ import org.apache.axis2.client.Operation
import org.apache.axis2.client.Options;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.tuscany.sca.binding.ws.axis2.context.WSAxis2BindingContext;
import org.apache.tuscany.sca.interfacedef.util.FaultException;
import org.apache.tuscany.sca.invocation.Interceptor;
import org.apache.tuscany.sca.invocation.Invoker;
@@ -72,7 +73,8 @@ public class TransportReferenceIntercept
}
protected Object invokeTarget(Message msg) throws AxisFault {
- final OperationClient operationClient = msg.getBindingContext();
+ WSAxis2BindingContext bindingContext = msg.getBindingContext();
+ final OperationClient operationClient =
bindingContext.getAxisOperationClient();
// ensure connections are tracked so that they can be closed by the
reference binding
MessageContext requestMC = operationClient.getMessageContext("Out");
@@ -95,6 +97,7 @@ public class TransportReferenceIntercept
}
MessageContext responseMC = operationClient.getMessageContext("In");
+ bindingContext.setAxisInMessageContext(responseMC);
OMElement response =
responseMC.getEnvelope().getBody().getFirstElement();
@@ -111,7 +114,8 @@ public class TransportReferenceIntercept
}
protected Object invokeTargetOneWay(Message msg) throws AxisFault {
- OperationClient operationClient = msg.getBindingContext();
+ WSAxis2BindingContext bindingContext = msg.getBindingContext();
+ OperationClient operationClient =
bindingContext.getAxisOperationClient();
// ensure connections are tracked so that they can be closed by the
reference binding
MessageContext requestMC = operationClient.getMessageContext("Out");
