Author: jmarino
Date: Fri Jan  5 04:28:31 2007
New Revision: 493014

URL: http://svn.apache.org/viewvc?view=rev&rev=493014
Log:
add support for destroy notification of stateless instances

Added:
    
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java
   (with props)
Modified:
    
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/component/scope/RequestScopeInitDestroyErrorTestCase.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/JavaTargetInvokerTestCase.java
    
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/oneway/OneWayWireToJavaInvocationTestCase.java

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=493014&r1=493013&r2=493014
==============================================================================
--- 
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
 Fri Jan  5 04:28:31 2007
@@ -24,12 +24,13 @@
 
 import org.osoa.sca.NoRegisteredCallbackException;
 
+import org.apache.tuscany.spi.component.ComponentException;
 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.component.ComponentException;
 import org.apache.tuscany.spi.extension.ExecutionMonitor;
 import org.apache.tuscany.spi.extension.TargetInvokerExtension;
+import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.InboundWire;
 
 import static 
org.apache.tuscany.core.util.JavaIntrospectionHelper.findClosestMatchingMethod;
@@ -45,6 +46,7 @@
     protected JavaAtomicComponent component;
     protected Object target;
     protected Class callbackClass;
+    protected boolean stateless;
 
     public JavaTargetInvoker(Method operation,
                              JavaAtomicComponent component,
@@ -56,6 +58,7 @@
         assert operation != null : "Operation method cannot be null";
         this.operation = operation;
         this.component = component;
+        stateless = Scope.STATELESS == component.getScope();
         this.callbackClass = callbackClass;
     }
 
@@ -72,8 +75,8 @@
             Object instance = getInstance(sequence);
             if (callbackClass != null && !callbackClass.isInstance(instance)) {
                 throw new InvocationTargetException(
-                    new NoRegisteredCallbackException("Instance is does not 
implement callback: "
-                        + callbackClass.toString()));
+                    new NoRegisteredCallbackException("Instance is does not 
implement callback ["
+                        + callbackClass.toString() + "]"));
             }
             if (!operation.getDeclaringClass().isInstance(instance)) {
                 Set<Method> methods = 
getAllUniquePublicProtectedMethods(instance.getClass());
@@ -89,7 +92,10 @@
             } else {
                 ret = operation.invoke(instance, (Object[]) payload);
             }
-            if (sequence == END) {
+            if (stateless) {
+                // notify a stateless instance of a destruction event after 
the invoke
+                component.destroy(instance);
+            } else if (sequence == END) {
                 // if end conversation, remove resource
                 component.removeInstance();
             }

Modified: 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInitDestroyErrorTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInitDestroyErrorTestCase.java?view=diff&rev=493014&r1=493013&r2=493014
==============================================================================
--- 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInitDestroyErrorTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInitDestroyErrorTestCase.java
 Fri Jan  5 04:28:31 2007
@@ -18,7 +18,6 @@
  */
 package org.apache.tuscany.core.component.scope;
 
-import org.apache.tuscany.spi.ObjectCreationException;
 import org.apache.tuscany.spi.component.AtomicComponent;
 import org.apache.tuscany.spi.component.ScopeContainerMonitor;
 import org.apache.tuscany.spi.component.TargetDestructionException;

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=493014&r1=493013&r2=493014
==============================================================================
--- 
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
 Fri Jan  5 04:28:31 2007
@@ -25,6 +25,7 @@
 import org.apache.tuscany.spi.extension.ExecutionMonitor;
 import org.apache.tuscany.spi.wire.InboundWire;
 import static org.apache.tuscany.spi.wire.TargetInvoker.NONE;
+import org.apache.tuscany.spi.model.Scope;
 
 import junit.framework.TestCase;
 import org.easymock.classextension.EasyMock;
@@ -63,6 +64,7 @@
         TestBean bean = new TestBean();
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.replay(component);
         JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, 
component, wire, context, monitor);
         Object ret = invoker.invokeTarget("foo", NONE);
