You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2007/02/25 05:57:28 UTC
svn commit: r511443 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/implementation/
core/src/main/java/org/apache/tuscany/core/implementation/java/
core/src/test/java/org/apache/tuscany/core/databinding/impl/ core/sr...
Author: jmarino
Date: Sat Feb 24 20:57:26 2007
New Revision: 511443
URL: http://svn.apache.org/viewvc?view=rev&rev=511443
Log:
simplify atomic components by removing WorkScheduler and ExecutionMonitor
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.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/databinding/impl/PassByValueWirePostProcessorTestCase.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/JavaTargetInvokerMediationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.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/implementation/java/JavaTargetInvokerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/oneway/OneWayWireToJavaInvocationTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.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
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java?view=diff&rev=511443&r1=511442&r2=511443
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java Sat Feb 24 20:57:26 2007
@@ -85,8 +85,6 @@
super(configuration.getName(),
configuration.getProxyService(),
configuration.getWorkContext(),
- configuration.getScheduler(),
- configuration.getMonitor(),
configuration.getInitLevel(),
configuration.getMaxIdleTime(),
configuration.getMaxAge());
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java?view=diff&rev=511443&r1=511442&r2=511443
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoConfiguration.java Sat Feb 24 20:57:26 2007
@@ -26,8 +26,6 @@
import java.util.Map;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.extension.ExecutionMonitor;
-import org.apache.tuscany.spi.services.work.WorkScheduler;
import org.apache.tuscany.spi.wire.ProxyService;
import org.apache.tuscany.core.injection.EventInvoker;
@@ -55,8 +53,6 @@
private Map<String, Member> callbackSites = new HashMap<String, Member>();
private ProxyService proxyService;
private WorkContext workContext;
- private WorkScheduler scheduler;
- private ExecutionMonitor monitor;
private long maxIdleTime = -1;
private long maxAge = -1;
private Class implementationClass;
@@ -195,22 +191,6 @@
public void setWorkContext(WorkContext workContext) {
this.workContext = workContext;
- }
-
- public WorkScheduler getScheduler() {
- return scheduler;
- }
-
- public void setScheduler(WorkScheduler scheduler) {
- this.scheduler = scheduler;
- }
-
- public ExecutionMonitor getMonitor() {
- return monitor;
- }
-
- public void setMonitor(ExecutionMonitor monitor) {
- this.monitor = monitor;
}
public Class getImplementationClass() {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java?view=diff&rev=511443&r1=511442&r2=511443
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java Sat Feb 24 20:57:26 2007
@@ -57,7 +57,7 @@
if (method == null) {
throw new TargetMethodNotFoundException(operation);
}
- return new JavaTargetInvoker(method, this, callbackClass, workContext, monitor);
+ return new JavaTargetInvoker(method, this, callbackClass, workContext);
}
protected <B> ObjectFactory<B> createWireFactory(Class<B> interfaze, Wire wire) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java?view=diff&rev=511443&r1=511442&r2=511443
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java Sat Feb 24 20:57:26 2007
@@ -88,7 +88,6 @@
configuration.setProxyService(proxyService);
configuration.setWorkContext(workContext);
- configuration.setScheduler(workScheduler);
configuration.setImplementationClass(definition.getImplementation().getImplementationClass());
// setup property injection sites
@@ -122,7 +121,6 @@
for (Class<?> clazz : constr.getParameterTypes()) {
configuration.addConstructorParamType(clazz);
}
- configuration.setMonitor(monitor);
configuration.setName(definition.getUri());
handleCallbackSites(componentType, configuration);
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=511443&r1=511442&r2=511443
==============================================================================
--- 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 Feb 24 20:57:26 2007
@@ -28,7 +28,6 @@
import org.apache.tuscany.spi.component.InvalidConversationSequenceException;
import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.extension.ExecutionMonitor;
import org.apache.tuscany.spi.extension.TargetInvokerExtension;
import org.apache.tuscany.spi.model.Scope;
@@ -47,24 +46,17 @@
protected Class callbackClass;
protected boolean stateless;
- public JavaTargetInvoker(Method operation,
- JavaAtomicComponent component,
- Class callbackClass,
- WorkContext context,
- ExecutionMonitor monitor) {
- super(context, monitor);
+ public JavaTargetInvoker(Method operation, JavaAtomicComponent component, Class clazz, WorkContext context) {
+ super(context);
assert operation != null : "Operation method cannot be null";
this.operation = operation;
this.component = component;
stateless = Scope.STATELESS == component.getScope();
- this.callbackClass = callbackClass;
+ this.callbackClass = clazz;
}
- public JavaTargetInvoker(Method operation,
- JavaAtomicComponent component,
- WorkContext context,
- ExecutionMonitor monitor) {
- this(operation, component, null, context, monitor);
+ public JavaTargetInvoker(Method operation, JavaAtomicComponent component, WorkContext context) {
+ this(operation, component, null, context);
}
public Object invokeTarget(final Object payload, final short sequence) throws InvocationTargetException {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java?view=diff&rev=511443&r1=511442&r2=511443
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java Sat Feb 24 20:57:26 2007
@@ -139,7 +139,7 @@
private class FooComponent extends AtomicComponentExtension {
public FooComponent() {
- super(URI.create("foo"), null, null, null, null, 0);
+ super(URI.create("foo"), null, null, 0, -1, -1);
}
public List<Wire> getWires(String name) {
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=511443&r1=511442&r2=511443
==============================================================================
--- 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 Feb 24 20:57:26 2007
@@ -66,7 +66,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, context, monitor);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, context);
Object ret = invoker.invokeTarget("foo", NONE);
assertEquals("foo", ret);
}
@@ -77,7 +77,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(arrayMethod, component, context, monitor);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(arrayMethod, component, context);
String[] args = new String[]{"foo", "bar"};
Object ret = invoker.invokeTarget(new Object[]{args}, NONE);
@@ -94,7 +94,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(nullParamMethod, component, context, monitor);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(nullParamMethod, component, context);
Object ret = invoker.invokeTarget(null, NONE);
String retS = (String) ret;
assertEquals("foo", retS);
@@ -106,7 +106,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(primitiveMethod, component, context, monitor);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(primitiveMethod, component, context);
Object ret = invoker.invokeTarget(new Integer[]{1}, NONE);
Integer retI = (Integer) ret;
assertEquals(1, retI.intValue());
@@ -118,7 +118,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(checkedMethod, component, context, monitor);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(checkedMethod, component, context);
try {
invoker.invokeTarget(null, NONE);
} catch (InvocationTargetException e) {
@@ -137,7 +137,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(runtimeMethod, component, context, monitor);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(runtimeMethod, component, context);
try {
invoker.invokeTarget(null, NONE);
} catch (InvocationTargetException e) {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerMediationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerMediationTestCase.java?view=diff&rev=511443&r1=511442&r2=511443
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerMediationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerMediationTestCase.java Sat Feb 24 20:57:26 2007
@@ -47,7 +47,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(target);
EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(hello, component, null, null, null);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(hello, component, null, null);
assertEquals("foo", invoker.invokeTarget("foo", NONE));
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java?view=diff&rev=511443&r1=511442&r2=511443
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java Sat Feb 24 20:57:26 2007
@@ -72,7 +72,7 @@
EasyMock.replay(context);
Method method = AsyncTarget.class.getMethod("invoke");
method.setAccessible(true);
- JavaTargetInvoker invoker = new JavaTargetInvoker(method, component, context, monitor);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(method, component, context);
invoker.invoke(msg);
EasyMock.verify(target);
EasyMock.verify(component);
@@ -98,7 +98,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, context, monitor);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, context);
Object ret = invoker.invokeTarget("foo", NONE);
assertEquals("foo", ret);
}
@@ -109,7 +109,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(arrayMethod, component, context, monitor);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(arrayMethod, component, context);
String[] args = new String[]{"foo", "bar"};
Object ret = invoker.invokeTarget(new Object[]{args}, NONE);
@@ -126,7 +126,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(nullParamMethod, component, context, monitor);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(nullParamMethod, component, context);
Object ret = invoker.invokeTarget(null, NONE);
String retS = (String) ret;
assertEquals("foo", retS);
@@ -138,7 +138,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(primitiveMethod, component, context, monitor);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(primitiveMethod, component, context);
Object ret = invoker.invokeTarget(new Integer[]{1}, NONE);
Integer retI = (Integer) ret;
assertEquals(1, retI.intValue());
@@ -150,7 +150,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(checkedMethod, component, context, monitor);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(checkedMethod, component, context);
try {
invoker.invokeTarget(null, NONE);
} catch (InvocationTargetException e) {
@@ -169,7 +169,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(runtimeMethod, component, context, monitor);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(runtimeMethod, component, context);
try {
invoker.invokeTarget(null, NONE);
} catch (InvocationTargetException e) {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java?view=diff&rev=511443&r1=511442&r2=511443
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java Sat Feb 24 20:57:26 2007
@@ -42,7 +42,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(foo);
EasyMock.expect(component.getScope()).andReturn(Scope.CONVERSATION);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(Foo.class.getMethod("invoke"), component, null, null, null);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(Foo.class.getMethod("invoke"), component, null, null);
Message msg = new MessageImpl();
msg.setConversationSequence(TargetInvoker.NONE);
invoker.invoke(msg);
@@ -61,7 +61,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(foo);
EasyMock.expect(component.getScope()).andReturn(Scope.CONVERSATION);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(Foo.class.getMethod("invoke"), component, null, null, null);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(Foo.class.getMethod("invoke"), component, null, null);
Message msg = new MessageImpl();
msg.setConversationSequence(TargetInvoker.START);
invoker.invoke(msg);
@@ -80,7 +80,7 @@
EasyMock.expect(component.getAssociatedTargetInstance()).andReturn(foo);
EasyMock.expect(component.getScope()).andReturn(Scope.CONVERSATION);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(Foo.class.getMethod("invoke"), component, null, null, null);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(Foo.class.getMethod("invoke"), component, null, null);
Message msg = new MessageImpl();
msg.setConversationSequence(TargetInvoker.CONTINUE);
invoker.invoke(msg);
@@ -102,7 +102,7 @@
component.removeInstance();
component.destroy(EasyMock.eq(foo));
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(Foo.class.getMethod("invoke"), component, null, null, null);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(Foo.class.getMethod("invoke"), component, null, null);
Message msg = new MessageImpl();
msg.setConversationSequence(TargetInvoker.END);
invoker.invoke(msg);
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=511443&r1=511442&r2=511443
==============================================================================
--- 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 Feb 24 20:57:26 2007
@@ -38,7 +38,7 @@
EasyMock.expect(component.getScope()).andReturn(Scope.STATELESS);
component.destroy(EasyMock.isA(Echo.class));
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, null, null, null);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, null, null);
invoker.setCacheable(false);
assertEquals("foo", invoker.invokeTarget("foo", JavaTargetInvoker.NONE));
EasyMock.verify(component);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerTestCase.java?view=diff&rev=511443&r1=511442&r2=511443
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerTestCase.java Sat Feb 24 20:57:26 2007
@@ -37,7 +37,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(new Echo());
EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
EasyMock.replay(component);
- JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, null, null, null);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, null, null);
invoker.setCacheable(false);
assertEquals("foo", invoker.invokeTarget("foo", JavaTargetInvoker.NONE));
EasyMock.verify(component);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java?view=diff&rev=511443&r1=511442&r2=511443
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java Sat Feb 24 20:57:26 2007
@@ -343,6 +343,5 @@
workContext = new WorkContextImpl();
builder.setWorkContext(workContext);
builder.setProxyService(new JDKProxyService(workContext));
- builder.setWorkScheduler(scheduler);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/oneway/OneWayWireToJavaInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/oneway/OneWayWireToJavaInvocationTestCase.java?view=diff&rev=511443&r1=511442&r2=511443
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/oneway/OneWayWireToJavaInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/oneway/OneWayWireToJavaInvocationTestCase.java Sat Feb 24 20:57:26 2007
@@ -83,7 +83,7 @@
Method method = AsyncTarget.class.getMethod("invoke");
method.setAccessible(true);
ExecutionMonitor monitor = EasyMock.createNiceMock(ExecutionMonitor.class);
- invoker = new JavaTargetInvoker(method, component, context, monitor);
+ invoker = new JavaTargetInvoker(method, component, context);
Operation<Type> operation = new Operation<Type>("invoke", null, null, null, false, null, TargetInvoker.NONE);
ochain = new InvocationChainImpl(operation);
NonBlockingInterceptor bridgeInterceptor = new NonBlockingInterceptor(scheduler, context);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java?view=diff&rev=511443&r1=511442&r2=511443
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java Sat Feb 24 20:57:26 2007
@@ -28,7 +28,6 @@
import org.apache.tuscany.spi.component.TargetInitializationException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.services.work.WorkScheduler;
import org.apache.tuscany.spi.wire.ProxyService;
/**
@@ -41,28 +40,18 @@
protected Scope scope;
protected ProxyService proxyService;
protected WorkContext workContext;
- protected WorkScheduler workScheduler;
- protected ExecutionMonitor monitor;
private final int initLevel;
private final long maxIdleTime;
private final long maxAge;
private boolean allowsPassByReference;
- protected AtomicComponentExtension(URI name,
- ProxyService proxyService,
- WorkContext workContext,
- WorkScheduler workScheduler,
- ExecutionMonitor monitor,
- int initLevel) {
- this(name, proxyService, workContext, workScheduler, monitor, initLevel, -1, -1);
-
+ protected AtomicComponentExtension(URI name, ProxyService proxyService, WorkContext workContext, int initLevel) {
+ this(name, proxyService, workContext, initLevel, -1, -1);
}
protected AtomicComponentExtension(URI name,
ProxyService proxyService,
WorkContext workContext,
- WorkScheduler workScheduler,
- ExecutionMonitor monitor,
int initLevel,
long maxIdleTime,
long maxAge) {
@@ -70,8 +59,6 @@
assert !(maxIdleTime > 0 && maxAge > 0);
this.proxyService = proxyService;
this.workContext = workContext;
- this.workScheduler = workScheduler;
- this.monitor = monitor;
this.initLevel = initLevel;
this.maxIdleTime = maxIdleTime;
this.maxAge = maxAge;
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java?view=diff&rev=511443&r1=511442&r2=511443
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java Sat Feb 24 20:57:26 2007
@@ -28,11 +28,8 @@
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.Implementation;
import org.apache.tuscany.spi.policy.PolicyBuilderRegistry;
-import org.apache.tuscany.spi.services.work.WorkScheduler;
import org.apache.tuscany.spi.wire.ProxyService;
-import org.apache.tuscany.api.annotation.Monitor;
-
/**
* An extension point for component builders. When adding support for new component types, implementations may extend
* this class as a convenience.
@@ -44,10 +41,8 @@
protected BuilderRegistry builderRegistry;
protected ScopeRegistry scopeRegistry;
protected ProxyService proxyService;
- protected WorkScheduler workScheduler;
protected WorkContext workContext;
protected PolicyBuilderRegistry policyBuilderRegistry;
- protected ExecutionMonitor monitor;
@Autowire
public void setBuilderRegistry(BuilderRegistry registry) {
@@ -65,11 +60,6 @@
}
@Autowire
- public void setWorkScheduler(WorkScheduler workScheduler) {
- this.workScheduler = workScheduler;
- }
-
- @Autowire
public void setWorkContext(WorkContext workContext) {
this.workContext = workContext;
}
@@ -77,11 +67,6 @@
@Autowire
public void setPolicyBuilderRegistry(PolicyBuilderRegistry registry) {
policyBuilderRegistry = registry;
- }
-
- @Monitor
- public void setMonitor(ExecutionMonitor monitor) {
- this.monitor = monitor;
}
@Init
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=511443&r1=511442&r2=511443
==============================================================================
--- 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 Feb 24 20:57:26 2007
@@ -34,18 +34,15 @@
*/
public abstract class TargetInvokerExtension implements TargetInvoker {
protected WorkContext workContext;
- protected ExecutionMonitor monitor;
protected boolean cacheable;
/**
* Creates a new invoker
*
* @param workContext the work context to use for setting correlation information
- * @param monitor the event monitor
*/
- public TargetInvokerExtension(WorkContext workContext, ExecutionMonitor monitor) {
+ public TargetInvokerExtension(WorkContext workContext) {
this.workContext = workContext;
- this.monitor = monitor;
}
public Message invoke(Message msg) throws InvocationRuntimeException {
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java?view=diff&rev=511443&r1=511442&r2=511443
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java Sat Feb 24 20:57:26 2007
@@ -64,7 +64,7 @@
private static class TestExtension extends AtomicComponentExtension {
public TestExtension(URI uri) {
- super(uri, null, null, null, null, 0);
+ super(uri, null, null, 0, -1, -1);
}
public TargetInvoker createTargetInvoker(String targetName, Operation operation)
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=511443&r1=511442&r2=511443
==============================================================================
--- 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 Feb 24 20:57:26 2007
@@ -139,7 +139,7 @@
private Target target;
public Invoker(WorkContext workContext, ExecutionMonitor monitor, Target target) {
- super(workContext, monitor);
+ super(workContext);
this.target = target;
}
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=511443&r1=511442&r2=511443
==============================================================================
--- 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 Feb 24 20:57:26 2007
@@ -67,7 +67,7 @@
private Target target;
public Invoker(WorkContext workContext, ExecutionMonitor monitor, Target target) {
- super(workContext, monitor);
+ super(workContext);
this.target = target;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org