tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r1103629 [1/2] - in /tuscany/sca-java-2.x/trunk/modules: binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/ binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/ core-spi...
Date Mon, 16 May 2011 07:22:00 GMT
Author: antelder
Date: Mon May 16 07:21:58 2011
New Revision: 1103629

URL: http://svn.apache.org/viewvc?rev=1103629&view=rev
Log:
Rename EndpointRegistry to DomainRegistry. Doing this has been brought up lots of times in the past just no one ever got around to it. It effects quite a few classes but its a relatively trivial rename and i don't think it should impact on anyone too much

Added:
    tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java
      - copied, changed from r1103521, tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
    tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java
      - copied, changed from r1103521, tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
    tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java
      - copied, changed from r1103524, tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java
    tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistry.java
      - copied, changed from r1103531, tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
    tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java
      - copied, changed from r1103525, tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java
Removed:
    tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
    tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
    tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java
    tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
    tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java
Modified:
    tuscany/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
    tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
    tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
    tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java
    tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java
    tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java
    tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java
    tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
    tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java
    tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
    tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
    tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java
    tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
    tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
    tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java
    tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java
    tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java
    tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
    tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java
    tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java
    tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
    tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
    tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl2.java
    tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/ServiceHelper.java
    tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java
    tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java
    tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java
    tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java
    tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
    tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RemoteServiceInvocationHandler.java
    tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RuntimeUtils.java
    tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
    tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
    tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java
    tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java

Modified: tuscany/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java Mon May 16 07:21:58 2011
@@ -39,7 +39,7 @@ import org.apache.tuscany.sca.policy.Int
 import org.apache.tuscany.sca.policy.PolicySet;
 import org.apache.tuscany.sca.provider.PolicyProvider;
 import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
 import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
 import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
 
@@ -153,7 +153,7 @@ public class TestRuntimeWire implements 
     }
 
 
-    public void bind(ExtensionPointRegistry registry, EndpointRegistry endpointRegistry) {
+    public void bind(ExtensionPointRegistry registry, DomainRegistry domainRegistry) {
         // TODO Auto-generated method stub
         
     }

Modified: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java Mon May 16 07:21:58 2011
@@ -63,10 +63,10 @@ public class RuntimeSCAServiceBindingPro
         // find if the node config is for distributed endpoints
         // TODO: temp, need a much better way to do this
         DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionPoints);
