Switch over to new endpoint reference/endpoint model. These are the changes required to exploit the model in the runtime up to the point were the old EndpointReference is retrieved from a wire. The next step is to convert this over too and exploit the new endpoint references fully. There is still tidying to do (search for TODO - EPR) in particular I haven't removed any of the old files yet. So beware don't put changes into CompositeActivator or RuntimeWire as the runtime isn't using them

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

2 files changed, 23 insertions, 0 deletions

diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index 44ae7f552a..84e2f4588b 100644
--- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
@@ -24,6 +24,7 @@ import java.util.List;
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference2;
 import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Invoker;
@@ -52,6 +53,13 @@ public interface RuntimeComponentReference extends ComponentReference {
      * @return The runtime wire
      */
     RuntimeWire getRuntimeWire(Binding binding);
+    
+    /**
+     * Get the runtime wire for the given endpoint reference
+     * @param endpointReference The assembly model endpoint reference 
+     * @return The runtime wire
+     */
+    RuntimeWire getRuntimeWire(EndpointReference2 endpointReference);
 
     /**
      * Returns the reference binding provider associated with this
diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index a2e7152202..7366d511ae 100644
--- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
@@ -22,6 +22,7 @@ package org.apache.tuscany.sca.runtime;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
+import org.apache.tuscany.sca.assembly.EndpointReference2;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.InvocationChain;
 import org.apache.tuscany.sca.invocation.Message;
@@ -34,6 +35,11 @@ import org.apache.tuscany.sca.invocation.Message;
  */
 public interface RuntimeWire extends Cloneable {
 
+    
+    // =================================================================
+    // TODO - EPR - remove the following three methods when we have
+    //        changes the rest of the instructure over to using EndpointReference2
+    //        and EndpointReference2 throughout
     /**
      * Get the source of the wire
      * 
@@ -54,6 +60,15 @@ public interface RuntimeWire extends Cloneable {
      */
     void setTarget(EndpointReference target);
     
+    //==================================================================
+    
+    /**
+     * return the endpoint reference that configured this wire
+     * 
+     * @return the endpoint reference that configured this wire 
+     */
+    EndpointReference2 getEndpointReference();
+    
     /**
      * Force the invocation chains to be rebuilt
      */