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 2006/10/26 16:34:01 UTC

svn commit: r468018 [1/2] - in /incubator/tuscany/java/sca: kernel/core/src/main/java/org/apache/tuscany/core/builder/ kernel/core/src/main/java/org/apache/tuscany/core/implementation/ kernel/core/src/main/java/org/apache/tuscany/core/implementation/co...

Author: jmarino
Date: Thu Oct 26 07:33:58 2006
New Revision: 468018

URL: http://svn.apache.org/viewvc?view=rev&rev=468018
Log:
remove need for non blocking variant of TargetInvoker and Component.createAsyncTargetInvoker since thread dispatching now down in a bridging interceptor; TargetInvoker now handles both non-blocking and synchronous calls; note that the async variant of TargetInvokers still needs to be removed from References

Added:
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java   (with props)
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java   (with props)
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/MediationTestCase.java   (contents, props changed)
      - copied, changed from r467627, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/MediationTestCase.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ExecutionMonitor.java   (contents, props changed)
      - copied, changed from r467627, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/AsyncMonitor.java
    incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java   (with props)
Removed:
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/AsyncJavaTargetInvoker.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/AsyncMonitor.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/PojoTargetInvoker.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/StaticPojoTargetInvoker.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/MediationTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/StaticPojoInvokerTestCase.java
    incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/AsyncGroovyInvoker.java
    incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/AsyncMonitor.java
Modified:
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
    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/composite/AbstractCompositeComponent.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/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/AsyncJavaTargetInvokerTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/GetServiceByNameTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.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/component/OneWayWireInvocationTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OutboundWireToJavaTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/mock/MockFactory.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.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/CompositeComponentExtension.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.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/AbstractInboundInvocationHandler.java
    incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java
    incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIInvoker.java
    incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
    incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
    incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyConfiguration.java
    incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyInvoker.java
    incubator/tuscany/java/sca/services/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/AsyncInvokerTestCase.java
    incubator/tuscany/java/sca/services/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ImplementationLoaderTestCase.java
    incubator/tuscany/java/sca/services/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
    incubator/tuscany/java/sca/services/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
    incubator/tuscany/java/sca/services/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
    incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java
    incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java
    incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptInvoker.java
    incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java
    incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java
    incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java
    incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyInvoker.java
    incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java
    incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/AsyncInvoker.java
    incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponent.java
    incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperInvoker.java
    incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/AsyncInvokerTestCase.java
    incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentTestCase.java
    incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java
    incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponent.java
    incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java Thu Oct 26 07:33:58 2006
@@ -111,7 +111,7 @@
                 for (InboundInvocationChain chain : inboundWire.getInvocationChains().values()) {
                     Operation<?> operation = chain.getOperation();
                     String serviceName = inboundWire.getServiceName();
-                    TargetInvoker invoker = sourceComponent.createTargetInvoker(serviceName, operation);
+                    TargetInvoker invoker = sourceComponent.createTargetInvoker(serviceName, operation, null);
                     chain.setTargetInvoker(invoker);
                     chain.prepare();
                 }
@@ -132,7 +132,7 @@
             OutboundWire outboundWire = reference.getOutboundWire();
             // connect the reference's inbound and outbound wires
             connect(inboundWire, outboundWire, true);
