Replace RuntimeWire with RuntimeEnpoint/RuntimeEndpointReference as the owner of invocaiton chains

(http://www.mail-archive.com/dev@tuscany.apache.org/msg07856.html)

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

3 files changed, 15 insertions, 8 deletions

diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCABindingProviderFactory.java b/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCABindingProviderFactory.java
index 6ac5eef4e7..e1f700fa51 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCABindingProviderFactory.java
+++ b/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCABindingProviderFactory.java
@@ -20,12 +20,12 @@
 package org.apache.tuscany.sca.binding.sca.rmi;

 

 import org.apache.tuscany.sca.assembly.DistributedSCABinding;

-import org.apache.tuscany.sca.assembly.Endpoint;

-import org.apache.tuscany.sca.assembly.EndpointReference;

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

 import org.apache.tuscany.sca.provider.BindingProviderFactory;

 import org.apache.tuscany.sca.provider.ReferenceBindingProvider;

 import org.apache.tuscany.sca.provider.ServiceBindingProvider;

+import org.apache.tuscany.sca.runtime.RuntimeEndpoint;

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

 

 /**

  * The factory for the RMI based implementation of the distributed sca binding

@@ -38,11 +38,11 @@ public class RMISCABindingProviderFactory implements BindingProviderFactory<Dist
         this.extensionPoints = extensionPoints;

     }    

 

-    public ReferenceBindingProvider createReferenceBindingProvider(EndpointReference endpointReference) {

+    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeEndpointReference endpointReference) {

         return new RMISCAReferenceBindingProvider(endpointReference, extensionPoints);

     }

 

-    public ServiceBindingProvider createServiceBindingProvider(Endpoint endpoint) {

+    public ServiceBindingProvider createServiceBindingProvider(RuntimeEndpoint endpoint) {

         return new RMISCAServiceBindingProvider(endpoint, extensionPoints);

     }

 

diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAReferenceBindingProvider.java b/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAReferenceBindingProvider.java
index 6773b3b1d2..154aca8f53 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAReferenceBindingProvider.java
+++ b/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAReferenceBindingProvider.java
@@ -34,6 +34,7 @@ import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.provider.BindingProviderFactory;

 import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;

 import org.apache.tuscany.sca.provider.ReferenceBindingProvider;

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

 

 /**

  * The reference binding provider for the remote sca binding implementation. Relies on the 

@@ -60,9 +61,9 @@ public class RMISCAReferenceBindingProvider implements ReferenceBindingProvider
         rmiBinding.setURI(this.binding.getURI());

 

         // create a copy of the endpoint reference but with the RMI binding in

-        EndpointReference epr = null;

+        RuntimeEndpointReference epr = null;

         try {

-            epr = (EndpointReference)endpointReference.clone();

+            epr = (RuntimeEndpointReference)endpointReference.clone();

         } catch (Exception ex){

             // we know we can clone endpoint references

         }

@@ -72,6 +73,8 @@ public class RMISCAReferenceBindingProvider implements ReferenceBindingProvider
         ProviderFactoryExtensionPoint providerFactories = extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class);

         BindingProviderFactory<?> providerFactory = (BindingProviderFactory<?>)providerFactories.getProviderFactory(RMIBinding.class);

         referenceBindingProvider = providerFactory.createReferenceBindingProvider(epr);

+        // Set the reference binding provider so that it can be used to start/stop

+        ((RuntimeEndpointReference) endpointReference).setBindingProvider(referenceBindingProvider);

         logger.info("Reference using RMI SCA Binding: " + rmiBinding.getURI());

     }

 

diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAServiceBindingProvider.java b/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAServiceBindingProvider.java
index f3e60be83d..f230926183 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAServiceBindingProvider.java
+++ b/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAServiceBindingProvider.java
@@ -37,6 +37,7 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.provider.BindingProviderFactory;

 import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;

 import org.apache.tuscany.sca.provider.ServiceBindingProvider;

+import org.apache.tuscany.sca.runtime.RuntimeEndpoint;

 

 /**

  * The service binding provider for the remote sca binding implementation. Relies on the

@@ -88,9 +89,9 @@ public class RMISCAServiceBindingProvider implements ServiceBindingProvider {
         rmiBinding.setURI(this.binding.getURI());

 

         // create a copy of the endpoint  but with the web service binding in

-        Endpoint ep = null;

+        RuntimeEndpoint ep = null;

         try {

-            ep = (Endpoint)endpoint.clone();

+            ep = (RuntimeEndpoint)endpoint.clone();

         } catch (Exception ex){

             // we know we can clone endpoint references

         }

@@ -100,6 +101,9 @@ public class RMISCAServiceBindingProvider implements ServiceBindingProvider {
         BindingProviderFactory<?> providerFactory = (BindingProviderFactory<?>) providerFactories.getProviderFactory(RMIBinding.class);

         serviceBindingProvider = providerFactory.createServiceBindingProvider(ep);

         

+        // Set the service binding provider so that it can be used to start/stop

+        ((RuntimeEndpoint) endpoint).setBindingProvider(serviceBindingProvider);

+        

         logger.info("Service using RMI SCA Binding: " + rmiBinding.getURI());

     }