Author: jmarino
Date: Tue Oct 24 11:00:57 2006
New Revision: 467410
URL: http://svn.apache.org/viewvc?view=rev&rev=467410
Log:
[PATCH] TUSCANY-642 SimplerCompositeReferenceInvocation4.patch from Ignacio;
second part of patch
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2AsyncTargetInvoker.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2CallbackInvocationHandler.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceCallbackTargetInvoker.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceCallbackTargetInvoker.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInMessageReceiver.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutSyncMessageReceiver.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2AsyncTargetInvoker.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2AsyncTargetInvoker.java?view=diff&rev=467410&r1=467409&r2=467410
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2AsyncTargetInvoker.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2AsyncTargetInvoker.java
Tue Oct 24 11:00:57 2006
@@ -37,7 +37,6 @@
protected static final OMElement RESPONSE = null;
private InboundWire wire;
- private Object messageId;
private Axis2ReferenceCallbackTargetInvoker callbackInvoker;
public Axis2AsyncTargetInvoker(ServiceClient serviceClient,
@@ -50,6 +49,10 @@
}
public Object invokeTarget(final Object payload) throws
InvocationTargetException {
+ throw new InvocationTargetException(new
InvocationRuntimeException("Operation not supported"));
+ }
+
+ private Object invokeTarget(final Object payload, Object messageId) throws
InvocationTargetException {
try {
Object[] args = (Object[])payload;
OperationClient operationClient = createOperationClient(args);
@@ -68,9 +71,9 @@
public Message invoke(Message msg) throws InvocationRuntimeException {
try {
- wire.addMapping(msg.getMessageId(), msg.getFromAddress());
- messageId = msg.getMessageId();
- Object resp = invokeTarget(msg.getBody());
+ Object messageId = msg.getMessageId();
+ wire.addMapping(messageId, msg.getFromAddress());
+ Object resp = invokeTarget(msg.getBody(), messageId);
msg.setBody(resp);
} catch (Throwable e) {
msg.setBodyWithFault(e);
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java?view=diff&rev=467410&r1=467409&r2=467410
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
Tue Oct 24 11:00:57 2006
@@ -32,7 +32,6 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.Service;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.BindingBuilderExtension;
import org.apache.tuscany.spi.host.ServletHost;
@@ -55,8 +54,6 @@
private ConfigurationContext configContext;
- private WorkContext workContext;
-
private InterfaceWSDLIntrospector introspector;
public Axis2BindingBuilder() {
@@ -76,11 +73,6 @@
this.introspector = introspector;
}
- @Autowire
- public void setWorkContext(WorkContext workContext) {
- this.workContext = workContext;
- }
-
@SuppressWarnings("unchecked")
public Service build(
CompositeComponent parent,
@@ -123,7 +115,7 @@
}
Service service = new Axis2Service(serviceDefinition.getName(),
outboundContract, parent, wireService, wsBinding,
- servletHost, configContext, workContext);
+ servletHost, configContext);
service.setBindingServiceContract(inboundContract);
return service;
@@ -171,7 +163,7 @@
}
Reference reference = new
Axis2Reference(boundReferenceDefinition.getName(), parent, wireService,
wsBinding,
- inboundContract, workContext);
+ inboundContract);
reference.setBindingServiceContract(outboundContract);
return reference;
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2CallbackInvocationHandler.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2CallbackInvocationHandler.java?view=diff&rev=467410&r1=467409&r2=467410
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2CallbackInvocationHandler.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2CallbackInvocationHandler.java
Tue Oct 24 11:00:57 2006
@@ -29,14 +29,12 @@
public class Axis2CallbackInvocationHandler extends
AbstractOutboundInvocationHandler {
private InboundWire inboundWire;
- private Object messageId;
- private Object correlationId;
public Axis2CallbackInvocationHandler(InboundWire inboundWire) {
this.inboundWire = inboundWire;
}
- public Object invoke(Operation operation, Object[] args) throws Throwable {
+ public Object invoke(Operation operation, Object[] args, Object
correlationId) throws Throwable {
Object targetAddress = inboundWire.retrieveMapping(correlationId);
if (targetAddress == null) {
throw new AssertionError("No from address associated with message
id [" + correlationId + "]");
@@ -46,29 +44,10 @@
inboundWire.getSourceCallbackInvocationChains(targetAddress);
OutboundInvocationChain chain =
sourceCallbackInvocationChains.get(operation);
TargetInvoker invoker = chain.getTargetInvoker();
- return invoke(chain, invoker, args);
- }
-
- // This must be called before invoke
- public void setMessageId(Object messageId) {
- this.messageId = messageId;
- }
-
- // This must be called before invoke
- public void setCorrelationId(Object correlationId) {
- this.correlationId = correlationId;
+ return invoke(chain, invoker, args, null, correlationId);
}
protected Object getFromAddress() {
return (inboundWire.getContainer() == null) ? null :
inboundWire.getContainer().getName();
}
-
- protected Object getMessageId() {
- return messageId;
- }
-
- protected Object getCorrelationId() {
- return correlationId;
- }
-
}
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java?view=diff&rev=467410&r1=467409&r2=467410
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java
Tue Oct 24 11:00:57 2006
@@ -36,7 +36,6 @@
import org.apache.tuscany.binding.axis2.util.WebServiceOperationMetaData;
import org.apache.tuscany.binding.axis2.util.WebServicePortMetaData;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.extension.ReferenceExtension;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -52,22 +51,18 @@
private WebServicePortMetaData wsPortMetaData;
private ServiceClient serviceClient;
- // private WorkContext workContext;
-
@SuppressWarnings("unchecked")
public Axis2Reference(String theName,
CompositeComponent parent,
WireService wireService,
WebServiceBinding wsBinding,
- ServiceContract contract,
- WorkContext workContext) {
+ ServiceContract contract) {
super(theName, (Class<T>)contract.getInterfaceClass(), parent,
wireService);
try {
Definition wsdlDefinition = wsBinding.getWSDLDefinition();
wsPortMetaData =
new WebServicePortMetaData(wsdlDefinition,
wsBinding.getWSDLPort(), wsBinding.getURI(), false);
serviceClient = createServiceClient(wsdlDefinition,
wsPortMetaData);
- // this.workContext = workContext;
} catch (AxisFault e) {
throw new Axis2BindingRunTimeException(e);
}
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceCallbackTargetInvoker.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceCallbackTargetInvoker.java?view=diff&rev=467410&r1=467409&r2=467410
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceCallbackTargetInvoker.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceCallbackTargetInvoker.java
Tue Oct 24 11:00:57 2006
@@ -44,8 +44,6 @@
}
public Object invokeTarget(final Object payload) throws
InvocationTargetException {
- invocationHandler.setMessageId(null);
- invocationHandler.setCorrelationId(correlationId);
Object[] args;
if (payload != null && !payload.getClass().isArray()) {
args = new Object[]{payload};
@@ -53,7 +51,7 @@
args = (Object[]) payload;
}
try {
- return invocationHandler.invoke(operation, args);
+ return invocationHandler.invoke(operation, args, correlationId);
} catch(Throwable t) {
t.printStackTrace();
throw new InvocationTargetException(t);
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java?view=diff&rev=467410&r1=467409&r2=467410
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
Tue Oct 24 11:00:57 2006
@@ -44,7 +44,6 @@
import org.apache.tuscany.binding.axis2.util.WebServicePortMetaData;
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.extension.ServiceExtension;
import org.apache.tuscany.spi.host.ServletHost;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -72,8 +71,6 @@
private WebServiceBinding binding;
- private WorkContext workContext;
-
private Map<MessageId, InvocationContext> invCtxMap = new
HashMap<MessageId, InvocationContext>();
private String serviceName;
@@ -84,8 +81,7 @@
WireService wireService,
WebServiceBinding binding,
ServletHost servletHost,
- ConfigurationContext configContext,
- WorkContext workContext) {
+ ConfigurationContext configContext) {
super(theName, serviceContract.getInterfaceClass(), parent,
wireService);
@@ -93,7 +89,6 @@
this.binding = binding;
this.servletHost = servletHost;
this.configContext = configContext;
- this.workContext = workContext;
this.serviceName = theName;
}
@@ -157,7 +152,7 @@
MessageReceiver msgrec = null;
boolean opIsNonBlocking = op.isNonBlocking();
if (serviceContract.getCallbackName() != null) {
- msgrec = new Axis2ServiceInOutAsyncMessageReceiver(this, op,
workContext);
+ msgrec = new Axis2ServiceInOutAsyncMessageReceiver(this, op);
} else if (opIsNonBlocking) {
msgrec = new Axis2ServiceInMessageReceiver(this, op);
} else {
@@ -176,7 +171,7 @@
return axisService;
}
- public Object invokeTarget(org.apache.tuscany.spi.model.Operation<?> op,
Object[] args)
+ public Object invokeTarget(org.apache.tuscany.spi.model.Operation<?> op,
Object[] args, Object messageId)
throws InvocationTargetException {
InvocationChain chain = inboundWire.getInvocationChains().get(op);
Interceptor headInterceptor = chain.getHeadInterceptor();
@@ -192,10 +187,6 @@
throw e;
}
} else {
- Object messageId = workContext.getCurrentMessageId();
- workContext.setCurrentMessageId(null);
- Object correlationId = workContext.getCurrentCorrelationId();
- workContext.setCurrentCorrelationId(null);
Message msg = new MessageImpl();
msg.setTargetInvoker(chain.getTargetInvoker());
@@ -203,9 +194,6 @@
if (messageId != null) {
msg.setMessageId(messageId);
}
- if (correlationId != null) {
- msg.setCorrelationId(correlationId);
- }
msg.setBody(args);
Message resp;
// dispatch the wire down the chain and get the response
@@ -254,7 +242,7 @@
public TargetInvoker createCallbackTargetInvoker(ServiceContract contract,
org.apache.tuscany.spi.model.Operation operation) {
- return new Axis2ServiceCallbackTargetInvoker(workContext, this);
+ return new Axis2ServiceCallbackTargetInvoker(this);
}
public void addMapping(MessageId msgId, InvocationContext invCtx) {
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceCallbackTargetInvoker.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceCallbackTargetInvoker.java?view=diff&rev=467410&r1=467409&r2=467410
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceCallbackTargetInvoker.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceCallbackTargetInvoker.java
Tue Oct 24 11:00:57 2006
@@ -29,7 +29,6 @@
import org.apache.axis2.util.Utils;
import org.apache.tuscany.binding.axis2.Axis2Service.InvocationContext;
import org.apache.tuscany.binding.axis2.Axis2AsyncTargetInvoker;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.wire.InvocationRuntimeException;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageId;
@@ -39,16 +38,18 @@
private Axis2Service service;
- private MessageId currentCorrelationId;
-
- public Axis2ServiceCallbackTargetInvoker(WorkContext workContext,
Axis2Service service) {
+ public Axis2ServiceCallbackTargetInvoker(Axis2Service service) {
this.service = service;
}
public Object invokeTarget(final Object payload) throws
InvocationTargetException {
+ throw new InvocationTargetException(new
InvocationRuntimeException("Operation not supported"));
+ }
+
+ private Object invokeTarget(final Object payload, MessageId correlationId)
throws InvocationTargetException {
try {
// Use current correlation id as index to retrieve inv context
- InvocationContext invCtx =
service.retrieveMapping(this.currentCorrelationId);
+ InvocationContext invCtx = service.retrieveMapping(correlationId);
MessageContext outMC =
Utils.createOutMessageContext(invCtx.inMessageContext);
outMC.getOperationContext().addMessageContext(outMC);
@@ -70,7 +71,7 @@
invCtx.doneSignal.countDown();
- service.removeMapping(this.currentCorrelationId);
+ service.removeMapping(correlationId);
} catch (AxisFault e) {
throw new InvocationTargetException(e);
} catch(Throwable t) {
@@ -82,8 +83,7 @@
public Message invoke(Message msg) throws InvocationRuntimeException {
try {
- this.currentCorrelationId = (MessageId)msg.getCorrelationId();
- Object resp = invokeTarget(msg.getBody());
+ Object resp = invokeTarget(msg.getBody(),
(MessageId)msg.getCorrelationId());
msg.setBody(resp);
} catch (Throwable e) {
msg.setBodyWithFault(e);
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInMessageReceiver.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInMessageReceiver.java?view=diff&rev=467410&r1=467409&r2=467410
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInMessageReceiver.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInMessageReceiver.java
Tue Oct 24 11:00:57 2006
@@ -48,7 +48,7 @@
OMElement requestOM =
inMC.getEnvelope().getBody().getFirstElement();
Object[] args = new Object[] {requestOM};
- axis2Service.invokeTarget(operation, args);
+ axis2Service.invokeTarget(operation, args, null);
} catch (InvocationTargetException e) {
Throwable t = e.getCause();
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java?view=diff&rev=467410&r1=467409&r2=467410
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java
Tue Oct 24 11:00:57 2006
@@ -26,7 +26,6 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.tuscany.binding.axis2.Axis2Service.InvocationContext;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.wire.InvocationRuntimeException;
import org.apache.tuscany.spi.wire.MessageId;
@@ -35,15 +34,11 @@
private Operation<?> operation;
- private WorkContext workContext;
-
private Axis2Service service;
public Axis2ServiceInOutAsyncMessageReceiver(Axis2Service service,
- Operation operation,
- WorkContext workContext) {
+ Operation operation) {
this.operation = operation;
- this.workContext = workContext;
this.service = service;
}
@@ -52,11 +47,8 @@
public final void receive(final MessageContext messageCtx) {
try {
- // Create a new message id and hand it to
- // JDKInboundInvocationHandler
- // via work context
MessageId messageId = new MessageId();
- workContext.setCurrentMessageId(messageId);
+
// Now use message id as index to context to be used by callback
// target invoker
CountDownLatch doneSignal = new CountDownLatch(1);
@@ -64,7 +56,7 @@
service.new InvocationContext(messageCtx, operation,
getSOAPFactory(messageCtx), doneSignal);
service.addMapping(messageId, invCtx);
- invokeBusinessLogic(messageCtx);
+ invokeBusinessLogic(messageCtx, messageId);
try {
doneSignal.await();
@@ -76,11 +68,11 @@
}
}
- public void invokeBusinessLogic(MessageContext inMC) throws AxisFault {
+ private void invokeBusinessLogic(MessageContext inMC, Object messageId)
throws AxisFault {
try {
OMElement requestOM =
inMC.getEnvelope().getBody().getFirstElement();
Object[] args = new Object[] {requestOM};
- service.invokeTarget(operation, args);
+ service.invokeTarget(operation, args, messageId);
} catch (InvocationTargetException e) {
Throwable t = e.getCause();
if (t instanceof Exception) {
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutSyncMessageReceiver.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutSyncMessageReceiver.java?view=diff&rev=467410&r1=467409&r2=467410
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutSyncMessageReceiver.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutSyncMessageReceiver.java
Tue Oct 24 11:00:57 2006
@@ -50,7 +50,7 @@
OMElement requestOM =
inMC.getEnvelope().getBody().getFirstElement();
Object[] args = new Object[] {requestOM};
- OMElement responseOM =
(OMElement)axis2Service.invokeTarget(operation, args);
+ OMElement responseOM =
(OMElement)axis2Service.invokeTarget(operation, args, null);
SOAPEnvelope soapEnvelope =
getSOAPFactory(inMC).getDefaultEnvelope();
soapEnvelope.getBody().addChild(responseOM);
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java?view=diff&rev=467410&r1=467409&r2=467410
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java
Tue Oct 24 11:00:57 2006
@@ -33,7 +33,6 @@
import org.apache.tuscany.idl.wsdl.WSDLServiceContract;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -93,13 +92,10 @@
// TODO figure out what to do with the service contract
ServiceContract<?> contract = new WSDLServiceContract();
contract.setInterfaceClass(Greeter.class);
- WorkContext workContext = EasyMock.createNiceMock(WorkContext.class);
- EasyMock.replay(workContext);
return new Axis2Reference(serviceName,
parent,
wireService,
wsBinding,
- contract,
- workContext);
+ contract);
}
}
Modified:
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java?view=diff&rev=467410&r1=467409&r2=467410
==============================================================================
---
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java
(original)
+++
incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java
Tue Oct 24 11:00:57 2006
@@ -35,7 +35,6 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.tuscany.binding.axis2.util.TuscanyAxisConfigurator;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.host.ServletHost;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.Operation;
@@ -114,8 +113,6 @@
TuscanyAxisConfigurator tuscanyAxisConfigurator = new
TuscanyAxisConfigurator();
ConfigurationContext configurationContext =
tuscanyAxisConfigurator.getConfigurationContext();
- WorkContext workContext = EasyMock.createNiceMock(WorkContext.class);
- EasyMock.replay(workContext);
Axis2Service axis2Service =
new Axis2Service(serviceName,
contract,
@@ -123,8 +120,7 @@
wireService,
wsBinding,
tomcatHost,
- configurationContext,
- workContext);
+ configurationContext);
axis2Service.setInboundWire(inboundWire);
axis2Service.setOutboundWire(outboundWire);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