-            
+
             if (reference instanceof CompositeReference) {
                 // For a composite reference only, since its outbound wire comes
                 // from its parent composite,
@@ -141,8 +141,8 @@
                 parent = parent.getParent();
                 assert parent != null : "Parent of parent was null";
                 SCAObject target = parent.getChild(outboundWire.getTargetName().getPartName());
-                connect((Component)parent, outboundWire, target);
-            }            
+                connect((Component) parent, outboundWire, target);
+            }
         } else if (source instanceof Service) {
             Service service = (Service) source;
             InboundWire inboundWire = service.getInboundWire();
@@ -239,12 +239,8 @@
             TargetInvoker invoker = null;
             if (target instanceof Component) {
                 Component component = (Component) target;
-                if (isOneWayOperation || operationHasCallback) {
-                    invoker = component.createAsyncTargetInvoker(targetWire, inboundOperation);
-                } else {
-                    String portName = sourceWire.getTargetName().getPortName();
-                    invoker = component.createTargetInvoker(portName, inboundOperation);
-                }
+                String portName = sourceWire.getTargetName().getPortName();
+                invoker = component.createTargetInvoker(portName, inboundOperation, targetWire);
             } else if (target instanceof Reference) {
                 Reference reference = (Reference) target;
                 if (!(reference instanceof CompositeReference) && operationHasCallback) {
@@ -292,14 +288,14 @@
                 e.setIdentifier(sourceWire.getReferenceName());
                 throw e;
             }
-            
+
             Operation targetOp =
-                (Operation)targetWire.getServiceContract().getCallbackOperations().get(operation.getName());
+                (Operation) targetWire.getServiceContract().getCallbackOperations().get(operation.getName());
             OutboundInvocationChain outboundChain = wireService.createOutboundChain(targetOp);
             targetWire.addSourceCallbackInvocationChain(source.getName(), targetOp, outboundChain);
             if (source instanceof Component) {
                 Component component = (Component) source;
-                TargetInvoker invoker = component.createTargetInvoker(null, operation);
+                TargetInvoker invoker = component.createTargetInvoker(null, operation, null);
                 connect(outboundChain, inboundChain, invoker, false);
             } else if (source instanceof CompositeReference) {
                 CompositeReference compRef = (CompositeReference) source;
@@ -358,7 +354,7 @@
         sourceChain.addInterceptor(new SynchronousBridgingInterceptor(targetChain.getHeadInterceptor()));
     }
 
-       /**
+    /**
      * Connects an component's outbound wire to its target in a composite.  Valid targets are either
      * <code>AtomicComponent</code>s contained in the composite, or <code>References</code> of the composite.
      *

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=468018&r1=468017&r2=468018
==============================================================================
--- 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 Thu Oct 26 07:33:58 2006
@@ -68,6 +68,7 @@
             configuration.getWireService(),
             configuration.getWorkContext(),
             configuration.getScheduler(),
+            configuration.getMonitor(),
             configuration.getInitLevel());
         assert configuration.getInstanceFactory() != null : "Object factory was null";
         initInvoker = configuration.getInitInvoker();

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=468018&r1=468017&r2=468018
==============================================================================
--- 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 Thu Oct 26 07:33:58 2006
@@ -29,6 +29,7 @@
 import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.services.work.WorkScheduler;
 import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.extension.ExecutionMonitor;
 
 import org.apache.tuscany.core.injection.EventInvoker;
 import org.apache.tuscany.core.injection.Injector;
@@ -56,6 +57,7 @@
     private WireService wireService;
     private WorkContext workContext;
     private WorkScheduler scheduler;
+    private ExecutionMonitor monitor;
 
     public CompositeComponent getParent() {
         return parent;
@@ -181,4 +183,11 @@
         this.scheduler = scheduler;
     }
 
+    public ExecutionMonitor getMonitor() {
+        return monitor;
+    }
+
+    public void setMonitor(ExecutionMonitor monitor) {
+        this.monitor = monitor;
+    }
 }

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java Thu Oct 26 07:33:58 2006
@@ -139,14 +139,9 @@
         super.publish(event);
     }
 
-    public TargetInvoker createTargetInvoker(String targetName, Operation operation) {
+    public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
         return null;
     }
-
-    public TargetInvoker createAsyncTargetInvoker(InboundWire wire, Operation operation) {
-        return null;
-    }
-
 
     /**
      * Blocks until the module context has been initialized

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=468018&r1=468017&r2=468018
==============================================================================
--- 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 Thu Oct 26 07:33:58 2006
@@ -25,6 +25,7 @@
 import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.spi.component.TargetException;
 import org.apache.tuscany.spi.component.TargetNotFoundException;
+import org.apache.tuscany.spi.extension.ExecutionMonitor;
 import static org.apache.tuscany.spi.idl.java.JavaIDLUtils.findMethod;
 import org.apache.tuscany.spi.model.Operation;
 import org.apache.tuscany.spi.model.ServiceContract;
@@ -48,14 +49,11 @@
  */
 public class JavaAtomicComponent extends PojoAtomicComponent {
 
-    private AsyncMonitor monitor;
+    private ExecutionMonitor monitor;
 
-    public JavaAtomicComponent(String name,
-                               PojoConfiguration configuration,
-                               AsyncMonitor monitor) {
+    public JavaAtomicComponent(String name, PojoConfiguration configuration) {
         super(name, configuration);
         this.scope = configuration.getScopeContainer().getScope();
-        this.monitor = monitor;
     }
 
     public Object getServiceInstance(String name) throws TargetException {
@@ -78,7 +76,7 @@
         }
     }
 
-    public TargetInvoker createTargetInvoker(String targetName, Operation operation) {
+    public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
         Method[] methods;
         if (operation.isCallback()) {
             methods = operation.getServiceContract().getCallbackClass().getMethods();
@@ -87,19 +85,19 @@
             methods = operation.getServiceContract().getInterfaceClass().getMethods();
         }
         Method method = findMethod(operation, methods);
-        return new JavaTargetInvoker(method, this);
+        return new JavaTargetInvoker(method, this, callbackWire, workContext, monitor);
     }
 
-    public TargetInvoker createAsyncTargetInvoker(InboundWire wire, Operation operation) {
-        Method method;
-        if (operation.isCallback()) {
-            method = findMethod(operation, operation.getServiceContract().getCallbackClass().getMethods());
-
-        } else {
-            method = findMethod(operation, operation.getServiceContract().getInterfaceClass().getMethods());
-        }
-        return new AsyncJavaTargetInvoker(method, wire, this, monitor, workContext);
-    }
+//    public TargetInvoker createAsyncTargetInvoker(InboundWire wire, Operation operation) {
+//        Method method;
+//        if (operation.isCallback()) {
+//            method = findMethod(operation, operation.getServiceContract().getCallbackClass().getMethods());
+//
+//        } else {
+//            method = findMethod(operation, operation.getServiceContract().getInterfaceClass().getMethods());
+//        }
+//        return new AsyncJavaTargetInvoker(method, wire, this, monitor, workContext);
+//    }
 
     protected void onServiceWire(InboundWire wire) {
         String name = wire.getCallbackReferenceName();

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=468018&r1=468017&r2=468018
==============================================================================
--- 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 Thu Oct 26 07:33:58 2006
@@ -25,7 +25,6 @@
 import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.spi.implementation.java.JavaMappedService;
 
-import org.apache.tuscany.api.annotation.Monitor;
 import org.apache.tuscany.spi.builder.BuilderConfigException;
 import org.apache.tuscany.spi.component.AtomicComponent;
 import org.apache.tuscany.spi.component.CompositeComponent;
@@ -51,13 +50,6 @@
  */
 public class JavaComponentBuilder extends ComponentBuilderExtension<JavaImplementation> {
 
-    private AsyncMonitor monitor;
-
-    @Monitor
-    public void setMonitor(AsyncMonitor monitor) {
-        this.monitor = monitor;
-    }
-
     @SuppressWarnings("unchecked")
     public AtomicComponent build(CompositeComponent parent,
                                     ComponentDefinition<JavaImplementation> definition,
@@ -111,9 +103,8 @@
         PojoObjectFactory<?> instanceFactory = new PojoObjectFactory(constr);
         configuration.setInstanceFactory(instanceFactory);
         configuration.getConstructorParamNames().addAll(ctorDef.getInjectionNames());
-
-        JavaAtomicComponent component =
-            new JavaAtomicComponent(definition.getName(), configuration, monitor);
+        configuration.setMonitor(monitor);
+        JavaAtomicComponent component = new JavaAtomicComponent(definition.getName(), configuration);
 
         // handle properties
         for (PropertyValue<?> property : definition.getPropertyValues().values()) {

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=468018&r1=468017&r2=468018
==============================================================================
--- 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 Thu Oct 26 07:33:58 2006
@@ -18,34 +18,74 @@
  */
 package org.apache.tuscany.core.implementation.java;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Set;
 
 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.wire.InboundWire;
+import org.apache.tuscany.spi.wire.InvocationRuntimeException;
 
-import org.apache.tuscany.core.wire.PojoTargetInvoker;
+import static org.apache.tuscany.core.util.JavaIntrospectionHelper.findClosestMatchingMethod;
+import static org.apache.tuscany.core.util.JavaIntrospectionHelper.getAllUniquePublicProtectedMethods;
 
 /**
- * Uses a component to resolve an implementation instance based on the current thread component
+ * Responsible for synchronously dispatching an invocation to a Java component implementation instance
  *
  * @version $Rev$ $Date$
  */
-public class JavaTargetInvoker extends PojoTargetInvoker {
+public class JavaTargetInvoker extends TargetInvokerExtension {
 
-    private JavaAtomicComponent component;
-    private Object target;
-
-    /**
-     * Creates a new invoker
-     *
-     * @param operation the operation the invoker is associated with
-     * @param component the target component
-     */
-    public JavaTargetInvoker(Method operation, JavaAtomicComponent component) {
-        super(operation);
-        assert component != null : "No atomic component specified";
+    protected Method operation;
+    protected JavaAtomicComponent component;
+    protected Object target;
+
+    public JavaTargetInvoker(Method operation,
+                             JavaAtomicComponent component,
+                             InboundWire wire,
+                             WorkContext context,
+                             ExecutionMonitor monitor) {
+        super(wire, context, monitor);
+        assert operation != null : "Operation method cannot be null";
+        this.operation = operation;
         this.component = component;
     }
 
+    public Object invokeTarget(final Object payload) throws InvocationTargetException {
+        try {
+            Object instance = getInstance();
+            if (!operation.getDeclaringClass().isInstance(instance)) {
+                Set<Method> methods = getAllUniquePublicProtectedMethods(instance.getClass());
+                Method newOperation = findClosestMatchingMethod(operation.getName(),
+                    operation.getParameterTypes(), methods);
+                if (newOperation != null) {
+                    operation = newOperation;
+                }
+            }
+            if (payload != null && !payload.getClass().isArray()) {
+                return operation.invoke(instance, payload);
+            } else {
+                return operation.invoke(instance, (Object[]) payload);
+            }
+        } catch (IllegalAccessException e) {
+            throw new InvocationRuntimeException(e);
+        }
+    }
+
+    @Override
+    public JavaTargetInvoker clone() throws CloneNotSupportedException {
+        try {
+            JavaTargetInvoker invoker = (JavaTargetInvoker) super.clone();
+            invoker.target = null;
+            return invoker;
+        } catch (CloneNotSupportedException e) {
+            return null; // will not happen
+        }
+    }
+
     /**
      * Resolves the target service instance or returns a cached one
      */
@@ -60,11 +100,5 @@
         }
     }
 
-    public JavaTargetInvoker clone() throws CloneNotSupportedException {
-        JavaTargetInvoker invoker = (JavaTargetInvoker) super.clone();
-        invoker.target = null;
-        invoker.cacheable = this.cacheable;
-        invoker.component = this.component;
-        return invoker;
-    }
+
 }

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentImpl.java Thu Oct 26 07:33:58 2006
@@ -25,6 +25,7 @@
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.RuntimeWire;
 import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.InboundWire;
 
 import org.apache.tuscany.core.implementation.PojoAtomicComponent;
 import org.apache.tuscany.core.implementation.PojoConfiguration;
@@ -50,7 +51,7 @@
         return getTargetInstance();
     }
 
-    public TargetInvoker createTargetInvoker(String targetName, Operation operation) {
+    public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
         return null;
     }
 

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemSingletonAtomicComponent.java Thu Oct 26 07:33:58 2006
@@ -117,11 +117,7 @@
     }
 
 
-    public TargetInvoker createTargetInvoker(String targetName, Operation operation) {
-        return null;
-    }
-
-    public TargetInvoker createAsyncTargetInvoker(InboundWire wire, Operation operation) {
+    public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
         return null;
     }
 

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java Thu Oct 26 07:33:58 2006
@@ -121,7 +121,7 @@
         EasyMock.expect(target.isSystem()).andReturn(false).atLeastOnce();
         target.getInboundWire(EasyMock.eq("FooService"));
         EasyMock.expectLastCall().andReturn(targetWire).atLeastOnce();
-        target.createTargetInvoker(EasyMock.eq("FooService"), EasyMock.eq(operation));
+        target.createTargetInvoker(EasyMock.eq("FooService"), EasyMock.eq(operation), EasyMock.eq(targetWire));
         EasyMock.expectLastCall().andReturn(null);
         EasyMock.replay(target);
 
@@ -209,7 +209,7 @@
         EasyMock.expect(target.getScope()).andReturn(Scope.MODULE);
         target.getInboundWire(EasyMock.eq("FooService"));
         EasyMock.expectLastCall().andReturn(targetWire);
-        target.createTargetInvoker(EasyMock.eq("FooService"), EasyMock.eq(operation));
+        target.createTargetInvoker(EasyMock.eq("FooService"), EasyMock.eq(operation), EasyMock.eq(targetWire));
         EasyMock.expectLastCall().andReturn(null);
         EasyMock.replay(target);
 
@@ -290,7 +290,7 @@
         EasyMock.expectLastCall().andReturn(Collections.emptyMap());
         source.getInboundWires();
         EasyMock.expectLastCall().andReturn(wires);
-        source.createTargetInvoker(EasyMock.eq("FooService"), EasyMock.eq(operation));
+        source.createTargetInvoker(EasyMock.eq("FooService"), EasyMock.eq(operation), (InboundWire) EasyMock.isNull());
         EasyMock.expectLastCall().andReturn(null);
         EasyMock.replay(source);
 

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/AsyncJavaTargetInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/AsyncJavaTargetInvokerTestCase.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/AsyncJavaTargetInvokerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/AsyncJavaTargetInvokerTestCase.java Thu Oct 26 07:33:58 2006
@@ -21,6 +21,7 @@
 import java.lang.reflect.Method;
 
 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.InboundWire;
 import org.apache.tuscany.spi.wire.Message;
@@ -42,39 +43,13 @@
  */
 public class AsyncJavaTargetInvokerTestCase extends TestCase {
 
-    public void testInvoke() throws Exception {
-        AsyncTarget target = createMock(AsyncTarget.class);
-        target.invoke();
-        expectLastCall().once();
-        replay(target);
-        JavaAtomicComponent component = createJavaComponent(target);
-        AsyncMonitor monitor = createMock(AsyncMonitor.class);
-        replay(monitor);
-
-        Message msg = new MessageImpl();
-        Object id = new Object();
-        msg.setMessageId(id);
-
-        WorkContext context = createMock(WorkContext.class);
-        context.setCurrentMessageId(null);
-        context.setCurrentCorrelationId(id);
-        replay(context);
-        Method method = AsyncTarget.class.getMethod("invoke");
-        method.setAccessible(true);
-        InboundWire wire = createMock(InboundWire.class);
-        AsyncJavaTargetInvoker invoker =
-            new AsyncJavaTargetInvoker(method, wire, component, monitor, context);
-        invoker.invoke(msg);
-        verify(target);
-    }
-
     public void testClone() throws Exception {
         AsyncTarget target = createMock(AsyncTarget.class);
         target.invoke();
         expectLastCall().once();
         replay(target);
         JavaAtomicComponent component = createJavaComponent(target);
-        AsyncMonitor monitor = createMock(AsyncMonitor.class);
+        ExecutionMonitor monitor = createMock(ExecutionMonitor.class);
         replay(monitor);
         WorkScheduler scheduler = createMock(WorkScheduler.class);
         scheduler.scheduleWork(isA(Runnable.class));
@@ -90,9 +65,8 @@
         InboundWire wire = createMock(InboundWire.class);
         Method method = AsyncTarget.class.getMethod("invoke");
         method.setAccessible(true);
-        AsyncJavaTargetInvoker invoker =
-            new AsyncJavaTargetInvoker(method, wire, component, monitor, context);
-        AsyncJavaTargetInvoker clone = invoker.clone();
+        JavaTargetInvoker invoker = new JavaTargetInvoker(method, component, wire, context, monitor);
+        JavaTargetInvoker clone = invoker.clone();
         Message msg = new MessageImpl();
         clone.invoke(msg);
         verify(target);

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/GetServiceByNameTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/GetServiceByNameTestCase.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/GetServiceByNameTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/GetServiceByNameTestCase.java Thu Oct 26 07:33:58 2006
@@ -54,7 +54,7 @@
         configuration.setInstanceFactory(new PojoObjectFactory<TargetImpl>(TargetImpl.class.getConstructor()));
         configuration.addServiceInterface(Target.class);
         configuration.setWireService(new JDKWireService());
-        final JavaAtomicComponent component = new JavaAtomicComponent("target", configuration, null);
+        final JavaAtomicComponent component = new JavaAtomicComponent("target", configuration);
 
         InboundWire wire = createMock(InboundWire.class);
 

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java Thu Oct 26 07:33:58 2006
@@ -73,7 +73,7 @@
         }).atLeastOnce();
         EasyMock.replay(service);
         configuration.setWireService(service);
-        JavaAtomicComponent sourceContext = new JavaAtomicComponent("source", configuration, null);
+        JavaAtomicComponent sourceContext = new JavaAtomicComponent("source", configuration);
         sourceContext.addOutboundWire(wire);
         sourceContext.start();
         Source source = (Source) sourceContext.getServiceInstance();

Added: 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=auto&rev=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java Thu Oct 26 07:33:58 2006
@@ -0,0 +1,183 @@
+/*
+ * 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.core.implementation.java;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.extension.ExecutionMonitor;
+import org.apache.tuscany.spi.wire.InboundWire;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+import org.easymock.classextension.EasyMock;
+
+public class JavaTargetInvokerBasicInvocationTestCase extends TestCase {
+
+    private Method echoMethod;
+    private Method arrayMethod;
+    private Method nullParamMethod;
+    private Method primitiveMethod;
+    private Method checkedMethod;
+    private Method runtimeMethod;
+    private InboundWire wire;
+    private WorkContext context;
+    private ExecutionMonitor monitor;
+
+
+    public JavaTargetInvokerBasicInvocationTestCase(String arg0) {
+        super(arg0);
+    }
+
+    public void setUp() throws Exception {
+        echoMethod = TestBean.class.getDeclaredMethod("echo", String.class);
+        arrayMethod = TestBean.class.getDeclaredMethod("arrayEcho", String[].class);
+        nullParamMethod = TestBean.class.getDeclaredMethod("nullParam", (Class[]) null);
+        primitiveMethod = TestBean.class.getDeclaredMethod("primitiveEcho", Integer.TYPE);
+        checkedMethod = TestBean.class.getDeclaredMethod("checkedException", (Class[]) null);
+        runtimeMethod = TestBean.class.getDeclaredMethod("runtimeException", (Class[]) null);
+        wire = EasyMock.createNiceMock(InboundWire.class);
+        context = EasyMock.createNiceMock(WorkContext.class);
+        monitor = EasyMock.createNiceMock(ExecutionMonitor.class);
+        assertNotNull(echoMethod);
+        assertNotNull(checkedMethod);
+        assertNotNull(runtimeMethod);
+    }
+
+    public void testObjectInvoke() throws Throwable {
+        TestBean bean = new TestBean();
+        JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.replay(component);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, wire, context, monitor);
+        Object ret = invoker.invokeTarget("foo");
+        Assert.assertEquals("foo", ret);
+    }
+
+    public void testArrayInvoke() throws Throwable {
+        TestBean bean = new TestBean();
+        JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.replay(component);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(arrayMethod, component, wire, context, monitor);
+
+        String[] args = new String[]{"foo", "bar"};
+        Object ret = invoker.invokeTarget(new Object[]{args});
+        String[] retA = (String[]) ret;
+        Assert.assertNotNull(retA);
+        Assert.assertEquals(2, retA.length);
+        Assert.assertEquals("foo", retA[0]);
+        Assert.assertEquals("bar", retA[1]);
+    }
+
+    public void testNullInvoke() throws Throwable {
+        TestBean bean = new TestBean();
+        JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.replay(component);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(nullParamMethod, component, wire, context, monitor);
+        Object ret = invoker.invokeTarget(null);
+        String retS = (String) ret;
+        Assert.assertEquals("foo", retS);
+    }
+
+    public void testPrimitiveInvoke() throws Throwable {
+        TestBean bean = new TestBean();
+        JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.replay(component);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(primitiveMethod, component, wire, context, monitor);
+        Object ret = invoker.invokeTarget(new Integer[]{1});
+        Integer retI = (Integer) ret;
+        Assert.assertEquals(1, retI.intValue());
+    }
+
+    public void testInvokeCheckedException() throws Throwable {
+        TestBean bean = new TestBean();
+        JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.replay(component);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(checkedMethod, component, wire, context, monitor);
+        try {
+            invoker.invokeTarget(null);
+        } catch (InvocationTargetException e) {
+            if (e.getCause() != null && TestException.class.equals(e.getCause().getClass())) {
+                return;
+            }
+        } catch (Throwable e) {
+            //ok
+        }
+        fail(TestException.class.getName() + " should have been thrown");
+    }
+
+    public void testInvokeRuntimeException() throws Throwable {
+        TestBean bean = new TestBean();
+        JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.replay(component);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(runtimeMethod, component, wire, context, monitor);
+        try {
+            invoker.invokeTarget(null);
+        } catch (InvocationTargetException e) {
+            if (e.getCause() != null && e.getCause() instanceof TestRuntimeException) {
+                return;
+            }
+        }
+        fail(TestException.class.getName() + " should have been thrown");
+    }
+
+    private class TestBean {
+
+        public String echo(String msg) throws Exception {
+            Assert.assertEquals("foo", msg);
+            return msg;
+        }
+
+        public String[] arrayEcho(String[] msg) throws Exception {
+            Assert.assertNotNull(msg);
+            Assert.assertEquals(2, msg.length);
+            Assert.assertEquals("foo", msg[0]);
+            Assert.assertEquals("bar", msg[1]);
+            return msg;
+        }
+
+        public String nullParam() throws Exception {
+            return "foo";
+        }
+
+        public int primitiveEcho(int i) throws Exception {
+            return i;
+        }
+
+        public void checkedException() throws TestException {
+            throw new TestException();
+        }
+
+        public void runtimeException() throws TestRuntimeException {
+            throw new TestRuntimeException();
+        }
+    }
+
+    public class TestException extends Exception {
+    }
+
+    public class TestRuntimeException extends RuntimeException {
+    }
+}

Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java Thu Oct 26 07:33:58 2006
@@ -0,0 +1,218 @@
+/*
+ * 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.core.implementation.java;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.extension.ExecutionMonitor;
+import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.MessageImpl;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+import static org.apache.tuscany.core.implementation.java.mock.MockFactory.createJavaComponent;
+import org.apache.tuscany.core.implementation.java.mock.components.AsyncTarget;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import org.easymock.classextension.EasyMock;
+
+/**
+ * Verifies dispatching invocations to a Java implementation instance
+ */
+public class JavaTargetInvokerNonBlockingInvocationTestCase extends TestCase {
+
+    private Method echoMethod;
+    private Method arrayMethod;
+    private Method nullParamMethod;
+    private Method primitiveMethod;
+    private Method checkedMethod;
+    private Method runtimeMethod;
+    private InboundWire wire;
+    private WorkContext context;
+    private ExecutionMonitor monitor;
+
+    public JavaTargetInvokerNonBlockingInvocationTestCase(String arg0) {
+        super(arg0);
+    }
+
+    public void testInvoke() throws Exception {
+        AsyncTarget target = createMock(AsyncTarget.class);
+        target.invoke();
+        expectLastCall().once();
+        replay(target);
+        JavaAtomicComponent component = createJavaComponent(target);
+        ExecutionMonitor monitor = createMock(ExecutionMonitor.class);
+        replay(monitor);
+
+        Message msg = new MessageImpl();
+        Object id = new Object();
+        msg.setMessageId(id);
+
+        WorkContext context = createMock(WorkContext.class);
+        context.setCurrentMessageId(null);
+        context.setCurrentCorrelationId(id);
+        replay(context);
+        Method method = AsyncTarget.class.getMethod("invoke");
+        method.setAccessible(true);
+        InboundWire wire = createMock(InboundWire.class);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(method, component, wire, context, monitor);
+        invoker.invoke(msg);
+        verify(target);
+    }
+
+    public void setUp() throws Exception {
+        echoMethod = TestBean.class.getDeclaredMethod("echo", String.class);
+        arrayMethod = TestBean.class.getDeclaredMethod("arrayEcho", String[].class);
+        nullParamMethod = TestBean.class.getDeclaredMethod("nullParam", (Class[]) null);
+        primitiveMethod = TestBean.class.getDeclaredMethod("primitiveEcho", Integer.TYPE);
+        checkedMethod = TestBean.class.getDeclaredMethod("checkedException", (Class[]) null);
+        runtimeMethod = TestBean.class.getDeclaredMethod("runtimeException", (Class[]) null);
+        wire = EasyMock.createNiceMock(InboundWire.class);
+        context = EasyMock.createNiceMock(WorkContext.class);
+        monitor = EasyMock.createNiceMock(ExecutionMonitor.class);
+        assertNotNull(echoMethod);
+        assertNotNull(checkedMethod);
+        assertNotNull(runtimeMethod);
+    }
+
+    public void testObjectInvoke() throws Throwable {
+        TestBean bean = new TestBean();
+        JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.replay(component);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, wire, context, monitor);
+        Object ret = invoker.invokeTarget("foo");
+        Assert.assertEquals("foo", ret);
+    }
+
+    public void testArrayInvoke() throws Throwable {
+        TestBean bean = new TestBean();
+        JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.replay(component);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(arrayMethod, component, wire, context, monitor);
+
+        String[] args = new String[]{"foo", "bar"};
+        Object ret = invoker.invokeTarget(new Object[]{args});
+        String[] retA = (String[]) ret;
+        Assert.assertNotNull(retA);
+        Assert.assertEquals(2, retA.length);
+        Assert.assertEquals("foo", retA[0]);
+        Assert.assertEquals("bar", retA[1]);
+    }
+
+    public void testNullInvoke() throws Throwable {
+        TestBean bean = new TestBean();
+        JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.replay(component);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(nullParamMethod, component, wire, context, monitor);
+        Object ret = invoker.invokeTarget(null);
+        String retS = (String) ret;
+        Assert.assertEquals("foo", retS);
+    }
+
+    public void testPrimitiveInvoke() throws Throwable {
+        TestBean bean = new TestBean();
+        JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.replay(component);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(primitiveMethod, component, wire, context, monitor);
+        Object ret = invoker.invokeTarget(new Integer[]{1});
+        Integer retI = (Integer) ret;
+        Assert.assertEquals(1, retI.intValue());
+    }
+
+    public void testInvokeCheckedException() throws Throwable {
+        TestBean bean = new TestBean();
+        JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.replay(component);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(checkedMethod, component, wire, context, monitor);
+        try {
+            invoker.invokeTarget(null);
+        } catch (InvocationTargetException e) {
+            if (e.getCause() != null && TestException.class.equals(e.getCause().getClass())) {
+                return;
+            }
+        } catch (Throwable e) {
+            //ok
+        }
+        fail(TestException.class.getName() + " should have been thrown");
+    }
+
+    public void testInvokeRuntimeException() throws Throwable {
+        TestBean bean = new TestBean();
+        JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.replay(component);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(runtimeMethod, component, wire, context, monitor);
+        try {
+            invoker.invokeTarget(null);
+        } catch (InvocationTargetException e) {
+            if (e.getCause() != null && e.getCause() instanceof TestRuntimeException) {
+                return;
+            }
+        }
+        fail(TestException.class.getName() + " should have been thrown");
+    }
+
+    private class TestBean {
+
+        public String echo(String msg) throws Exception {
+            Assert.assertEquals("foo", msg);
+            return msg;
+        }
+
+        public String[] arrayEcho(String[] msg) throws Exception {
+            Assert.assertNotNull(msg);
+            Assert.assertEquals(2, msg.length);
+            Assert.assertEquals("foo", msg[0]);
+            Assert.assertEquals("bar", msg[1]);
+            return msg;
+        }
+
+        public String nullParam() throws Exception {
+            return "foo";
+        }
+
+        public int primitiveEcho(int i) throws Exception {
+            return i;
+        }
+
+        public void checkedException() throws TestException {
+            throw new TestException();
+        }
+
+        public void runtimeException() throws TestRuntimeException {
+            throw new TestRuntimeException();
+        }
+    }
+
+    public class TestException extends Exception {
+    }
+
+    public class TestRuntimeException extends RuntimeException {
+    }
+}

Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

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=468018&r1=468017&r2=468018
==============================================================================
--- 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 Thu Oct 26 07:33:58 2006
@@ -50,22 +50,9 @@
         JavaAtomicComponent component =
             MockFactory.createJavaComponent("foo", scope, Echo.class);
         scope.register(component);
-        JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, null, null, null);
         invoker.setCacheable(false);
         assertEquals("foo", invoker.invokeTarget("foo"));
-        scope.stop();
-    }
-
-    public void testClone() throws Exception {
-        ScopeContainer scope = new ModuleScopeContainer(null);
-        scope.start();
-        JavaAtomicComponent component =
-            MockFactory.createJavaComponent("foo", scope, Echo.class);
-        scope.register(component);
-        JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component);
-        invoker.setCacheable(false);
-        JavaTargetInvoker clone = invoker.clone();
-        assertEquals("foo", clone.invokeTarget("foo"));
         scope.stop();
     }
 

Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/MediationTestCase.java (from r467627, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/MediationTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/MediationTestCase.java?view=diff&rev=468018&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/MediationTestCase.java&r1=467627&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/MediationTestCase.java&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/MediationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/MediationTestCase.java Thu Oct 26 07:33:58 2006
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.wire;
+package org.apache.tuscany.core.implementation.java;
 
 import java.lang.reflect.Method;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
 import org.apache.tuscany.core.mock.component.SimpleTargetImpl;
+import org.easymock.classextension.EasyMock;
 
 /**
  * Tests invoking on a different interface from the one actually implemented by the target
@@ -38,7 +39,10 @@
     }
 
     public void testMediation() throws Exception {
-        StaticPojoTargetInvoker invoker = new StaticPojoTargetInvoker(hello, new SimpleTargetImpl());
+        JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getTargetInstance()).andReturn(new SimpleTargetImpl());
+        EasyMock.replay(component);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(hello, component, null, null, null);
         Assert.assertEquals("foo", invoker.invokeTarget("foo"));
     }
 

Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/MediationTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/MediationTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OneWayWireInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OneWayWireInvocationTestCase.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OneWayWireInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OneWayWireInvocationTestCase.java Thu Oct 26 07:33:58 2006
@@ -22,6 +22,7 @@
 import java.util.Map;
 
 import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.extension.ExecutionMonitor;
 import org.apache.tuscany.spi.model.Operation;
 import org.apache.tuscany.spi.services.work.WorkScheduler;
 import org.apache.tuscany.spi.wire.InboundInvocationChain;
@@ -30,12 +31,13 @@
 import org.apache.tuscany.spi.wire.WireService;
 
 import junit.framework.TestCase;
-import org.apache.tuscany.core.implementation.java.AsyncJavaTargetInvoker;
 import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
+import org.apache.tuscany.core.implementation.java.JavaTargetInvoker;
 import org.apache.tuscany.core.implementation.java.mock.MockFactory;
 import static org.apache.tuscany.core.implementation.java.mock.MockFactory.createServiceWire;
 import org.apache.tuscany.core.implementation.java.mock.components.AsyncTarget;
 import org.apache.tuscany.core.wire.jdk.JDKWireService;
+import org.easymock.EasyMock;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.getCurrentArguments;
@@ -73,8 +75,8 @@
         Method method = AsyncTarget.class.getMethod("invoke");
         method.setAccessible(true);
         InboundWire inboundWire = createMock(InboundWire.class);
-        AsyncJavaTargetInvoker invoker =
-            new AsyncJavaTargetInvoker(method, inboundWire, component, null, context);
+        ExecutionMonitor monitor = EasyMock.createNiceMock(ExecutionMonitor.class);
+        JavaTargetInvoker invoker = new JavaTargetInvoker(method, component, inboundWire, context, monitor);
         InboundWire wire = createServiceWire("foo", AsyncTarget.class, null);
         Map<Operation<?>, InboundInvocationChain> chains = wire.getInvocationChains();
         InboundInvocationChain chain = chains.get(wire.getServiceContract().getOperations().get("invoke"));

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OutboundWireToJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OutboundWireToJavaTestCase.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OutboundWireToJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OutboundWireToJavaTestCase.java Thu Oct 26 07:33:58 2006
@@ -185,11 +185,11 @@
         configuration.addServiceInterface(Target.class);
         configuration.setParent(parent);
 
-        JavaAtomicComponent source = new JavaAtomicComponent("source", configuration, null);
+        JavaAtomicComponent source = new JavaAtomicComponent("source", configuration);
         OutboundWire outboundWire = createOutboundWire(new QualifiedName("target/Target"), Target.class);
         outboundWire.setContainer(source);
         source.addOutboundWire(outboundWire);
-        JavaAtomicComponent target = new JavaAtomicComponent("target", configuration, null);
+        JavaAtomicComponent target = new JavaAtomicComponent("target", configuration);
         InboundWire targetWire = MockFactory.createTargetWire("Target", Target.class);
         targetWire.setContainer(target);
         target.addInboundWire(targetWire);

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/mock/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/mock/MockFactory.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/mock/MockFactory.java Thu Oct 26 07:33:58 2006
@@ -90,7 +90,7 @@
         }
         configuration.addServiceInterface(DummyImpl.class);
         configuration.setWireService(WIRE_SERVICE);
-        return new JavaAtomicComponent(instance.getClass().getName(), configuration, null);
+        return new JavaAtomicComponent(instance.getClass().getName(), configuration);
     }
 
     @SuppressWarnings("unchecked")
@@ -101,7 +101,7 @@
         configuration.setInstanceFactory(new PojoObjectFactory(clazz.getConstructor()));
         configuration.addServiceInterface(clazz);
         configuration.setWireService(WIRE_SERVICE);
-        return new JavaAtomicComponent(name, configuration, null);
+        return new JavaAtomicComponent(name, configuration);
 
     }
 
@@ -182,7 +182,7 @@
         for (Map.Entry<String, Member> entry : members.entrySet()) {
             configuration.addReferenceSite(entry.getKey(), entry.getValue());
         }
-        JavaAtomicComponent sourceContext = new JavaAtomicComponent(sourceName, configuration, null);
+        JavaAtomicComponent sourceContext = new JavaAtomicComponent(sourceName, configuration);
         OutboundWire outboundWire = createReferenceWire(targetName, sourceReferenceClass, sourceHeadInterceptor);
         sourceContext.addOutboundWire(outboundWire);
         targetScope.register(targetContext);
@@ -232,7 +232,7 @@
         for (Map.Entry<String, Member> entry : members.entrySet()) {
             configuration.addReferenceSite(entry.getKey(), entry.getValue());
         }
-        JavaAtomicComponent sourceContext = new JavaAtomicComponent(sourceName, configuration, null);
+        JavaAtomicComponent sourceContext = new JavaAtomicComponent(sourceName, configuration);
         OutboundWire outboundWire = createReferenceWire(targetName, sourceReferenceClass, null);
         List<OutboundWire> factories = new ArrayList<OutboundWire>();
         factories.add(outboundWire);
@@ -328,7 +328,7 @@
                 //FIXME should use target method, not outboundInvocationConfig.getMethod()
                 Method[] methods = outboundWire.getServiceContract().getInterfaceClass().getMethods();
                 Method m = JavaIDLUtils.findMethod(chain.getOperation(), methods);
-                TargetInvoker invoker = new JavaTargetInvoker(m, targetContext);
+                TargetInvoker invoker = new JavaTargetInvoker(m, targetContext, null, null, null);
                 invoker.setCacheable(cacheable);
                 chain.setTargetInvoker(invoker);
             }

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java Thu Oct 26 07:33:58 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.tuscany.core.wire;
 
-import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 
 import org.apache.tuscany.spi.model.Operation;
@@ -31,6 +30,7 @@
 import org.apache.tuscany.spi.wire.TargetInvoker;
 
 import junit.framework.TestCase;
+import org.easymock.EasyMock;
 
 /**
  * Verifies wire optimization analysis
@@ -40,7 +40,6 @@
 public class WireOptimizationTestCase extends TestCase {
 
     private Operation operation;
-    private Method m;
 
     public void foo() {
     }
@@ -80,7 +79,8 @@
     public void testTargetWireNonTargetInvokerOptimization() throws Exception {
         InboundWire wire = new InboundWireImpl();
         InboundInvocationChain chain = new InboundInvocationChainImpl(operation);
-        TargetInvoker invoker = new StaticPojoTargetInvoker(m, new Object());
+        TargetInvoker invoker = EasyMock.createNiceMock(TargetInvoker.class);
+        EasyMock.replay(invoker);
         invoker.setCacheable(false);
         chain.setTargetInvoker(invoker);
         wire.addInvocationChain(operation, chain);
@@ -93,7 +93,6 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        m = getClass().getMethod("foo", (Class[]) null);
         operation = new Operation<Type>("foo", null, null, null, false, null);
 
     }

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java Thu Oct 26 07:33:58 2006
@@ -84,15 +84,8 @@
      *
      * @param targetName
      * @param operation  the operation to invoke
+     * @param callbackWire
      */
-    TargetInvoker createTargetInvoker(String targetName, Operation operation);
-
-    /**
-     * Callback to create a {@link org.apache.tuscany.spi.wire.TargetInvoker} which dispatches to a service offered by
-     * the component
-     *
-     * @param operation the operation to invoke
-     */
-    TargetInvoker createAsyncTargetInvoker(InboundWire wire, Operation operation);
+    TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire);
 
 }

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=468018&r1=468017&r2=468018
==============================================================================
--- 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 Thu Oct 26 07:33:58 2006
@@ -31,12 +31,10 @@
 import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.component.TargetException;
 import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.model.Operation;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.services.work.WorkScheduler;
 import org.apache.tuscany.spi.wire.InboundWire;
 import org.apache.tuscany.spi.wire.OutboundWire;
