diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-05-16 07:21:58 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-05-16 07:21:58 +0000 |
commit | f955360d1ac83472162e88eb9db4c3c2f1bfb94c (patch) | |
tree | 03165b58cff723cd3bc128f87c1b908277fe77f0 /sca-java-2.x/trunk/modules/core-spi/src | |
parent | 4e1be687f324ef95c463b5af3769fdc84ce1c858 (diff) |
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
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1103629 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/core-spi/src')
8 files changed, 59 insertions, 59 deletions
diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java index 6e6df507c2..313c4bb64e 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java @@ -28,18 +28,18 @@ import org.apache.tuscany.sca.assembly.EndpointReference; 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() { diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java index e89a4396e0..e3743d535a 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java @@ -32,11 +32,11 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry; 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 BaseEndpointRegistry implements EndpointRegistry, LifeCycl protected ExtensionPointRegistry registry; protected Map<String, String> attributes; - public BaseEndpointRegistry(ExtensionPointRegistry registry, + public BaseDomainRegistry(ExtensionPointRegistry registry, Map<String, String> attributes, String domainRegistryURI, String domainURI) { diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java index 4f6a29bbcc..7f707030ae 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java @@ -35,7 +35,7 @@ import org.apache.tuscany.sca.core.LifeCycleListener; */ 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 BaseDomainRegistryFactory implements DomainRegistryFactory 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 BaseDomainRegistryFactory implements DomainRegistryFactory public synchronized void removeListener(EndpointListener listener) { listeners.remove(listener); - for (EndpointRegistry registry : endpointRegistries.values()) { + for (DomainRegistry registry : domainRegistries.values()) { registry.removeListener(listener); } } diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java index 1337cab4b2..95fca25431 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java @@ -30,10 +30,10 @@ import org.apache.tuscany.sca.assembly.Endpoint; 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 diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java index c79fab1f47..69ed07763e 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java @@ -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 diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java index 60f8a5c5a0..79e8dfc475 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java @@ -24,30 +24,30 @@ import org.apache.tuscany.sca.assembly.builder.BuilderContext; /** * 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); } diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java index 43ee78b985..64af944c9f 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java @@ -63,15 +63,15 @@ public class ExtensibleDomainRegistryFactory implements DomainRegistryFactory { } } - 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 ExtensibleDomainRegistryFactory implements DomainRegistryFactory { // 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 ExtensibleDomainRegistryFactory implements DomainRegistryFactory { 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) { diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java index eef7a88046..78a87191de 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java @@ -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 |