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/node-impl-osgi/src/main/java/org/apache/tuscany/sca | |
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/node-impl-osgi/src/main/java/org/apache/tuscany/sca')
-rw-r--r-- | sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java index 0cbdda7b56..f8b4c3be8c 100644 --- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java +++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java @@ -30,7 +30,7 @@ import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation; import org.apache.tuscany.sca.node.configuration.NodeConfiguration; import org.apache.tuscany.sca.runtime.DomainRegistryFactory; 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.ExtensibleDomainRegistryFactory; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -41,7 +41,7 @@ import org.osgi.service.remoteserviceadmin.EndpointDescription; */ public class DomainDiscoveryService extends AbstractDiscoveryService implements EndpointListener { private DomainRegistryFactory domainRegistryFactory; - private EndpointRegistry endpointRegistry; + private DomainRegistry domainRegistry; public DomainDiscoveryService(BundleContext context) { super(context); @@ -65,16 +65,16 @@ public class DomainDiscoveryService extends AbstractDiscoveryService implements private synchronized void startEndpointRegistry() { // The following code forced the start() of the domain registry in absense of services - String domainRegistry = context.getProperty("org.osgi.sca.domain.registry"); - if (domainRegistry == null) { - domainRegistry = NodeConfiguration.DEFAULT_DOMAIN_REGISTRY_URI; + String domainRegistryURI = context.getProperty("org.osgi.sca.domain.registry"); + if (domainRegistryURI == null) { + domainRegistryURI = NodeConfiguration.DEFAULT_DOMAIN_REGISTRY_URI; } String domainURI = context.getProperty("org.osgi.sca.domain.uri"); if (domainURI == null) { domainURI = NodeConfiguration.DEFAULT_DOMAIN_URI; } if (domainRegistry != null) { - endpointRegistry = domainRegistryFactory.getEndpointRegistry(domainRegistry, domainURI); + domainRegistry = domainRegistryFactory.getEndpointRegistry(domainRegistryURI, domainURI); } } @@ -121,11 +121,11 @@ public class DomainDiscoveryService extends AbstractDiscoveryService implements public void stop() { if (domainRegistryFactory != null) { domainRegistryFactory.removeListener(this); - if (endpointRegistry instanceof LifeCycleListener) { - ((LifeCycleListener)endpointRegistry).stop(); + if (domainRegistry instanceof LifeCycleListener) { + ((LifeCycleListener)domainRegistry).stop(); } domainRegistryFactory = null; - endpointRegistry = null; + domainRegistry = null; super.stop(); } } |