-import org.apache.tuscany.spi.wire.TargetInvoker;
 import org.apache.tuscany.spi.wire.WireService;
 
 /**
@@ -53,20 +51,25 @@
     protected WireService wireService;
     protected WorkContext workContext;
     protected WorkScheduler workScheduler;
+    protected ExecutionMonitor monitor;
     private final int initLevel;
 
+
+
     protected AtomicComponentExtension(String name,
                                        CompositeComponent parent,
                                        ScopeContainer scopeContainer,
                                        WireService wireService,
                                        WorkContext workContext,
                                        WorkScheduler workScheduler,
+                                       ExecutionMonitor monitor,
                                        int initLevel) {
         super(name, parent);
         this.scopeContainer = scopeContainer;
         this.wireService = wireService;
         this.workContext = workContext;
         this.workScheduler = workScheduler;
+        this.monitor = monitor;
         this.initLevel = initLevel;
     }
 
@@ -130,10 +133,6 @@
         assert wires != null && wires.size() > 0;
         referenceWires.put(wires.get(0).getReferenceName(), wires);
         onReferenceWires(multiplicityClass, wires);
-    }
-
-    public TargetInvoker createAsyncTargetInvoker(InboundWire wire, Operation operation) {
-        throw new UnsupportedOperationException();
     }
 
     protected void onReferenceWire(OutboundWire wire) {

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=468018&r1=468017&r2=468018
==============================================================================
--- 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 Thu Oct 26 07:33:58 2006
@@ -32,6 +32,8 @@
 import org.apache.tuscany.spi.services.work.WorkScheduler;
 import org.apache.tuscany.spi.policy.PolicyBuilderRegistry;
 
+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.
@@ -48,6 +50,7 @@
     protected WorkContext workContext;
     protected PolicyBuilderRegistry policyBuilderRegistry;
     protected Connector connector;
+    protected ExecutionMonitor monitor;
 
     @Autowire
     public void setBuilderRegistry(BuilderRegistry registry) {
@@ -82,6 +85,11 @@
     @Autowire
     public void setConnector(Connector connector) {
         this.connector = connector;
+    }
+
+    @Monitor
+    public void setMonitor(ExecutionMonitor monitor) {
+        this.monitor = monitor;
     }
 
     @Init(eager = true)

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java Thu Oct 26 07:33:58 2006
@@ -44,11 +44,9 @@
 import org.apache.tuscany.spi.component.TargetException;
 import org.apache.tuscany.spi.component.TargetNotFoundException;
 import org.apache.tuscany.spi.event.Event;
-import org.apache.tuscany.spi.model.Operation;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.InboundWire;
 import org.apache.tuscany.spi.wire.OutboundWire;
-import org.apache.tuscany.spi.wire.TargetInvoker;
 
 /**
  * An extension point for composite components, which new types may extend
@@ -219,10 +217,6 @@
             }
             return map;
         }
-    }
-
-    public TargetInvoker createAsyncTargetInvoker(InboundWire wire, Operation operation) {
-        throw new UnsupportedOperationException();
     }
 
     public Service getService(String name) {

Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ExecutionMonitor.java (from r467627, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/AsyncMonitor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ExecutionMonitor.java?view=diff&rev=468018&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/AsyncMonitor.java&r1=467627&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ExecutionMonitor.java&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/AsyncMonitor.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ExecutionMonitor.java Thu Oct 26 07:33:58 2006
@@ -16,16 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.core.implementation.java;
+package org.apache.tuscany.spi.extension;
 
 /**
- * A monitor used to log events during non-blocking invocations
- * <p/>
- * REVIEW JFM we should probably generalize async monitor and make it an invocation monitor
+ * A monitor used to log events during an invocation
  *
  * @version $$Rev$$ $$Date$$
  */