@@ -73,6 +75,7 @@
         TestBean bean = new TestBean();
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.replay(component);
         JavaTargetInvoker invoker = new JavaTargetInvoker(arrayMethod, 
component, wire, context, monitor);
 
@@ -89,6 +92,7 @@
         TestBean bean = new TestBean();
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.replay(component);
         JavaTargetInvoker invoker = new JavaTargetInvoker(nullParamMethod, 
component, wire, context, monitor);
         Object ret = invoker.invokeTarget(null, NONE);
@@ -100,6 +104,7 @@
         TestBean bean = new TestBean();
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.replay(component);
         JavaTargetInvoker invoker = new JavaTargetInvoker(primitiveMethod, 
component, wire, context, monitor);
         Object ret = invoker.invokeTarget(new Integer[]{1}, NONE);
@@ -111,6 +116,7 @@
         TestBean bean = new TestBean();
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.replay(component);
         JavaTargetInvoker invoker = new JavaTargetInvoker(checkedMethod, 
component, wire, context, monitor);
         try {
@@ -129,6 +135,7 @@
         TestBean bean = new TestBean();
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.replay(component);
         JavaTargetInvoker invoker = new JavaTargetInvoker(runtimeMethod, 
component, wire, context, monitor);
         try {

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=493014&r1=493013&r2=493014
==============================================================================
--- 
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
 Fri Jan  5 04:28:31 2007
@@ -21,6 +21,7 @@
 import java.lang.reflect.Method;
 
 import static org.apache.tuscany.spi.wire.TargetInvoker.NONE;
+import org.apache.tuscany.spi.model.Scope;
 
 import junit.framework.TestCase;
 import org.easymock.classextension.EasyMock;
@@ -44,6 +45,7 @@
         EasyMock.replay(target);
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         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);
         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=493014&r1=493013&r2=493014
==============================================================================
--- 
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
 Fri Jan  5 04:28:31 2007
@@ -23,6 +23,7 @@
 
 import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.extension.ExecutionMonitor;
+import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.InboundWire;
 import org.apache.tuscany.spi.wire.Message;
 import org.apache.tuscany.spi.wire.MessageImpl;
@@ -33,6 +34,8 @@
 
 /**
  * Verifies dispatching invocations to a Java implementation instance
+ *
+ * @version $Rev$ $Date$
  */
 public class JavaTargetInvokerNonBlockingInvocationTestCase extends TestCase {
 
@@ -57,6 +60,7 @@
         EasyMock.replay(target);
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         EasyMock.expect(component.getTargetInstance()).andReturn(target);
+        EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.replay(component);
         ExecutionMonitor monitor = EasyMock.createMock(ExecutionMonitor.class);
         EasyMock.replay(monitor);
@@ -96,6 +100,7 @@
         TestBean bean = new TestBean();
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.replay(component);
         JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, 
component, wire, context, monitor);
         Object ret = invoker.invokeTarget("foo", NONE);
@@ -106,6 +111,7 @@
         TestBean bean = new TestBean();
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.replay(component);
         JavaTargetInvoker invoker = new JavaTargetInvoker(arrayMethod, 
component, wire, context, monitor);
 
@@ -122,6 +128,7 @@
         TestBean bean = new TestBean();
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.replay(component);
         JavaTargetInvoker invoker = new JavaTargetInvoker(nullParamMethod, 
component, wire, context, monitor);
         Object ret = invoker.invokeTarget(null, NONE);
@@ -133,6 +140,7 @@
         TestBean bean = new TestBean();
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.replay(component);
         JavaTargetInvoker invoker = new JavaTargetInvoker(primitiveMethod, 
component, wire, context, monitor);
         Object ret = invoker.invokeTarget(new Integer[]{1}, NONE);
@@ -144,6 +152,7 @@
         TestBean bean = new TestBean();
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.replay(component);
         JavaTargetInvoker invoker = new JavaTargetInvoker(checkedMethod, 
component, wire, context, monitor);
         try {
@@ -162,6 +171,7 @@
         TestBean bean = new TestBean();
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         EasyMock.expect(component.getTargetInstance()).andReturn(bean);
+        EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.replay(component);
         JavaTargetInvoker invoker = new JavaTargetInvoker(runtimeMethod, 
component, wire, context, monitor);
         try {

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=493014&r1=493013&r2=493014
==============================================================================
--- 
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
 Fri Jan  5 04:28:31 2007
@@ -21,6 +21,7 @@
 import org.apache.tuscany.spi.wire.Message;
 import org.apache.tuscany.spi.wire.MessageImpl;
 import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.model.Scope;
 
 import junit.framework.TestCase;
 import org.easymock.classextension.EasyMock;
@@ -39,6 +40,7 @@
         EasyMock.replay(foo);
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         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);
         Message msg = new MessageImpl();
@@ -57,6 +59,7 @@
         EasyMock.replay(foo);
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         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);
         Message msg = new MessageImpl();
@@ -75,6 +78,7 @@
         EasyMock.replay(foo);
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         
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);
         Message msg = new MessageImpl();
