5 files changed, 23 insertions, 23 deletions
diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java
index 7caf3e4841..9bf5f4c21a 100644
--- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java
+++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java
@@ -29,14 +29,14 @@ import javax.xml.namespace.QName;
 import org.apache.tuscany.sca.common.xml.dom.DOMHelper;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.endpoint.hazelcast.HazelcastEndpointRegistry;
+import org.apache.tuscany.sca.endpoint.hazelcast.HazelcastDomainRegistry;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.interfacedef.util.FaultException;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.invocation.MessageFactory;
 import org.apache.tuscany.sca.runtime.DomainRegistryFactory;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
 import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory;
 import org.oasisopen.sca.ServiceRuntimeException;
 import org.w3c.dom.Document;
@@ -48,7 +48,7 @@ import com.hazelcast.core.Member;
 
 public class ReferenceInvoker implements Invoker {
 
-    HazelcastEndpointRegistry hzRegistry;
+    HazelcastDomainRegistry hzRegistry;
     DOMHelper domHelper;
     String serviceURI;
     private Operation operation;
@@ -58,9 +58,9 @@ public class ReferenceInvoker implements Invoker {
         this.serviceURI = serviceURI;
         this.operation = operation;
         DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionsRegistry);
-        for (EndpointRegistry r : domainRegistryFactory.getEndpointRegistries()) {
-            if (r instanceof HazelcastEndpointRegistry) {
-                hzRegistry = (HazelcastEndpointRegistry)r;
+        for (DomainRegistry r : domainRegistryFactory.getEndpointRegistries()) {
+            if (r instanceof HazelcastDomainRegistry) {
+                hzRegistry = (HazelcastDomainRegistry)r;
                 break;
             }
         }
diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistry.java
index b7e661c1ee..7d65a5fe57 100644
--- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
+++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistry.java
@@ -60,9 +60,9 @@ import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
-import org.apache.tuscany.sca.runtime.BaseEndpointRegistry;
+import org.apache.tuscany.sca.runtime.BaseDomainRegistry;
 import org.apache.tuscany.sca.runtime.ContributionListener;
-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;
 import org.apache.tuscany.sca.runtime.RuntimeProperties;
@@ -87,10 +87,10 @@ import com.hazelcast.core.Transaction;
 import com.hazelcast.nio.Address;
 
 /**
- * An EndpointRegistry using a Hazelcast
+ * An DomainRegistry using a Hazelcast
  */
-public class HazelcastEndpointRegistry extends BaseEndpointRegistry implements EndpointRegistry, LifeCycleListener, EntryListener<String, Endpoint>, MembershipListener {
-    private final static Logger logger = Logger.getLogger(HazelcastEndpointRegistry.class.getName());
+public class HazelcastDomainRegistry extends BaseDomainRegistry implements DomainRegistry, LifeCycleListener, EntryListener<String, Endpoint>, MembershipListener {
+    private final static Logger logger = Logger.getLogger(HazelcastDomainRegistry.class.getName());
 
     private HazelcastInstance hazelcastInstance;
 
@@ -108,13 +108,13 @@ public class HazelcastEndpointRegistry extends BaseEndpointRegistry implements E
     protected Object shutdownMutex = new Object();
     protected Properties properties;
 
-    public HazelcastEndpointRegistry(ExtensionPointRegistry registry, Properties properties, String endpointRegistryURI, String domainURI) {
+    public HazelcastDomainRegistry(ExtensionPointRegistry registry, Properties properties, String endpointRegistryURI, String domainURI) {
         super(registry, null, endpointRegistryURI, domainURI);
         this.assemblyFactory = registry.getExtensionPoint(FactoryExtensionPoint.class).getFactory(AssemblyFactory.class);
         this.properties = properties;
     }
 
-    public HazelcastEndpointRegistry(ExtensionPointRegistry registry,
+    public HazelcastDomainRegistry(ExtensionPointRegistry registry,
                                      Map<String, String> attributes,
                                      String domainRegistryURI,
                                      String domainURI) {
diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java
index 291553705b..a96648d365 100644
--- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java
+++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java
@@ -24,7 +24,7 @@ import java.util.Properties;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.runtime.BaseDomainRegistryFactory;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
 import org.apache.tuscany.sca.runtime.RuntimeProperties;
 
 /**
@@ -38,9 +38,9 @@ public class HazelcastDomainRegistryFactory extends BaseDomainRegistryFactory {
         super(registry);
     }
 
-    protected EndpointRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) {
+    protected DomainRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) {
         Properties properties = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(RuntimeProperties.class).getProperties();
-        return new HazelcastEndpointRegistry(registry, properties, endpointRegistryURI, domainURI);
+        return new HazelcastDomainRegistry(registry, properties, endpointRegistryURI, domainURI);
     }
 
     public String[] getSupportedSchemes() {
diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java
index ad4d6d9e64..f6a5b487e4 100644
--- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java
+++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.endpoint.hazelcast.client;
 
 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 HazelcastClientDomainRegistryFactory extends BaseDomainRegistryFact
         super(registry);
     }
 
-    protected EndpointRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) {
-        EndpointRegistry endpointRegistry =
+    protected DomainRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) {
+        DomainRegistry domainRegistry =
             new HazelcastClientEndpointRegistry(registry, null, endpointRegistryURI, domainURI);
-        return endpointRegistry;
+        return domainRegistry;
     }
 
     public String[] getSupportedSchemes() {
diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
index 4f1820951a..ce1075f207 100644
--- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
+++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.endpoint.hazelcast.HazelcastEndpointRegistry;
+import org.apache.tuscany.sca.endpoint.hazelcast.HazelcastDomainRegistry;
 import org.apache.tuscany.sca.endpoint.hazelcast.RegistryConfig;
 import org.apache.tuscany.sca.runtime.RuntimeProperties;
 
@@ -38,9 +38,9 @@ import com.hazelcast.client.HazelcastClient;
 import com.hazelcast.core.HazelcastInstance;
 
 /**
- * An EndpointRegistry using a Hazelcast Native Client
+ * An DomainRegistry using a Hazelcast Native Client
  */
-public class HazelcastClientEndpointRegistry extends HazelcastEndpointRegistry {
+public class HazelcastClientEndpointRegistry extends HazelcastDomainRegistry {
 
     RegistryConfig rc;
     HazelcastClient hazelcastClient;