4 files changed, 19 insertions, 19 deletions
diff --git a/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java b/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java
index cf275bd50f..e94b710186 100644
--- a/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java
+++ b/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java
@@ -51,18 +51,18 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.LifeCycleListener;
 import org.apache.tuscany.sca.endpoint.tribes.AbstractReplicatedMap.MapEntry;
 import org.apache.tuscany.sca.endpoint.tribes.MapStore.MapListener;
-import org.apache.tuscany.sca.runtime.BaseEndpointRegistry;
+import org.apache.tuscany.sca.runtime.BaseDomainRegistry;
 import org.apache.tuscany.sca.runtime.DomainRegistryURI;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
 import org.apache.tuscany.sca.runtime.InstalledContribution;
 import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
 
 /**
- * A replicated EndpointRegistry based on Apache Tomcat Tribes
+ * A replicated DomainRegistry based on Apache Tomcat Tribes
  */
-public class ReplicatedEndpointRegistry extends BaseEndpointRegistry implements EndpointRegistry, LifeCycleListener,
+public class ReplicatedDomainRegistry extends BaseDomainRegistry implements DomainRegistry, LifeCycleListener,
     MapListener {
-    private final static Logger logger = Logger.getLogger(ReplicatedEndpointRegistry.class.getName());
+    private final static Logger logger = Logger.getLogger(ReplicatedDomainRegistry.class.getName());
     private static final String MULTICAST_ADDRESS = "228.0.0.100";
     private static final int MULTICAST_PORT = 50000;
 
@@ -103,7 +103,7 @@ public class ReplicatedEndpointRegistry extends BaseEndpointRegistry implements
         return channel;
     }
 
-    public ReplicatedEndpointRegistry(ExtensionPointRegistry registry,
+    public ReplicatedDomainRegistry(ExtensionPointRegistry registry,
                                       Map<String, String> attributes,
                                       String domainRegistryURI,
                                       String domainURI) {
@@ -221,7 +221,7 @@ public class ReplicatedEndpointRegistry extends BaseEndpointRegistry implements
         GroupChannel channel = createChannel(address, port, bind);
         map =
             new ReplicatedMap(null, channel, timeout, this.domainURI,
-                              new ClassLoader[] {ReplicatedEndpointRegistry.class.getClassLoader()});
+                              new ClassLoader[] {ReplicatedDomainRegistry.class.getClassLoader()});
         map.addListener(this);
 
         if (noMultiCast) {
diff --git a/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java
index 91314b4c37..d0beb95141 100644
--- a/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java
+++ b/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.endpoint.tribes;
 
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.runtime.BaseDomainRegistryFactory;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
 
 /**
  * The utility responsible for finding the endpoint regstry by the scheme and creating instances for the
@@ -37,10 +37,10 @@ public class TribesDomainRegistryFactory extends BaseDomainRegistryFactory {
         super(registry);
     }
 
-    protected EndpointRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) {
-        EndpointRegistry endpointRegistry =
-            new ReplicatedEndpointRegistry(registry, null, endpointRegistryURI, domainURI);
-        return endpointRegistry;
+    protected DomainRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) {
+        DomainRegistry domainRegistry =
+            new ReplicatedDomainRegistry(registry, null, endpointRegistryURI, domainURI);
+        return domainRegistry;
     }
 
     public String[] getSupportedSchemes() {
diff --git a/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java b/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java
index c28a303070..b72d8e5de3 100644
--- a/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java
+++ b/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java
@@ -69,7 +69,7 @@ public class MultiRegTestCase implements EndpointListener {
         attrs1.put("receiverPort", port1);
         attrs1.put("receiverAutoBind", range);
         // attrs1.put("routes", host + ":" + port2 + " " + host + ":" + port3);
-        ReplicatedEndpointRegistry reg1 = new ReplicatedEndpointRegistry(extensionPoints, attrs1, "foo", "bar");
+        ReplicatedDomainRegistry reg1 = new ReplicatedDomainRegistry(extensionPoints, attrs1, "foo", "bar");
         reg1.addListener(this);
         reg1.start();
 
@@ -79,7 +79,7 @@ public class MultiRegTestCase implements EndpointListener {
         attrs2.put("receiverPort", port2);
         attrs2.put("receiverAutoBind", range);
         // attrs2.put("routes", host + ":"+port1);
-        ReplicatedEndpointRegistry reg2 = new ReplicatedEndpointRegistry(extensionPoints, attrs2, "foo", "bar");
+        ReplicatedDomainRegistry reg2 = new ReplicatedDomainRegistry(extensionPoints, attrs2, "foo", "bar");
         reg2.addListener(this);
         reg2.start();
 
@@ -89,7 +89,7 @@ public class MultiRegTestCase implements EndpointListener {
         attrs3.put("receiverPort", port3);
         attrs3.put("receiverAutoBind", range);
         // attrs3.put("routes", host + ":"+port1);
-        ReplicatedEndpointRegistry reg3 = new ReplicatedEndpointRegistry(extensionPoints, attrs3, "foo", "bar");
+        ReplicatedDomainRegistry reg3 = new ReplicatedDomainRegistry(extensionPoints, attrs3, "foo", "bar");
         reg3.addListener(this);
         reg3.start();
 
@@ -126,7 +126,7 @@ public class MultiRegTestCase implements EndpointListener {
         System.out.println(); // closed
     }
 
-    private Endpoint assertExists(ReplicatedEndpointRegistry reg, String uri) throws InterruptedException {
+    private Endpoint assertExists(ReplicatedDomainRegistry reg, String uri) throws InterruptedException {
         Endpoint ep = null;
         int count = 0;
         while (ep == null && count < 15) {
diff --git a/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java b/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java
index 99c5472c82..f469983c76 100644
--- a/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java
+++ b/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java
@@ -43,7 +43,7 @@ public class ReplicatedEndpointRegistryTestCase {
 
         Map<String, String> attrs = new HashMap<String, String>();
         attrs.put("bind", "127.0.0.1");
-        ReplicatedEndpointRegistry ep1 = new ReplicatedEndpointRegistry(extensionPoints, attrs, "foo", "bar");
+        ReplicatedDomainRegistry ep1 = new ReplicatedDomainRegistry(extensionPoints, attrs, "foo", "bar");
         System.out.println("ep1 is: " + ep1);
         ep1.start();
 
@@ -56,7 +56,7 @@ public class ReplicatedEndpointRegistryTestCase {
         System.out.println("EP1 in Registry 1: " + e1p);
         Assert.assertNotNull(e1p);
 
-        ReplicatedEndpointRegistry ep2 = new ReplicatedEndpointRegistry(extensionPoints, attrs, "foo", "bar");
+        ReplicatedDomainRegistry ep2 = new ReplicatedDomainRegistry(extensionPoints, attrs, "foo", "bar");
         System.out.println("ep2 is: " + ep2);
         ep2.start();
         Thread.sleep(5000);
@@ -65,7 +65,7 @@ public class ReplicatedEndpointRegistryTestCase {
         System.out.println("EP1 in Registry 2: " + e1p2);
         Assert.assertNotNull(e1p2);
 
-        ReplicatedEndpointRegistry ep3 = new ReplicatedEndpointRegistry(extensionPoints, attrs, "foo", "bar");
+        ReplicatedDomainRegistry ep3 = new ReplicatedDomainRegistry(extensionPoints, attrs, "foo", "bar");
         System.out.println("ep3 is: " + ep3);
         ep3.start();
         Thread.sleep(5000);