Add domainURI/nodeURI to runtime endpoint/endpoint reference

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

2 files changed, 37 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
index 3e73960367..b4743676b0 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
@@ -78,7 +78,6 @@ import org.oasisopen.sca.ServiceRuntimeException;
  */
 public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint, Externalizable {
     private transient CompositeContext compositeContext;
-    private transient EndpointRegistry endpointRegistry;
     private transient RuntimeWireProcessor wireProcessor;
     private transient ProviderFactoryExtensionPoint providerFactories;
     private transient InterfaceContractMapper interfaceContractMapper;
@@ -99,6 +98,9 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint
 
     protected InterfaceContract bindingInterfaceContract;
     protected InterfaceContract serviceInterfaceContract;
+    
+    private String domainURI;
+    private String nodeURI;
 
     /**
      * No-arg constructor for Java serilization
@@ -129,6 +131,8 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint
         this.policySets = copy.policySets;
 
         this.uri = copy.uri;
+        this.nodeURI = copy.nodeURI;
+        this.domainURI = copy.domainURI;
         this.remote = copy.remote;
         this.unresolved = copy.unresolved;
 
@@ -144,6 +148,12 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint
 
     public void bind(CompositeContext compositeContext) {
         this.compositeContext = compositeContext;
+        if (nodeURI != null) {
+            this.nodeURI = compositeContext.getNodeURI();
+        }
+        if (domainURI != null) {
+            this.domainURI = compositeContext.getDomainURI();
+        }
         bind(compositeContext.getExtensionPointRegistry(), compositeContext.getEndpointRegistry());
     }
 
@@ -152,7 +162,6 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint
             compositeContext = new CompositeContext(registry, endpointRegistry);
         }
         this.registry = registry;
-        this.endpointRegistry = endpointRegistry;
         UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
         this.interfaceContractMapper = utilities.getUtility(InterfaceContractMapper.class);
         this.workScheduler = utilities.getUtility(WorkScheduler.class);
@@ -566,4 +575,12 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint
         }
     }
 
+    public String getDomainURI() {
+        return domainURI;
+    }
+
+    public String getNodeURI() {
+        return nodeURI;
+    }
+
 }
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
index 57ca960c5b..32078eabc9 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
@@ -100,6 +100,8 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen
 
     protected InterfaceContract bindingInterfaceContract;
     protected InterfaceContract referenceInterfaceContract;
+    private String domainURI;
+    private String nodeURI;
 
     private String xml;
 
@@ -132,6 +134,8 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen
         this.policySets = copy.policySets;
 
         this.uri = copy.uri;
+        this.domainURI = copy.domainURI;
+        this.nodeURI = copy.nodeURI;
         this.remote = copy.remote;
         this.unresolved = copy.unresolved;
         this.status = copy.status;
@@ -148,6 +152,12 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen
 
     public void bind(CompositeContext compositeContext) {
         this.compositeContext = compositeContext;
+        if (nodeURI != null) {
+            this.nodeURI = compositeContext.getNodeURI();
+        }
+        if (domainURI != null) {
+            this.domainURI = compositeContext.getDomainURI();
+        }
         bind(compositeContext.getExtensionPointRegistry(), compositeContext.getEndpointRegistry());
     }
 
@@ -534,5 +544,13 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen
             }
         }
     }
+    
+    public String getDomainURI() {
+        return domainURI;
+    }
+
+    public String getNodeURI() {
+        return nodeURI;
+    }
 
 }