-public interface AsyncMonitor {
+public interface ExecutionMonitor {
 
     /**
      * Logs an exception thrown during an invocation

Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ExecutionMonitor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ExecutionMonitor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/SystemAtomicComponentExtension.java Thu Oct 26 07:33:58 2006
@@ -26,6 +26,7 @@
 import org.apache.tuscany.spi.component.TargetException;
 import org.apache.tuscany.spi.model.Operation;
 import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.InboundWire;
 
 /**
  * @version $Rev$ $Date$
@@ -45,7 +46,7 @@
                                           CompositeComponent parent,
                                           ScopeContainer scopeContainer,
                                           int initLevel) {
-        super(name, parent, scopeContainer, null, null, null, initLevel);
+        super(name, parent, scopeContainer, null, null, null, null, initLevel);
         this.interfazes = serviceInterfaces;
     }
 
@@ -61,7 +62,7 @@
         return interfazes;
     }
 
-    public TargetInvoker createTargetInvoker(String targetName, Operation operation) {
+    public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
         throw new UnsupportedOperationException();
     }
 

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=468018&r1=468017&r2=468018
==============================================================================
--- 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 Thu Oct 26 07:33:58 2006
@@ -23,22 +23,44 @@
 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.wire.InboundWire;
+import org.apache.tuscany.spi.component.WorkContext;
 
 /**
  * The default implementation of a TargetInvoker
  */
 public abstract class TargetInvokerExtension implements TargetInvoker {
 
-    private boolean cacheable;
-    
-    public TargetInvokerExtension() {
+    protected InboundWire wire;
+    protected WorkContext workContext;
+    protected ExecutionMonitor monitor;
+    protected boolean cacheable;
+
+    /**
+     * Creates a new invoker
+     *
+     * @param wire the callback wire
+     * @param workContext the work context to use for setting correlation information
+     * @param monitor
+     */
+    public TargetInvokerExtension(InboundWire wire, WorkContext workContext, ExecutionMonitor monitor) {
+        this.wire = wire;
+        this.workContext = workContext;
+        this.monitor = monitor;
     }
 
     public Message invoke(Message msg) throws InvocationRuntimeException {
         try {
+            Object messageId = msg.getMessageId();
+            if (messageId != null) {
+                wire.addMapping(messageId, msg.getFromAddress());
+                workContext.setCurrentMessageId(null);
+                workContext.setCurrentCorrelationId(messageId);
+            }
             Object resp = invokeTarget(msg.getBody());
             msg.setBody(resp);
         } catch (InvocationTargetException e) {
+            //monitor.executionError(e);
             msg.setBodyWithFault(e.getCause());
         }
         return msg;
@@ -55,8 +77,8 @@
     public boolean isOptimizable() {
         return isCacheable();
     }
-    
-    public Object clone() {
+
+    public Object clone() throws CloneNotSupportedException {
         try {
             return super.clone();
         } catch (CloneNotSupportedException e) {

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInboundInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInboundInvocationHandler.java?view=diff&rev=468018&r1=468017&r2=468018
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInboundInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInboundInvocationHandler.java Thu Oct 26 07:33:58 2006
@@ -47,13 +47,6 @@
         } else {
             Message msg = new MessageImpl();
             msg.setTargetInvoker(invoker);
-            Object messageId = getMessageId();
-            if (messageId == null) {
-                messageId = new MessageId();
-            }
-            msg.setMessageId(messageId);
-            Object corrId = getCorrelationId();
-            msg.setCorrelationId(corrId);
             msg.setBody(args);
             Message resp;
             // dispatch the wire down the chain and get the response

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=468018&r1=468017&r2=468018
==============================================================================
--- 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 Thu Oct 26 07:33:58 2006
@@ -24,6 +24,7 @@
 import org.apache.tuscany.spi.component.TargetException;
 import org.apache.tuscany.spi.model.Operation;
 import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.InboundWire;
 
 import junit.framework.TestCase;
 
@@ -59,7 +60,7 @@
 
     private class TestExtension extends AtomicComponentExtension {
         public TestExtension() {
-            super(null, null, null, null, null, null, 0);
+            super(null, null, null, null, null, null, null, 0);
         }
 
         public Object getServiceInstance() throws TargetException {
@@ -78,7 +79,7 @@
             return null;
         }
 
-        public TargetInvoker createTargetInvoker(String targetName, Operation operation) {
+        public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
             return null;
         }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org