-        Collection<EndpointRegistry> eprs = domainRegistryFactory.getEndpointRegistries();
+        Collection<DomainRegistry> eprs = domainRegistryFactory.getEndpointRegistries();
         if (eprs.size() > 0) {
             String eprName = eprs.iterator().next().getClass().getName();
-            return !eprName.equals("org.apache.tuscany.sca.core.assembly.impl.EndpointRegistryImpl");
+            return !eprName.equals("org.apache.tuscany.sca.core.assembly.impl.DomainRegistryImpl");
         }
         return false;
     }

Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java Mon May 16 07:21:58 2011
@@ -28,18 +28,18 @@ import org.apache.tuscany.sca.assembly.E
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.definitions.Definitions;
 import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentContext;
 
 /**
- * The context associated with the Node that provides access to ExtensionPointRegistry and EndpointRegistry
+ * The context associated with the Node that provides access to ExtensionPointRegistry and DomainRegistry
  * 
  * @version $Rev$ $Date$
  */
 public class CompositeContext {
     protected ExtensionPointRegistry extensionPointRegistry;
-    protected EndpointRegistry endpointRegistry;
+    protected DomainRegistry domainRegistry;
     protected ComponentContextFactory componentContextFactory;
     protected Composite domainComposite;
     protected String nodeURI;
@@ -49,13 +49,13 @@ public class CompositeContext {
     protected Map<String, Object> attributes = new HashMap<String, Object>();
 
     public CompositeContext(ExtensionPointRegistry registry,
-                            EndpointRegistry endpointRegistry,
+                            DomainRegistry domainRegistry,
                             Composite domainComposite,
                             String domainURI,
                             String nodeURI,
                             Definitions systemDefinitions) {
         this.extensionPointRegistry = registry;
-        this.endpointRegistry = endpointRegistry;
+        this.domainRegistry = domainRegistry;
         ContextFactoryExtensionPoint contextFactories = registry.getExtensionPoint(ContextFactoryExtensionPoint.class);
         this.componentContextFactory = contextFactories.getFactory(ComponentContextFactory.class);
         this.domainComposite = domainComposite;
@@ -64,8 +64,8 @@ public class CompositeContext {
         this.systemDefinitions = systemDefinitions;
     }
 
-    public CompositeContext(ExtensionPointRegistry registry, EndpointRegistry endpointRegistry) {
-        this(registry, endpointRegistry, null, "default", "default", null);
+    public CompositeContext(ExtensionPointRegistry registry, DomainRegistry domainRegistry) {
+        this(registry, domainRegistry, null, "default", "default", null);
     }
 
     /**
@@ -119,11 +119,11 @@ public class CompositeContext {
     }
 
     /**
-     * Get the EndpointRegistry
-     * @return The EndpointRegistry for this node
+     * Get the DomainRegistry
+     * @return The DomainRegistry for this node
      */
-    public EndpointRegistry getEndpointRegistry() {
-        return endpointRegistry;
+    public DomainRegistry getEndpointRegistry() {
+        return domainRegistry;
     }
 
     public Composite getDomainComposite() {

Copied: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java (from r1103521, tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java?p2=tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java&p1=tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java&r1=1103521&r2=1103629&rev=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java Mon May 16 07:21:58 2011
@@ -32,11 +32,11 @@ import org.apache.tuscany.sca.core.Exten
 import org.apache.tuscany.sca.core.LifeCycleListener;
 
 /**
- * A replicated EndpointRegistry based on Apache Tomcat Tribes
+ * A replicated DomainRegistry based on Apache Tomcat Tribes
  * @tuscany.spi.extension.inheritfrom
  */
-public abstract class BaseEndpointRegistry implements EndpointRegistry, LifeCycleListener {
-    protected final static Logger logger = Logger.getLogger(BaseEndpointRegistry.class.getName());
+public abstract class BaseDomainRegistry implements DomainRegistry, LifeCycleListener {
+    protected final static Logger logger = Logger.getLogger(BaseDomainRegistry.class.getName());
 
     protected String domainRegistryURI;
     protected String domainURI;
@@ -47,7 +47,7 @@ public abstract class BaseEndpointRegist
     protected ExtensionPointRegistry registry;
     protected Map<String, String> attributes;
 
-    public BaseEndpointRegistry(ExtensionPointRegistry registry,
+    public BaseDomainRegistry(ExtensionPointRegistry registry,
                                 Map<String, String> attributes,
                                 String domainRegistryURI,
                                 String domainURI) {

Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java Mon May 16 07:21:58 2011
@@ -35,7 +35,7 @@ import org.apache.tuscany.sca.core.LifeC
  */
 public abstract class BaseDomainRegistryFactory implements DomainRegistryFactory, LifeCycleListener {
     protected ExtensionPointRegistry registry;
-    protected Map<Object, EndpointRegistry> endpointRegistries = new ConcurrentHashMap<Object, EndpointRegistry>();
+    protected Map<Object, DomainRegistry> domainRegistries = new ConcurrentHashMap<Object, DomainRegistry>();
     protected List<EndpointListener> listeners = new ArrayList<EndpointListener>();
 
     /**
@@ -49,54 +49,54 @@ public abstract class BaseDomainRegistry
     public void start() {
     }
 
-    public synchronized EndpointRegistry getEndpointRegistry(String endpointRegistryURI, String domainURI) {
+    public synchronized DomainRegistry getEndpointRegistry(String endpointRegistryURI, String domainURI) {
         if (endpointRegistryURI == null) {
             endpointRegistryURI = domainURI;
         }
 
         Object key = getKey(endpointRegistryURI, domainURI);
 
-        EndpointRegistry endpointRegistry = endpointRegistries.get(key);
-        if (endpointRegistry != null) {
-            return endpointRegistry;
+        DomainRegistry domainRegistry = domainRegistries.get(key);
+        if (domainRegistry != null) {
+            return domainRegistry;
         }
 
-        endpointRegistry = createEndpointRegistry(endpointRegistryURI, domainURI);
+        domainRegistry = createEndpointRegistry(endpointRegistryURI, domainURI);
 
-        if (endpointRegistry instanceof LifeCycleListener) {
-            ((LifeCycleListener)endpointRegistry).start();
+        if (domainRegistry instanceof LifeCycleListener) {
+            ((LifeCycleListener)domainRegistry).start();
         }
 
         for (EndpointListener listener : listeners) {
-            endpointRegistry.addListener(listener);
+            domainRegistry.addListener(listener);
         }
-        endpointRegistries.put(key, endpointRegistry);
-        return endpointRegistry;
+        domainRegistries.put(key, domainRegistry);
+        return domainRegistry;
     }
 
     protected Object getKey(String endpointRegistryURI, String domainURI) {
         return endpointRegistryURI + "," + domainURI;
     }
 
-    protected abstract EndpointRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI);
+    protected abstract DomainRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI);
 
     public void stop() {
-        for (EndpointRegistry endpointRegistry : endpointRegistries.values()) {
-            if (endpointRegistry instanceof LifeCycleListener) {
-                ((LifeCycleListener)endpointRegistry).stop();
+        for (DomainRegistry domainRegistry : domainRegistries.values()) {
+            if (domainRegistry instanceof LifeCycleListener) {
+                ((LifeCycleListener)domainRegistry).stop();
             }
         }
-        endpointRegistries.clear();
+        domainRegistries.clear();
         listeners.clear();
     }
 
-    public synchronized Collection<EndpointRegistry> getEndpointRegistries() {
-        return new ArrayList<EndpointRegistry>(endpointRegistries.values());
+    public synchronized Collection<DomainRegistry> getEndpointRegistries() {
+        return new ArrayList<DomainRegistry>(domainRegistries.values());
     }
 
     public synchronized void addListener(EndpointListener listener) {
         listeners.add(listener);
-        for (EndpointRegistry registry : endpointRegistries.values()) {
+        for (DomainRegistry registry : domainRegistries.values()) {
             registry.addListener(listener);
         }
     }
@@ -107,7 +107,7 @@ public abstract class BaseDomainRegistry
 
     public synchronized void removeListener(EndpointListener listener) {
         listeners.remove(listener);
-        for (EndpointRegistry registry : endpointRegistries.values()) {
+        for (DomainRegistry registry : domainRegistries.values()) {
             registry.removeListener(listener);
         }
     }

Copied: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java (from r1103521, tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java?p2=tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java&p1=tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java&r1=1103521&r2=1103629&rev=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java Mon May 16 07:21:58 2011
@@ -30,10 +30,10 @@ import org.apache.tuscany.sca.assembly.E
 import org.apache.tuscany.sca.assembly.EndpointReference;
 
 /**
- * The EndpointRegistry holds the active service endpoints for the SCA domain
+ * The DomainRegistry holds the active service endpoints for the SCA domain
  * @tuscany.spi.extension.inheritfrom
  */
-public interface EndpointRegistry {
+public interface DomainRegistry {
     /**
      * Add an enpoint to the registry. If the endpoint URI is the same as an existing endpoint in the registry,
      * the existing one will be updated

Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java Mon May 16 07:21:58 2011
@@ -27,19 +27,19 @@ import java.util.Collection;
  */
 public interface DomainRegistryFactory {
     /**
-     * Get the EndpointRegistry for the given registry URI and domain URI
+     * Get the DomainRegistry for the given registry URI and domain URI
      * @param endpointRegistryURI A URI can be used to connect to the registry, such as vm://localhost
      * or multicast://200.0.100.200:50000/...
      * @param domainURI The domain URI
      * @return
      */
-    EndpointRegistry getEndpointRegistry(String endpointRegistryURI, String domainURI);
+    DomainRegistry getEndpointRegistry(String endpointRegistryURI, String domainURI);
 
     /**
      * Return all active endpoint registries
      * @return
      */
-    Collection<EndpointRegistry> getEndpointRegistries();
+    Collection<DomainRegistry> getEndpointRegistries();
 
     /**
      * Add an EndpointListener

Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java Mon May 16 07:21:58 2011
@@ -24,30 +24,30 @@ import org.apache.tuscany.sca.assembly.b
 
 /**
  * A utility responsible for resolving the endpoint reference against a matching endpoint published
- * to the EndpointRegistry
+ * to the DomainRegistry
  */
 public interface EndpointReferenceBinder {
     
     /**
-     * @param endpointRegistry
+     * @param domainRegistry
      * @param endpointReference
      * @return
      */
-    void bindBuildTime(EndpointRegistry endpointRegistry, EndpointReference endpointReference, BuilderContext builderContext);
+    void bindBuildTime(DomainRegistry domainRegistry, EndpointReference endpointReference, BuilderContext builderContext);
 
     
     /**
-     * @param endpointRegistry
+     * @param domainRegistry
      * @param endpointReference
      * @return
      */
-    void bindRunTime(EndpointRegistry endpointRegistry, EndpointReference endpointReference);
+    void bindRunTime(DomainRegistry domainRegistry, EndpointReference endpointReference);
     
     /**
      * 
-     * @param endpointRegistry
+     * @param domainRegistry
      * @param endpointReference
      * @return
      */
-    boolean isOutOfDate(EndpointRegistry endpointRegistry, EndpointReference endpointReference);
+    boolean isOutOfDate(DomainRegistry domainRegistry, EndpointReference endpointReference);
 }

Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java Mon May 16 07:21:58 2011
@@ -63,15 +63,15 @@ public class ExtensibleDomainRegistryFac
         }
     }
 
-    public Collection<EndpointRegistry> getEndpointRegistries() {
-        List<EndpointRegistry> registries = new ArrayList<EndpointRegistry>();
+    public Collection<DomainRegistry> getEndpointRegistries() {
+        List<DomainRegistry> registries = new ArrayList<DomainRegistry>();
         for (DomainRegistryFactory factory : factories.getDomainRegistryFactories()) {
             registries.addAll(factory.getEndpointRegistries());
         }
         return registries;
     }
 
-    public EndpointRegistry getEndpointRegistry(String endpointRegistryURI, String domainURI) {
+    public DomainRegistry getEndpointRegistry(String endpointRegistryURI, String domainURI) {
         if (endpointRegistryURI == null) {
             endpointRegistryURI = factories.getDomainRegistryMapping().get(domainURI);
             if (endpointRegistryURI == null) {
@@ -84,9 +84,9 @@ public class ExtensibleDomainRegistryFac
             
             // See if there is a previously created registry for that domain
             for (DomainRegistryFactory factory : factories.getDomainRegistryFactories()) {
-                for (EndpointRegistry endpointRegistry : factory.getEndpointRegistries()) {
-                    if (endpointRegistry.getDomainURI().equals(domainURI)) {
-                        return endpointRegistry;
+                for (DomainRegistry domainRegistry : factory.getEndpointRegistries()) {
+                    if (domainRegistry.getDomainURI().equals(domainURI)) {
+                        return domainRegistry;
                     }
                 }
             }
@@ -99,15 +99,15 @@ public class ExtensibleDomainRegistryFac
         for (DomainRegistryFactory factory : factories.getDomainRegistryFactories()) {
             String[] schemes = factory.getSupportedSchemes();
             if (schemes != null && Arrays.asList(schemes).contains(scheme)) {
-                EndpointRegistry endpointRegistry = factory.getEndpointRegistry(endpointRegistryURI, domainURI);
-                if (endpointRegistry == null) {
+                DomainRegistry domainRegistry = factory.getEndpointRegistry(endpointRegistryURI, domainURI);
+                if (domainRegistry == null) {
                     continue;
                 } else {
-                    return endpointRegistry;
+                    return domainRegistry;
                 }
             }
         }
-        throw new ServiceRuntimeException("No EndpointRegistry can support " + endpointRegistryURI);
+        throw new ServiceRuntimeException("No DomainRegistry can support " + endpointRegistryURI);
     }
 
     public void removeListener(EndpointListener listener) {

Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java Mon May 16 07:21:58 2011
@@ -47,9 +47,9 @@ public interface Invocable {
      * Bind the invocable to the extension point registry and endpoint registry. This is typically
      * called after the endpoint or endpoint reference is deserialized
      * @param registry
-     * @param endpointRegistry
+     * @param domainRegistry
      */
-    void bind(ExtensionPointRegistry registry, EndpointRegistry endpointRegistry);
+    void bind(ExtensionPointRegistry registry, DomainRegistry domainRegistry);
     
     /**
      * Get the associated composite context

Copied: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java (from r1103524, tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java?p2=tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java&p1=tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java&r1=1103524&r2=1103629&rev=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java Mon May 16 07:21:58 2011
@@ -36,18 +36,18 @@ import org.apache.tuscany.sca.assembly.E
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.LifeCycleListener;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-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.EndpointListener;
-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.RuntimeProperties;
 
 /**
- * A EndpointRegistry implementation that sees registrations from the same JVM
+ * A DomainRegistry implementation that sees registrations from the same JVM
  */
-public class EndpointRegistryImpl extends BaseEndpointRegistry implements EndpointRegistry, LifeCycleListener {
-    private final Logger logger = Logger.getLogger(EndpointRegistryImpl.class.getName());
+public class DomainRegistryImpl extends BaseDomainRegistry implements DomainRegistry, LifeCycleListener {
+    private final Logger logger = Logger.getLogger(DomainRegistryImpl.class.getName());
 
     private List<Endpoint> endpoints = new ArrayList<Endpoint>();
     private Map<String, Map<QName, Composite>> runningComposites = new HashMap<String, Map<QName, Composite>>();
@@ -55,7 +55,7 @@ public class EndpointRegistryImpl extend
     
     protected boolean quietLogging;
 
-    public EndpointRegistryImpl(ExtensionPointRegistry extensionPoints, String endpointRegistryURI, String domainURI) {
+    public DomainRegistryImpl(ExtensionPointRegistry extensionPoints, String endpointRegistryURI, String domainURI) {
         super(extensionPoints, null, endpointRegistryURI, domainURI);
         Properties runtimeProps = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class).getUtility(RuntimeProperties.class).getProperties();
         quietLogging = Boolean.parseBoolean(runtimeProps.getProperty(RuntimeProperties.QUIET_LOGGING));

Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java Mon May 16 07:21:58 2011
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.core.asse
 
 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 LocalDomainRegistryFactory 
         super(registry);
     }
 
-    protected EndpointRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) {
-        EndpointRegistry endpointRegistry =
-            new EndpointRegistryImpl(registry, endpointRegistryURI, domainURI);
-        return endpointRegistry;
+    protected DomainRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) {
+        DomainRegistry domainRegistry =
+            new DomainRegistryImpl(registry, endpointRegistryURI, domainURI);
+        return domainRegistry;
     }
 
     public String[] getSupportedSchemes() {

Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java Mon May 16 07:21:58 2011
@@ -95,7 +95,7 @@ import org.apache.tuscany.sca.provider.P
 import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
 import org.apache.tuscany.sca.provider.ServiceBindingProvider;
 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.EndpointSerializer;
 import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
@@ -181,9 +181,9 @@ public class RuntimeEndpointImpl extends
         bind(compositeContext.getExtensionPointRegistry(), compositeContext.getEndpointRegistry());
     }
 
-    public void bind(ExtensionPointRegistry registry, EndpointRegistry endpointRegistry) {
+    public void bind(ExtensionPointRegistry registry, DomainRegistry domainRegistry) {
         if (compositeContext == null) {
-            compositeContext = new CompositeContext(registry, endpointRegistry);
+            compositeContext = new CompositeContext(registry, domainRegistry);
         }
 
         // if interfaceContractMapper is already initialized then all the rest will be too
@@ -435,8 +435,8 @@ public class RuntimeEndpointImpl extends
     	// Store the new callback EPR into the Endpoint
     	this.getCallbackEndpointReferences().add(asyncEPR);
     	
-    	// Also store the callback EPR into the EndpointRegistry
-    	EndpointRegistry epReg = getEndpointRegistry( registry );
+    	// Also store the callback EPR into the DomainRegistry
+    	DomainRegistry epReg = getEndpointRegistry( registry );
     	if( epReg != null ) epReg.addEndpointReference(asyncEPR);
     } // end method createAsyncServerCallback
     
@@ -931,7 +931,7 @@ public class RuntimeEndpointImpl extends
                     this.interfaceContractMapper = utilities.getUtility(InterfaceContractMapper.class);
                     this.serializer = utilities.getUtility(EndpointSerializer.class);
                     RuntimeEndpointImpl ep = (RuntimeEndpointImpl)serializer.readEndpoint(xml);
-                    // Find the actual Endpoint in the EndpointRegistry
+                    // Find the actual Endpoint in the DomainRegistry
                     ep = findActualEP( ep, registry );
                     if( ep != null ){
                         copyFrom( ep );
@@ -943,19 +943,19 @@ public class RuntimeEndpointImpl extends
     } // end method resolve
 
     /**
-     * Find the actual Endpoint in the EndpointRegistry which corresponds to the configuration described
+     * Find the actual Endpoint in the DomainRegistry which corresponds to the configuration described
      * in a deserialized Endpoint 
      * @param ep The deserialized endpoint
      * @param registry - the main extension point Registry
-     * @return the corresponding Endpoint from the EndpointRegistry, or null if no match can be found
+     * @return the corresponding Endpoint from the DomainRegistry, or null if no match can be found
      */
     private RuntimeEndpointImpl findActualEP(RuntimeEndpointImpl ep,
 			ExtensionPointRegistry registry) {
-		EndpointRegistry endpointRegistry = getEndpointRegistry( registry );
+		DomainRegistry domainRegistry = getEndpointRegistry( registry );
         
-        if( endpointRegistry == null ) return null;
+        if( domainRegistry == null ) return null;
         
-        for( Endpoint endpoint : endpointRegistry.findEndpoint(ep.getURI()) ) {
+        for( Endpoint endpoint : domainRegistry.findEndpoint(ep.getURI()) ) {
         	// TODO: For the present, simply return the first matching endpoint
         	return (RuntimeEndpointImpl) endpoint;
         } // end for
@@ -964,19 +964,19 @@ public class RuntimeEndpointImpl extends
 	} // end method findActualEP
     
     /**
-     * Get the EndpointRegistry
+     * Get the DomainRegistry
      * @param registry - the ExtensionPoint registry
-     * @return the EndpointRegistry - will be null if the EndpointRegistry cannot be found
+     * @return the DomainRegistry - will be null if the DomainRegistry cannot be found
      */
-    private EndpointRegistry getEndpointRegistry( ExtensionPointRegistry registry) {
+    private DomainRegistry getEndpointRegistry( ExtensionPointRegistry registry) {
         DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(registry);
         
         if( domainRegistryFactory == null ) return null;
         
-        // TODO: For the moment, just use the first (and only!) EndpointRegistry...
-        EndpointRegistry endpointRegistry = (EndpointRegistry) domainRegistryFactory.getEndpointRegistries().toArray()[0];
+        // TODO: For the moment, just use the first (and only!) DomainRegistry...
+        DomainRegistry domainRegistry = (DomainRegistry) domainRegistryFactory.getEndpointRegistries().toArray()[0];
     	
-    	return endpointRegistry;
+    	return domainRegistry;
     } // end method 
 
 	public InterfaceContract getBindingInterfaceContract() {

Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java Mon May 16 07:21:58 2011
@@ -81,7 +81,7 @@ import org.apache.tuscany.sca.provider.P
 import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
 import org.apache.tuscany.sca.runtime.DomainRegistryFactory;
 import org.apache.tuscany.sca.runtime.EndpointReferenceBinder;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
 import org.apache.tuscany.sca.runtime.EndpointSerializer;
 import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
@@ -104,7 +104,7 @@ public class RuntimeEndpointReferenceImp
     private transient PhaseManager phaseManager;
     private transient MessageFactory messageFactory;
     private transient RuntimeInvoker invoker;
-    private transient EndpointRegistry endpointRegistry;
+    private transient DomainRegistry domainRegistry;
 
     private transient List<InvocationChain> chains;
     private transient Map<Operation, InvocationChain> invocationChainMap =
@@ -173,12 +173,12 @@ public class RuntimeEndpointReferenceImp
         bind(compositeContext.getExtensionPointRegistry(), compositeContext.getEndpointRegistry());
     }
 
-    public void bind(ExtensionPointRegistry registry, EndpointRegistry endpointRegistry) {
+    public void bind(ExtensionPointRegistry registry, DomainRegistry domainRegistry) {
         if (compositeContext == null) {
-            compositeContext = new CompositeContext(registry, endpointRegistry);
+            compositeContext = new CompositeContext(registry, domainRegistry);
         }
         this.registry = registry;
-        this.endpointRegistry = endpointRegistry;
+        this.domainRegistry = domainRegistry;
         UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
         this.eprBinder = utilities.getUtility(EndpointReferenceBinder.class);
         this.interfaceContractMapper = utilities.getUtility(InterfaceContractMapper.class);
@@ -427,7 +427,7 @@ public class RuntimeEndpointReferenceImp
     private void resolveEndpointReference() {
         resolve();
 
-        eprBinder.bindRunTime(endpointRegistry, this);
+        eprBinder.bindRunTime(domainRegistry, this);
 
         // start the binding provider
         final ReferenceBindingProvider bindingProvider = getBindingProvider();
@@ -539,7 +539,7 @@ public class RuntimeEndpointReferenceImp
 
     public boolean isOutOfDate() {
         resolve();
-        return eprBinder.isOutOfDate(endpointRegistry, this);
+        return eprBinder.isOutOfDate(domainRegistry, this);
     }
 
     public synchronized ReferenceBindingProvider getBindingProvider() {
@@ -648,7 +648,7 @@ public class RuntimeEndpointReferenceImp
                     UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
                     this.serializer = utilities.getUtility(EndpointSerializer.class);
                     RuntimeEndpointReferenceImpl epr = (RuntimeEndpointReferenceImpl)serializer.readEndpointReference(xml);
-                    // Find the actual Endpoint in the EndpointRegistry
+                    // Find the actual Endpoint in the DomainRegistry
                     epr = findActualEPR( epr, registry );
                     if( epr != null ){
                         copyFrom( epr );
@@ -660,23 +660,23 @@ public class RuntimeEndpointReferenceImp
     } // end method resolve
     
     /**
-     * Find the actual EndpointReference in the EndpointRegistry which corresponds to the configuration described
+     * Find the actual EndpointReference in the DomainRegistry which corresponds to the configuration described
      * in a deserialized EndpointReference 
      * @param ep The deserialized endpointReference
      * @param registry - the main extension point Registry
-     * @return the corresponding EndpointReference from the EndpointRegistry, or null if no match can be found
+     * @return the corresponding EndpointReference from the DomainRegistry, or null if no match can be found
      */
     private RuntimeEndpointReferenceImpl findActualEPR(RuntimeEndpointReferenceImpl epr,
 			ExtensionPointRegistry registry) {
-		// Get the EndpointRegistry
+		// Get the DomainRegistry
         DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(registry);
         if( domainRegistryFactory == null ) return null;
         
-        // TODO: For the moment, just use the first (and only!) EndpointRegistry...
-        EndpointRegistry endpointRegistry = (EndpointRegistry) domainRegistryFactory.getEndpointRegistries().toArray()[0];
-        if( endpointRegistry == null ) return null;
+        // TODO: For the moment, just use the first (and only!) DomainRegistry...
+        DomainRegistry domainRegistry = (DomainRegistry) domainRegistryFactory.getEndpointRegistries().toArray()[0];
+        if( domainRegistry == null ) return null;
         
-        for( EndpointReference epReference : endpointRegistry.getEndpointReferences() ) {
+        for( EndpointReference epReference : domainRegistry.getEndpointReferences() ) {
         	// TODO: For the present, simply return the first matching endpointReference
         	if( epReference.getURI().equals(epr.getURI()) ) {
         	    return (RuntimeEndpointReferenceImpl) epReference;

Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java Mon May 16 07:21:58 2011
@@ -37,7 +37,7 @@ import org.apache.tuscany.sca.invocation
 import org.apache.tuscany.sca.invocation.MessageFactory;
 import org.apache.tuscany.sca.provider.EndpointAsyncProvider;
 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.apache.tuscany.sca.runtime.RuntimeEndpoint;
 import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
@@ -70,7 +70,7 @@ public class AsyncResponseInvoker<T> imp
     private String endpointReferenceURI;
     private String domainURI;
 
-	private transient EndpointRegistry endpointRegistry;
+	private transient DomainRegistry domainRegistry;
 	private transient ExtensionPointRegistry registry;
     
     public AsyncResponseInvoker(RuntimeEndpoint requestEndpoint,
@@ -256,8 +256,8 @@ public class AsyncResponseInvoker<T> imp
      */
     private RuntimeEndpointReference retrieveEndpointReference(String uri) {
 		if( uri == null ) return null;
-    	if( endpointRegistry == null ) return null;
-		List<EndpointReference> refs = endpointRegistry.findEndpointReferences( uri );
+    	if( domainRegistry == null ) return null;
+		List<EndpointReference> refs = domainRegistry.findEndpointReferences( uri );
 		// If there is more than EndpointReference with the uri...
 		if( refs.isEmpty() ) return null;
 		// TODO: what if there is more than 1 EPR with the given URI?
@@ -266,37 +266,37 @@ public class AsyncResponseInvoker<T> imp
 
 	/**
      * Fetches the Endpoint identified by an endpoint URI
-     * - the Endpoint is retrieved from the EndpointRegistry 
+     * - the Endpoint is retrieved from the DomainRegistry 
      * @param uri - the URI of the Endpoint
      * @return - the Endpoint corresponding to the URI, or null if no Endpoint is found which has the
      * supplied URI
      */
 	private RuntimeEndpoint retrieveEndpoint(String uri) {
 		if( uri == null ) return null;
-		if( endpointRegistry == null ) endpointRegistry = getEndpointRegistry( uri );
-		if( endpointRegistry == null ) return null;
+		if( domainRegistry == null ) domainRegistry = getEndpointRegistry( uri );
+		if( domainRegistry == null ) return null;
 		// TODO what if more than one Endpoint gets returned??
-		return (RuntimeEndpoint) endpointRegistry.findEndpoint(uri).get(0);
+		return (RuntimeEndpoint) domainRegistry.findEndpoint(uri).get(0);
 	} // end method retrieveEndpoint
 
 	/**
-	 * Gets the EndpointRegistry which contains an Endpoint with the supplied URI
+	 * Gets the DomainRegistry which contains an Endpoint with the supplied URI
 	 * @param uri - The URI of an Endpoint
-	 * @return - the EndpointRegistry containing the Endpoint with the supplied URI - null if no
-	 *           such EndpointRegistry can be found
+	 * @return - the DomainRegistry containing the Endpoint with the supplied URI - null if no
+	 *           such DomainRegistry can be found
 	 */
-	private EndpointRegistry getEndpointRegistry(String uri) {
+	private DomainRegistry getEndpointRegistry(String uri) {
 		ExtensionPointRegistry registry   = null;
-		EndpointRegistry endpointRegistry = null;
+		DomainRegistry domainRegistry = null;
 		
 		CompositeContext context = CompositeContext.getCurrentCompositeContext();
 		if( context == null && requestEndpoint != null ) context = requestEndpoint.getCompositeContext();
 		if( context != null ) {
 			registry = context.getExtensionPointRegistry();
-			endpointRegistry = getEndpointRegistry( registry );
-			if( endpointRegistry != null ) {
+			domainRegistry = getEndpointRegistry( registry );
+			if( domainRegistry != null ) {
 				this.registry = registry;
-				return endpointRegistry;
+				return domainRegistry;
 			} // end if
 		} // end if
 		
@@ -304,14 +304,14 @@ public class AsyncResponseInvoker<T> imp
     	for(ExtensionPointRegistry r : ExtensionPointRegistryLocator.getExtensionPointRegistries()) {
                 registry = r;
     		if( registry != null ) {
-    			// Find the actual Endpoint in the EndpointRegistry
-        		endpointRegistry = getEndpointRegistry( registry );
+    			// Find the actual Endpoint in the DomainRegistry
+        		domainRegistry = getEndpointRegistry( registry );
                 
-                if( endpointRegistry != null ) {
-                    for( Endpoint endpoint : endpointRegistry.findEndpoint(uri) ) {
+                if( domainRegistry != null ) {
+                    for( Endpoint endpoint : domainRegistry.findEndpoint(uri) ) {
                     	// TODO: For the present, simply return the first registry with a matching endpoint
                     	this.registry = registry;
-                    	return endpointRegistry;
+                    	return domainRegistry;
                     } // end for
                 } // end if 
     		} // end if
@@ -321,27 +321,27 @@ public class AsyncResponseInvoker<T> imp
 	} // end method getEndpointRegistry
 	
     /**
-     * Get the EndpointRegistry
+     * Get the DomainRegistry
      * @param registry - the ExtensionPoint registry
-     * @return the EndpointRegistry - will be null if the EndpointRegistry cannot be found
+     * @return the DomainRegistry - will be null if the DomainRegistry cannot be found
      */
-    private EndpointRegistry getEndpointRegistry( ExtensionPointRegistry registry) {
+    private DomainRegistry getEndpointRegistry( ExtensionPointRegistry registry) {
         DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(registry);
         
         if( domainRegistryFactory == null ) return null;
         
         // Find the first endpoint registry that matches the domain name 
         if( domainURI != null ) {
-	        for( EndpointRegistry endpointRegistry : domainRegistryFactory.getEndpointRegistries() ) {
-	        	if( domainURI.equals( endpointRegistry.getDomainURI() ) ) return endpointRegistry;
+	        for( DomainRegistry domainRegistry : domainRegistryFactory.getEndpointRegistries() ) {
+	        	if( domainURI.equals( domainRegistry.getDomainURI() ) ) return domainRegistry;
 	        } // end for
         } // end if
         
-        // if there was no domainName to match, simply return the first EndpointRegistry if there is one...
+        // if there was no domainName to match, simply return the first DomainRegistry if there is one...
         
         if (domainRegistryFactory.getEndpointRegistries().size() > 0){
-            EndpointRegistry endpointRegistry = (EndpointRegistry) domainRegistryFactory.getEndpointRegistries().toArray()[0];
-            return endpointRegistry;
+            DomainRegistry domainRegistry = (DomainRegistry) domainRegistryFactory.getEndpointRegistries().toArray()[0];
+            return domainRegistry;
         } else {
             return null;
         }

Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java Mon May 16 07:21:58 2011
@@ -60,7 +60,7 @@ import org.apache.tuscany.sca.provider.E
 import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
 import org.apache.tuscany.sca.runtime.CompositeActivator;
 import org.apache.tuscany.sca.runtime.EndpointReferenceBinder;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
 import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
 import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
 import org.apache.tuscany.sca.runtime.UnknownEndpointHandler;
@@ -110,35 +110,35 @@ public class EndpointReferenceBinderImpl
      * Bind a single endpoint reference at build time. Here we only expect the
      * registry to have a record of local endpoints
      *
-     * @param endpointRegistry
+     * @param domainRegistry
      * @param endpointReference
      */
-    public void bindBuildTime(EndpointRegistry endpointRegistry, 
+    public void bindBuildTime(DomainRegistry domainRegistry, 
                               EndpointReference endpointReference, 
                               BuilderContext builderContext) {
-       bind(endpointRegistry, endpointReference, builderContext, false);
+       bind(domainRegistry, endpointReference, builderContext, false);
     }
     
     /**
      * Bind a single endpoint reference at run time. Here we expect the
      * registry to be populated with endpoints from across the domain
      *
-     * @param endpointRegistry
+     * @param domainRegistry
      * @param endpointReference
      */
-    public void bindRunTime(EndpointRegistry endpointRegistry,
+    public void bindRunTime(DomainRegistry domainRegistry,
                             EndpointReference endpointReference) {
-        bind(endpointRegistry, endpointReference, null, true);
+        bind(domainRegistry, endpointReference, null, true);
     }
     
     /**
      * Bind a reference to a service endpoint
      * 
-     * @param endpointRegistry
+     * @param domainRegistry
      * @param endpointReference
      * @param runtime set true if called from the runtime 
      */
-    public void bind(EndpointRegistry endpointRegistry,  
+    public void bind(DomainRegistry domainRegistry,  
                      EndpointReference endpointReference,
                      BuilderContext builderContext,
                      boolean runtime){
@@ -154,7 +154,7 @@ public class EndpointReferenceBinderImpl
             // do autowire matching
             // will only be called at build time at the moment
             Multiplicity multiplicity = endpointReference.getReference().getMultiplicity();
-            for (Endpoint endpoint : endpointRegistry.getEndpoints()){
+            for (Endpoint endpoint : domainRegistry.getEndpoints()){
 //              if (endpoint is in the same composite as endpoint reference){
                     if ((multiplicity == Multiplicity.ZERO_ONE || 
                          multiplicity == Multiplicity.ONE_ONE) && 
@@ -253,7 +253,7 @@ public class EndpointReferenceBinderImpl
             // The reference is not yet matched to a service
           
             // find the service in the endpoint registry
-            List<Endpoint> endpoints = endpointRegistry.findEndpoint(endpointReference);
+            List<Endpoint> endpoints = domainRegistry.findEndpoint(endpointReference);
             
             if (endpoints.size() > 0){
                 selectForwardEndpoint(endpointReference,
@@ -917,12 +917,12 @@ public class EndpointReferenceBinderImpl
      * 
      * @return true is the registry has changed
      */
-    public boolean isOutOfDate(EndpointRegistry endpointRegistry, EndpointReference endpointReference) {
+    public boolean isOutOfDate(DomainRegistry domainRegistry, EndpointReference endpointReference) {
         Endpoint te = endpointReference.getTargetEndpoint();
         if (te != null && !te.isUnresolved()
             && te.getURI() != null
             && endpointReference.getStatus() != EndpointReference.Status.RESOLVED_BINDING) {
-            List<Endpoint> endpoints = endpointRegistry.findEndpoint(endpointReference);
+            List<Endpoint> endpoints = domainRegistry.findEndpoint(endpointReference);
             return ! endpoints.contains(endpointReference.getTargetEndpoint());
         }
         return false;

Modified: tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java Mon May 16 07:21:58 2011
@@ -86,9 +86,9 @@ import org.apache.tuscany.sca.definition
 import org.apache.tuscany.sca.deployment.Deployer;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.runtime.BaseEndpointRegistry;
+import org.apache.tuscany.sca.runtime.BaseDomainRegistry;
 import org.apache.tuscany.sca.runtime.EndpointReferenceBinder;
-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.xsd.XSDFactory;
 import org.apache.tuscany.sca.xsd.XSDefinition;
@@ -747,17 +747,17 @@ public class DeployerImpl implements Dep
     
     private void buildTimeReferenceBind(Composite domainComposite, BuilderContext context){
         // create temporary local registry for all available local endpoints
-        EndpointRegistry endpointRegistry = new LocalEndpointRegistry(registry);
+        DomainRegistry domainRegistry = new LocalEndpointRegistry(registry);
         
         // populate the registry with all the endpoints that are present in the model
-        populateLocalRegistry(domainComposite, endpointRegistry, context);        
+        populateLocalRegistry(domainComposite, domainRegistry, context);        
         
         // match all local services against the endpoint references 
         // we've just created
-        matchEndpointReferences(domainComposite, endpointRegistry, context); 
+        matchEndpointReferences(domainComposite, domainRegistry, context); 
     }
     
-    private void populateLocalRegistry(Composite composite, EndpointRegistry registry, BuilderContext context){
+    private void populateLocalRegistry(Composite composite, DomainRegistry registry, BuilderContext context){
         for (Component component : composite.getComponents()) {
             // recurse for composite implementations
             Implementation implementation = component.getImplementation();
@@ -784,7 +784,7 @@ public class DeployerImpl implements Dep
         }
     }
 
-    private void matchEndpointReferences(Composite composite, EndpointRegistry registry, BuilderContext builderContext){
+    private void matchEndpointReferences(Composite composite, DomainRegistry registry, BuilderContext builderContext){
         
         // look at all the endpoint references and try to match them to 
         // endpoints
@@ -796,7 +796,7 @@ public class DeployerImpl implements Dep
     // A minimal endpoint registry implementation used to store the Endpoints/EndpointReferences 
     // for build time local reference resolution. We don't rely on the endpoint registry
     // factory here as we specifically just want to do simple local resolution
-    class LocalEndpointRegistry extends BaseEndpointRegistry {
+    class LocalEndpointRegistry extends BaseDomainRegistry {
         
         private List<Endpoint> endpoints = new ArrayList<Endpoint>();
         

Modified: tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java Mon May 16 07:21:58 2011
@@ -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
         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;
             }
         }

Copied: tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistry.java (from r1103531, tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistry.java?p2=tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistry.java&p1=tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java&r1=1103531&r2=1103629&rev=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistry.java Mon May 16 07:21:58 2011
@@ -60,9 +60,9 @@ import org.apache.tuscany.sca.interfaced
 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 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) {

Modified: tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java Mon May 16 07:21:58 2011
@@ -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 HazelcastDomainRegistryFact
         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() {

Modified: tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java Mon May 16 07:21:58 2011
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.endpoint.
 
 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 HazelcastClientDomainRegist
         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() {

Modified: tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java Mon May 16 07:21:58 2011
@@ -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.HazelcastCli
 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;

Modified: tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java Mon May 16 07:21:58 2011
@@ -58,7 +58,7 @@ public class MultiRegTestCase {
     public void testReplication() throws Exception {
 
         System.out.println("Starting reg1");
-        HazelcastEndpointRegistry reg1 = new HazelcastEndpointRegistry(extensionPoints, (Properties)null, "tuscany:foo?bind=127.0.0.1:9876&multicast=off", "bar");
+        HazelcastDomainRegistry reg1 = new HazelcastDomainRegistry(extensionPoints, (Properties)null, "tuscany:foo?bind=127.0.0.1:9876&multicast=off", "bar");
         reg1.start();
 
         System.out.println("Adding ep1");
@@ -67,11 +67,11 @@ public class MultiRegTestCase {
         reg1.addEndpoint(ep1);
 
         System.out.println("Starting reg3");
-        HazelcastEndpointRegistry reg2 = new HazelcastEndpointRegistry(extensionPoints, (Properties)null, "tuscany:foo?bind=127.0.0.1:9877&multicast=off&wka=127.0.0.1:9876", "bar");
+        HazelcastDomainRegistry reg2 = new HazelcastDomainRegistry(extensionPoints, (Properties)null, "tuscany:foo?bind=127.0.0.1:9877&multicast=off&wka=127.0.0.1:9876", "bar");
         reg2.start();
 
         System.out.println("Starting reg2");
-        HazelcastEndpointRegistry reg3 = new HazelcastEndpointRegistry(extensionPoints, (Properties)null, "tuscany:foo?bind=127.0.0.1:9878&multicast=off&wka=127.0.0.1:9877", "bar");
+        HazelcastDomainRegistry reg3 = new HazelcastDomainRegistry(extensionPoints, (Properties)null, "tuscany:foo?bind=127.0.0.1:9878&multicast=off&wka=127.0.0.1:9877", "bar");
         reg3.start();
 
         assertExists(reg1, "ep1uri");
@@ -119,13 +119,13 @@ public class MultiRegTestCase {
 
     @Test
     public void testDuplicates() throws Exception {
-        HazelcastEndpointRegistry reg1 = new HazelcastEndpointRegistry(extensionPoints, (Properties)null, "tuscany:foo?bind=127.0.0.1:9876&multicast=off", "bar");
+        HazelcastDomainRegistry reg1 = new HazelcastDomainRegistry(extensionPoints, (Properties)null, "tuscany:foo?bind=127.0.0.1:9876&multicast=off", "bar");
         reg1.start();
         RuntimeEndpoint ep1 = createEndpoint("ep1uri");
         ep1.bind(extensionPoints, reg1);
         reg1.addEndpoint(ep1);
 
-        HazelcastEndpointRegistry reg2 = new HazelcastEndpointRegistry(extensionPoints, (Properties)null, "tuscany:foo?bind=127.0.0.1:9877&multicast=off&wka=127.0.0.1:9876", "bar");
+        HazelcastDomainRegistry reg2 = new HazelcastDomainRegistry(extensionPoints, (Properties)null, "tuscany:foo?bind=127.0.0.1:9877&multicast=off&wka=127.0.0.1:9876", "bar");
         reg2.start();
 
         try {
@@ -145,7 +145,7 @@ public class MultiRegTestCase {
         reg2.stop();
     }
 
-    private Endpoint assertExists(HazelcastEndpointRegistry reg, String uri) throws InterruptedException {
+    private Endpoint assertExists(HazelcastDomainRegistry reg, String uri) throws InterruptedException {
         Endpoint ep = reg.getEndpoint(uri);
         Assert.assertNotNull(ep);
         Assert.assertEquals(uri, ep.getURI());

Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java Mon May 16 07:21:58 2011
@@ -44,7 +44,7 @@ import org.apache.tuscany.sca.node.confi
 import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
 import org.apache.tuscany.sca.runtime.ActivationException;
 import org.apache.tuscany.sca.runtime.CompositeActivator;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
 import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory;
 import org.apache.tuscany.sca.runtime.RuntimeProperties;
 import org.apache.tuscany.sca.work.WorkScheduler;
@@ -104,8 +104,8 @@ public class TuscanyRuntime {
         try {
             TuscanyRuntime runtime = newInstance();
         	String domain = domainURI == null ? "default" : domainURI.toString();
-            EndpointRegistry endpointRegistry = runtime.domainRegistryFactory.getEndpointRegistry(domain, getDomainName(domain));
-            NodeImpl node = new NodeImpl(domain, runtime.deployer, runtime.compositeActivator, endpointRegistry, runtime.extensionPointRegistry, runtime);
+            DomainRegistry domainRegistry = runtime.domainRegistryFactory.getEndpointRegistry(domain, getDomainName(domain));
+            NodeImpl node = new NodeImpl(domain, runtime.deployer, runtime.compositeActivator, domainRegistry, runtime.extensionPointRegistry, runtime);
 
             if (dependentContributionURLs != null) {
                 for (int i=dependentContributionURLs.length-1; i>-1; i--) {
@@ -146,8 +146,8 @@ public class TuscanyRuntime {
         if (domainURI != null){
             domainName = getDomainName(domainURI);
         }
-        EndpointRegistry endpointRegistry = domainRegistryFactory.getEndpointRegistry(domainURI, domainName);
-        return new NodeImpl(domainName, deployer, compositeActivator, endpointRegistry, extensionPointRegistry, null);
+        DomainRegistry domainRegistry = domainRegistryFactory.getEndpointRegistry(domainURI, domainName);
+        return new NodeImpl(domainName, deployer, compositeActivator, domainRegistry, extensionPointRegistry, null);
     }
 
     public NodeImpl2 createNode2(String domainURI) {
@@ -155,8 +155,8 @@ public class TuscanyRuntime {
         if (domainURI != null){
             domainName = getDomainName(domainURI);
         }
-        EndpointRegistry endpointRegistry = domainRegistryFactory.getEndpointRegistry(domainURI, domainName);
-        return new NodeImpl2(domainName, deployer, compositeActivator, endpointRegistry, extensionPointRegistry, null);
+        DomainRegistry domainRegistry = domainRegistryFactory.getEndpointRegistry(domainURI, domainName);
+        return new NodeImpl2(domainName, deployer, compositeActivator, domainRegistry, extensionPointRegistry, null);
     }
     
     /**

Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java Mon May 16 07:21:58 2011
@@ -36,7 +36,7 @@ import org.apache.tuscany.sca.monitor.Mo
 import org.apache.tuscany.sca.monitor.ValidationException;
 import org.apache.tuscany.sca.runtime.ActivationException;
 import org.apache.tuscany.sca.runtime.CompositeActivator;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
 
 public class DeployedComposite {
     
@@ -48,7 +48,7 @@ public class DeployedComposite {
     private CompositeActivator compositeActivator;
     private CompositeContext compositeContext;
     private Deployer deployer;
-    private EndpointRegistry endpointRegistry;
+    private DomainRegistry domainRegistry;
     private ExtensionPointRegistry extensionPointRegistry;
 
     public DeployedComposite(Composite composite,
@@ -56,14 +56,14 @@ public class DeployedComposite {
                              List<Contribution> dependedOnContributions,
                              Deployer deployer,
                              CompositeActivator compositeActivator,
-                             EndpointRegistry endpointRegistry,
+                             DomainRegistry domainRegistry,
                              ExtensionPointRegistry extensionPointRegistry) throws ValidationException, ActivationException {
         this.composite = composite;
         this.contribution = contribution;
         this.dependedOnContributions = dependedOnContributions;
         this.deployer = deployer;
         this.compositeActivator = compositeActivator;
-        this.endpointRegistry = endpointRegistry;
+        this.domainRegistry = domainRegistry;
         this.extensionPointRegistry = extensionPointRegistry;
         try {
             build();
@@ -87,7 +87,7 @@ public class DeployedComposite {
         monitor.analyzeProblems();
 
         compositeContext = new CompositeContext(extensionPointRegistry, 
-                                                endpointRegistry, 
+                                                domainRegistry, 
                                                 builtComposite, 
                                                 null, // nothing appears to use the domain name in CompositeContext 
                                                 null, // don't need node uri
@@ -97,11 +97,11 @@ public class DeployedComposite {
     public void start() throws ActivationException {
         compositeActivator.activate(compositeContext, builtComposite);
         compositeActivator.start(compositeContext, builtComposite);
-        endpointRegistry.addRunningComposite(contribution.getURI(), builtComposite);
+        domainRegistry.addRunningComposite(contribution.getURI(), builtComposite);
     }
 
     public void stop() throws ActivationException {
-        endpointRegistry.removeRunningComposite(contribution.getURI(), builtComposite.getName());
+        domainRegistry.removeRunningComposite(contribution.getURI(), builtComposite.getName());
         compositeActivator.stop(compositeContext, builtComposite);
         compositeActivator.deactivate(builtComposite);
     }



Mime
View raw message