TUSCANY-3801 - missed files from previous check in.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1043211 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 21 insertions, 19 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java b/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
index db0e571ef6..04e4fa3b3b 100644
--- a/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
+++ b/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
@@ -33,7 +33,6 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.InvokerAsync;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.policy.ExtensionType;
 import org.apache.tuscany.sca.policy.Intent;
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
index 87d3013a98..fd04cf02e3 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
@@ -22,10 +22,8 @@ package org.apache.tuscany.sca.binding.sca.provider;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.invocation.InvokerAsyncResponse;
 import org.apache.tuscany.sca.provider.EndpointAsyncProvider;
-import org.apache.tuscany.sca.provider.EndpointProvider;
 import org.apache.tuscany.sca.provider.ServiceBindingProvider;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;
 import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
@@ -110,7 +108,7 @@ public class RuntimeSCAServiceBindingProvider implements EndpointAsyncProvider {
         return true;
     }
     
-    public Invoker createAsyncResponseInvoker(Operation operation) {
+    public InvokerAsyncResponse createAsyncResponseInvoker() {
         return new SCABindingAsyncResponseInvoker(null, null);
     }
     
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingAsyncResponseInvoker.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingAsyncResponseInvoker.java
index 26707e8ebd..d502cdd22c 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingAsyncResponseInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingAsyncResponseInvoker.java
@@ -20,26 +20,27 @@
 package org.apache.tuscany.sca.binding.sca.provider;

 

 import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.invocation.Interceptor;

-import org.apache.tuscany.sca.invocation.InvocationChain;

-import org.apache.tuscany.sca.invocation.Invoker;

+import org.apache.tuscany.sca.invocation.InvokerAsyncResponse;

 import org.apache.tuscany.sca.invocation.Message;

 import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;

 

 /**

  * @version $Rev: 989157 $ $Date: 2010-08-25 16:02:01 +0100 (Wed, 25 Aug 2010) $

  */

-public class SCABindingAsyncResponseInvoker implements Invoker {

+public class SCABindingAsyncResponseInvoker implements InvokerAsyncResponse {

 

      public SCABindingAsyncResponseInvoker(ExtensionPointRegistry extensionPoints,

                                           RuntimeEndpointReference endpointReference) {

     }

-

+    

     // TODO - this only works for the local case!

-    public Message invoke(Message msg) {

+    public void invokeAsyncResponse(Message msg) {

         RuntimeEndpointReference epr = (RuntimeEndpointReference)msg.getFrom();

-        epr.invokeAsyncResponse(msg);

+        epr.invokeAsyncResponse(msg); 

+    }

+    

+    public Message processResponse(Message msg) {

+        // TODO Auto-generated method stub

         return null;

     }

-}

+}
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
index 95fd4cd934..a131c88a0c 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
@@ -99,5 +99,9 @@ public class SCABindingInvoker extends InterceptorAsyncImpl {
         
         return msg;
     }
+    
+    public boolean isLocalSCABIndingInvoker() {
+        return true;
+    }
 
 }
diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InterceptorAsync.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InterceptorAsync.java
index 3819147526..50bcf13b04 100644
--- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InterceptorAsync.java
+++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InterceptorAsync.java
@@ -20,21 +20,21 @@ package org.apache.tuscany.sca.invocation;
 

 /**

  * Allows asynchronous wires to be navigated in reverse in order for the 

- * reponse to be processed. 

+ * response to be processed. 

  *

  */

-public interface InterceptorAsync extends Interceptor, InvokerAsync {

+public interface InterceptorAsync extends Interceptor, InvokerAsyncRequest, InvokerAsyncResponse {

 

     /**

      * Sets the previous invoker

      * @param next The previous invoker

      */

-    void setPrevious(InvokerAsync previous);

+    void setPrevious(InvokerAsyncResponse previous);

 

     /**

      * Returns the previous invoker or null

      * @return The previous Invoker

      */

-    InvokerAsync getPrevious();

-

+    InvokerAsyncResponse getPrevious();

+    

 }