@@ -94,6 +98,7 @@
         EasyMock.replay(foo);
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         
EasyMock.expect(component.getAssociatedTargetInstance()).andReturn(foo);
+        EasyMock.expect(component.getScope()).andReturn(Scope.CONVERSATION);
         component.removeInstance();
         EasyMock.replay(component);
         JavaTargetInvoker invoker = new 
JavaTargetInvoker(Foo.class.getMethod("invoke"), component, null, null, null);

Added: 
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=auto&rev=493014
==============================================================================
--- 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java
 (added)
+++ 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java
 Fri Jan  5 04:28:31 2007
@@ -0,0 +1,54 @@
+/*
+ * 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.Method;
+
+import org.apache.tuscany.spi.model.Scope;
+
+import junit.framework.TestCase;
+import org.easymock.classextension.EasyMock;
+
+public class JavaTargetInvokerStatelessDestroyTestCase extends TestCase {
+
+    public JavaTargetInvokerStatelessDestroyTestCase(String arg0) {
+        super(arg0);
+    }
+
+    public void testDestroy() throws Exception {
+        Method echoMethod = Echo.class.getDeclaredMethod("echo", String.class);
+        JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getTargetInstance()).andReturn(new 
JavaTargetInvokerStatelessDestroyTestCase.Echo());
+        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);
+        invoker.setCacheable(false);
+        assertEquals("foo", invoker.invokeTarget("foo", 
JavaTargetInvoker.NONE));
+        EasyMock.verify(component);
+    }
+
+    public static class Echo {
+        public String echo(String message) throws Exception {
+            return message;
+        }
+
+    }
+
+}

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

Propchange: 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.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=493014&r1=493013&r2=493014
==============================================================================
--- 
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
 Fri Jan  5 04:28:31 2007
@@ -20,6 +20,8 @@
 
 import java.lang.reflect.Method;
 
+import org.apache.tuscany.spi.model.Scope;
+
 import junit.framework.TestCase;
 import org.easymock.classextension.EasyMock;
 
@@ -33,6 +35,7 @@
         Method echoMethod = Echo.class.getDeclaredMethod("echo", String.class);
         JavaAtomicComponent component = 
EasyMock.createMock(JavaAtomicComponent.class);
         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);
         invoker.setCacheable(false);

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=493014&r1=493013&r2=493014
==============================================================================
--- 
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
 Fri Jan  5 04:28:31 2007
@@ -25,6 +25,7 @@
 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.model.Scope;
 import org.apache.tuscany.spi.services.work.WorkScheduler;
 import org.apache.tuscany.spi.wire.InboundInvocationChain;
 import org.apache.tuscany.spi.wire.InboundWire;
@@ -79,6 +80,7 @@
         EasyMock.expectLastCall().once();
         EasyMock.replay(target);
         component = EasyMock.createMock(JavaAtomicComponent.class);
+        EasyMock.expect(component.getScope()).andReturn(Scope.COMPOSITE);
         EasyMock.expect(component.getTargetInstance()).andReturn(target);
         EasyMock.replay(component);
         Method method = AsyncTarget.class.getMethod("invoke");



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to