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, 8 insertions, 19 deletions

diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
index 59ab8d36fc..b682c2870e 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
@@ -21,7 +21,6 @@ package org.apache.tuscany.sca.assembly;
 import java.io.Serializable;
 import java.util.List;
 
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.policy.PolicySubject;
 
@@ -113,14 +112,6 @@ public interface Endpoint extends Base, PolicySubject, Cloneable, Serializable {
     List<EndpointReference> getCallbackEndpointReferences();
 
     /**
-     * Set the extension point registry against the endpoint after it is deserialized as
-     * the registry needs to be re-attached
-     *
-     * @param registry
-     */
-    void setExtensionPointRegistry(ExtensionPointRegistry registry);
-
-    /**
      * Returns true if this endpoint represents a serivce that is not
      * running in this JVM
      * 
@@ -143,4 +134,11 @@ public interface Endpoint extends Base, PolicySubject, Cloneable, Serializable {
      * @throws CloneNotSupportedException
      */
     Object clone() throws CloneNotSupportedException;
+    
+    /*
+    String getDomainURI();
+    String getNodeURI();
+    void setDomainURI(String domainURI);
+    void setNodeURI(String nodeURI);
+    */
 }
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
index 7b547e70de..a3e4ef133d 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
@@ -20,7 +20,6 @@ package org.apache.tuscany.sca.assembly;
 
 import java.io.Serializable;
 
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.policy.PolicySubject;
 
@@ -164,14 +163,6 @@ public interface EndpointReference extends Base, PolicySubject, Cloneable, Seria
     void setRemote(boolean remote);
 
     /**
-     * Set the extension point registry against the endpoint after it is deserialized as
-     * the registry needs to be re-attached
-     *
-     * @param registry
-     */
-    void setExtensionPointRegistry(ExtensionPointRegistry registry);
-
-    /**
      * Rather than relying on combinations of unresolved flags and 
      * other data we maintain a status enumeration
      * 
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
index 4b1d9e437d..a22b70f609 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
@@ -188,7 +188,7 @@ public class EndpointImpl implements Endpoint {
         this.uri = null;
     }
 
-    public void setExtensionPointRegistry(ExtensionPointRegistry registry) {
+    protected void setExtensionPointRegistry(ExtensionPointRegistry registry) {
         this.registry = registry;
     }