You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/03/18 02:29:19 UTC
svn commit: r519501 - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/binding/local/
kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/
kernel/core/src/test/java/org/apache/tuscany/core/implementati...
Author: jboynes
Date: Sat Mar 17 18:29:18 2007
New Revision: 519501
URL: http://svn.apache.org/viewvc?view=rev&rev=519501
Log:
add parameter for passing WorkContext with invocation
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/AbstractLocalTargetInvoker.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/wire/MockStaticInvoker.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/MessageImpl.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvoker.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractInvocationHandlerTestCase.java
incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java
incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/AbstractLocalTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/AbstractLocalTargetInvoker.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/AbstractLocalTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/AbstractLocalTargetInvoker.java Sat Mar 17 18:29:18 2007
@@ -25,6 +25,7 @@
import org.apache.tuscany.spi.wire.InvocationRuntimeException;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.component.WorkContext;
/**
* Base class for dispatching to a composite reference using the local binding
@@ -46,7 +47,7 @@
return isCacheable(); // we only need to check if the scopes are correct
}
- public Object invokeTarget(final Object payload, short sequence) throws InvocationTargetException {
+ public Object invokeTarget(final Object payload, short sequence, WorkContext workContext) throws InvocationTargetException {
throw new InvocationTargetException(new UnsupportedOperationException());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java Sat Mar 17 18:29:18 2007
@@ -55,8 +55,8 @@
stateless = Scope.STATELESS == scopeContainer.getScope();
}
- public Object invokeTarget(final Object payload, final short sequence) throws InvocationTargetException {
- Object contextId = workContext.getIdentifier(scopeContainer.getScope());
+ public Object invokeTarget(final Object payload, final short sequence, WorkContext workContext) throws InvocationTargetException {
+ Object contextId = this.workContext.getIdentifier(scopeContainer.getScope());
try {
InstanceWrapper<?> wrapper = getInstance(sequence, contextId);
Object instance = wrapper.getInstance();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java Sat Mar 17 18:29:18 2007
@@ -84,14 +84,14 @@
public void testObjectInvoke() throws Throwable {
JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, scopeContainer, context);
- Object ret = invoker.invokeTarget("foo", NONE);
+ Object ret = invoker.invokeTarget("foo", NONE, null);
assertEquals("foo", ret);
}
public void testArrayInvoke() throws Throwable {
JavaTargetInvoker invoker = new JavaTargetInvoker(arrayMethod, component, scopeContainer, context);
String[] args = new String[]{"foo", "bar"};
- Object ret = invoker.invokeTarget(new Object[]{args}, NONE);
+ Object ret = invoker.invokeTarget(new Object[]{args}, NONE, null);
String[] retA = (String[]) ret;
assertNotNull(retA);
assertEquals(2, retA.length);
@@ -101,14 +101,14 @@
public void testNullInvoke() throws Throwable {
JavaTargetInvoker invoker = new JavaTargetInvoker(nullParamMethod, component, scopeContainer, context);
- Object ret = invoker.invokeTarget(null, NONE);
+ Object ret = invoker.invokeTarget(null, NONE, null);
String retS = (String) ret;
assertEquals("foo", retS);
}
public void testPrimitiveInvoke() throws Throwable {
JavaTargetInvoker invoker = new JavaTargetInvoker(primitiveMethod, component, scopeContainer, context);
- Object ret = invoker.invokeTarget(new Integer[]{1}, NONE);
+ Object ret = invoker.invokeTarget(new Integer[]{1}, NONE, null);
Integer retI = (Integer) ret;
assertEquals(1, retI.intValue());
}
@@ -116,7 +116,7 @@
public void testInvokeCheckedException() throws Throwable {
JavaTargetInvoker invoker = new JavaTargetInvoker(checkedMethod, component, scopeContainer, context);
try {
- invoker.invokeTarget(null, NONE);
+ invoker.invokeTarget(null, NONE, null);
fail(TestException.class.getName() + " should have been thrown");
} catch (InvocationTargetException e) {
assertTrue(e.getCause() instanceof TestException);
@@ -126,7 +126,7 @@
public void testInvokeRuntimeException() throws Throwable {
JavaTargetInvoker invoker = new JavaTargetInvoker(runtimeMethod, component, scopeContainer, context);
try {
- invoker.invokeTarget(null, NONE);
+ invoker.invokeTarget(null, NONE, null);
fail(TestException.class.getName() + " should have been thrown");
} catch (InvocationTargetException e) {
assertTrue(e.getCause() instanceof TestRuntimeException);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java Sat Mar 17 18:29:18 2007
@@ -44,7 +44,7 @@
EasyMock.replay(wrapper);
JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, scopeContainer, workContext);
invoker.setCacheable(false);
- assertEquals("foo", invoker.invokeTarget("foo", JavaTargetInvoker.NONE));
+ assertEquals("foo", invoker.invokeTarget("foo", JavaTargetInvoker.NONE, null));
EasyMock.verify(component);
EasyMock.verify(scopeContainer);
EasyMock.verify(wrapper);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/wire/MockStaticInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/wire/MockStaticInvoker.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/wire/MockStaticInvoker.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/wire/MockStaticInvoker.java Sat Mar 17 18:29:18 2007
@@ -25,6 +25,7 @@
import org.apache.tuscany.spi.wire.InvocationRuntimeException;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.component.WorkContext;
/**
* Caches component instances that do not need to be resolved for every wire, e.g. an wire originating from a lesser
@@ -56,7 +57,7 @@
return isCacheable();
}
- public Object invokeTarget(final Object payload, final short sequence) throws InvocationTargetException {
+ public Object invokeTarget(final Object payload, final short sequence, WorkContext workContext) throws InvocationTargetException {
try {
if (payload != null && !payload.getClass().isArray()) {
return operation.invoke(instance, payload);
@@ -70,7 +71,7 @@
public Message invoke(Message msg) throws InvocationRuntimeException {
try {
- Object resp = invokeTarget(msg.getBody(), TargetInvoker.NONE);
+ Object resp = invokeTarget(msg.getBody(), TargetInvoker.NONE, null);
msg.setBody(resp);
} catch (InvocationTargetException e) {
msg.setBodyWithFault(e.getCause());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java Sat Mar 17 18:29:18 2007
@@ -55,14 +55,14 @@
wire.setSourceContract(contract);
wire.setSourceUri(URI.create("foo#bar"));
TargetInvoker targetInvoker = EasyMock.createMock(TargetInvoker.class);
- EasyMock.expect(targetInvoker.invokeTarget(EasyMock.isNull(), EasyMock.eq(TargetInvoker.NONE)))
- .andReturn(new MessageImpl());
+ MessageImpl response = new MessageImpl();
+ EasyMock.expect(targetInvoker.invokeTarget(null, TargetInvoker.NONE, null)).andReturn(response);
EasyMock.expect(targetInvoker.isCacheable()).andReturn(false);
EasyMock.replay(targetInvoker);
wire.getInvocationChains().values().iterator().next().setTargetInvoker(targetInvoker);
JDKInvocationHandler handler = new JDKInvocationHandler(Client.class, wire, null);
- handler.invoke(null, clientHello, null);
+ assertSame(response, handler.invoke(null, clientHello, null));
EasyMock.verify(targetInvoker);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java Sat Mar 17 18:29:18 2007
@@ -125,7 +125,7 @@
currentConversationID = id;
}
- public Object invokeTarget(final Object payload, final short sequence) throws InvocationTargetException {
+ public Object invokeTarget(final Object payload, final short sequence, WorkContext workContext) throws InvocationTargetException {
assertEquals("bar", Array.get(payload, 0));
String convID = (String) wc.getIdentifier(Scope.CONVERSATION);
assertSame(convID, currentConversationID);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java Sat Mar 17 18:29:18 2007
@@ -55,7 +55,7 @@
if (callbackRoutingChain != null) {
workContext.setCallbackUris(callbackRoutingChain);
}
- Object resp = invokeTarget(msg.getBody(), msg.getConversationSequence());
+ Object resp = invokeTarget(msg.getBody(), msg.getConversationSequence(), null);
msg.setBody(resp);
} catch (InvocationTargetException e) {
msg.setBodyWithFault(e.getCause());
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java Sat Mar 17 18:29:18 2007
@@ -61,7 +61,7 @@
String name = chain.getOperation().getName();
throw new AssertionError("No target invoker [" + name + "]");
}
- return targetInvoker.invokeTarget(args, TargetInvoker.NONE);
+ return targetInvoker.invokeTarget(args, TargetInvoker.NONE, null);
} catch (InvocationTargetException e) {
// the cause was thrown by the target so throw it
throw e.getCause();
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/MessageImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/MessageImpl.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/MessageImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/MessageImpl.java Sat Mar 17 18:29:18 2007
@@ -39,6 +39,12 @@
private short conversationSequence;
private WorkContext workContext;
+ public MessageImpl(WorkContext workContext, short conversationSequence, Object body) {
+ this.workContext = workContext;
+ this.conversationSequence = conversationSequence;
+ this.body = body;
+ }
+
public MessageImpl() {
}
@@ -59,6 +65,14 @@
this.workContext = workContext;
}
+ public short getConversationSequence() {
+ return conversationSequence;
+ }
+
+ public void setConversationSequence(short conversationSequence) {
+ this.conversationSequence = conversationSequence;
+ }
+
public void setTargetInvoker(TargetInvoker invoker) {
this.invoker = invoker;
}
@@ -128,13 +142,5 @@
public void setInvoker(TargetInvoker invoker) {
this.invoker = invoker;
- }
-
- public short getConversationSequence() {
- return conversationSequence;
- }
-
- public void setConversationSequence(short conversationSequence) {
- this.conversationSequence = conversationSequence;
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvoker.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvoker.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvoker.java Sat Mar 17 18:29:18 2007
@@ -20,6 +20,8 @@
import java.lang.reflect.InvocationTargetException;
+import org.apache.tuscany.spi.component.WorkContext;
+
/**
* Implementations are responsible for resolving a target and performing the actual invocation on it, for example, a
* component implementation instance or a service client.
@@ -41,13 +43,16 @@
* Invokes an operation on a target with the given payload. Used in optmized cases where messages do not need to be
* flowed such as in non-proxied wires.
*
- * @param payload the invocation payload, typically an array of parameters
- * @param sequence if the invocation is part of a conversation, the sequence. Valid values are {@link #NONE} for
- * non-conversational, {@link #START} to begin a conversation, {@link #CONTINUE} to continue a
- * conversation, or {@link #END} to end a conversation
- * @throws InvocationTargetException
+ * @param payload the invocation payload, typically an array of parameters
+ * @param sequence if the invocation is part of a conversation, the sequence. Valid values are {@link #NONE} for
+ * non-conversational, {@link #START} to begin a conversation, {@link #CONTINUE} to continue a
+ * conversation, or {@link #END} to end a conversation
+ * @param workContext work context associated with this invocation
+ * @return the result of the invocation
+ * @throws InvocationTargetException if there was a problem invoking the target
*/
- Object invokeTarget(final Object payload, final short sequence) throws InvocationTargetException;
+ Object invokeTarget(final Object payload, final short sequence, WorkContext workContext)
+ throws InvocationTargetException;
/**
* Invokes an operation on a target with the given message
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java Sat Mar 17 18:29:18 2007
@@ -143,7 +143,7 @@
this.target = target;
}
- public Object invokeTarget(final Object payload, final short sequence) throws InvocationTargetException {
+ public Object invokeTarget(final Object payload, final short sequence, WorkContext workContext) throws InvocationTargetException {
if (sequence == NONE) {
target.invokeNone((String) payload);
} else if (sequence == START) {
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java Sat Mar 17 18:29:18 2007
@@ -71,7 +71,7 @@
this.target = target;
}
- public Object invokeTarget(final Object payload, final short sequence) throws InvocationTargetException {
+ public Object invokeTarget(final Object payload, final short sequence, WorkContext workContext) throws InvocationTargetException {
target.invoke((String) payload);
return null;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractInvocationHandlerTestCase.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractInvocationHandlerTestCase.java Sat Mar 17 18:29:18 2007
@@ -26,6 +26,8 @@
import junit.framework.TestCase;
import org.easymock.EasyMock;
+import org.apache.tuscany.spi.component.WorkContext;
+
/**
* @version $Rev$ $Date$
*/
@@ -57,7 +59,7 @@
private class MockInvoker implements TargetInvoker {
- public Object invokeTarget(final Object payload, final short sequence) throws InvocationTargetException {
+ public Object invokeTarget(final Object payload, final short sequence, WorkContext workContext) throws InvocationTargetException {
assertEquals("foo", Array.get(payload, 0));
return "response";
}
Modified: incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java (original)
+++ incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java Sat Mar 17 18:29:18 2007
@@ -74,7 +74,7 @@
TargetInvoker targetInvoker = testComponent.createTargetInvoker("testService", operation);
getWorkContext().setIdentifier(Scope.COMPOSITE, contextId);
try {
- targetInvoker.invokeTarget(null, TargetInvoker.NONE);
+ targetInvoker.invokeTarget(null, TargetInvoker.NONE, null);
} finally {
getWorkContext().setIdentifier(Scope.COMPOSITE, null);
}
Modified: incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java?view=diff&rev=519501&r1=519500&r2=519501
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java Sat Mar 17 18:29:18 2007
@@ -24,10 +24,16 @@
import java.util.Collection;
import java.util.Map;
+import org.apache.tuscany.api.annotation.LogLevel;
+import org.apache.tuscany.core.monitor.JavaLoggingMonitorFactory;
+import org.apache.tuscany.core.runtime.AbstractRuntime;
+import org.apache.tuscany.runtime.standalone.StandaloneRuntime;
+import org.apache.tuscany.runtime.standalone.StandaloneRuntimeInfo;
+import org.apache.tuscany.runtime.standalone.host.implementation.launched.Launched;
import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.TargetInvokerCreationException;
-import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.spi.implementation.java.JavaMappedService;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.model.ComponentDefinition;
@@ -38,13 +44,6 @@
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.core.monitor.JavaLoggingMonitorFactory;
-import org.apache.tuscany.core.runtime.AbstractRuntime;
-import org.apache.tuscany.runtime.standalone.StandaloneRuntime;
-import org.apache.tuscany.runtime.standalone.StandaloneRuntimeInfo;
-import org.apache.tuscany.runtime.standalone.host.implementation.launched.Launched;
-import org.apache.tuscany.api.annotation.LogLevel;
-
/**
* @version $Rev$ $Date$
*/
@@ -123,7 +122,7 @@
Operation<?> operation = testService.getServiceContract().getOperations().get("main");
Component component = getComponentManager().getComponent(componentUri);
TargetInvoker targetInvoker = component.createTargetInvoker("main", operation);
- Object result = targetInvoker.invokeTarget(new Object[]{args}, TargetInvoker.NONE);
+ Object result = targetInvoker.invokeTarget(new Object[]{args}, TargetInvoker.NONE, null);
try {
return int.class.cast(result);
} catch (ClassCastException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org