Refactor the runtime build logic into EndpointReferenceBinder

Refactor the endpoint-wrapper into domainRegistryFactory that delegates to endpoint registry implementations by the scheme
Improve/workaround the monitor so that it can be shared by multiple nodes (We need a better design for this)

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

1 files changed, 6 insertions, 6 deletions

diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java
index d9c88d3071..a82e4a3816 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java
@@ -26,15 +26,15 @@ import org.apache.tuscany.sca.assembly.Implementation;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation;
 import org.apache.tuscany.sca.osgi.service.remoteadmin.EndpointDescription;
+import org.apache.tuscany.sca.runtime.DomainRegistryFactory;
 import org.apache.tuscany.sca.runtime.EndpointListener;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
 import org.osgi.framework.BundleContext;
 
 /**
  * Discovery service based on the distributed SCA domain
  */
 public class DomainDiscoveryService extends AbstractDiscoveryService implements EndpointListener {
-    private EndpointRegistry endpointRegistry;
+    private DomainRegistryFactory domainRegistryFactory;
 
     public DomainDiscoveryService(BundleContext context) {
         super(context);
@@ -43,9 +43,9 @@ public class DomainDiscoveryService extends AbstractDiscoveryService implements
     public void start() {
         super.start();
         getExtensionPointRegistry();
-        this.endpointRegistry =
-            registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(EndpointRegistry.class);
-        this.endpointRegistry.addListener(this);
+        this.domainRegistryFactory =
+            registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(DomainRegistryFactory.class);
+        domainRegistryFactory.addListener(this);
     }
 
     public void endpointAdded(Endpoint endpoint) {
@@ -102,7 +102,7 @@ public class DomainDiscoveryService extends AbstractDiscoveryService implements
     }
 
     public void stop() {
-        endpointRegistry.removeListener(this);
+        domainRegistryFactory.removeListener(this);
         super.stop();
     }