diff options
Diffstat (limited to 'sca-java-2.x/trunk')
40 files changed, 297 insertions, 297 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java b/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java index bdd687fe07..16a95a1e59 100644 --- a/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java +++ b/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java @@ -39,7 +39,7 @@ import org.apache.tuscany.sca.policy.Intent; 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 RuntimeEndpoint { } - public void bind(ExtensionPointRegistry registry, EndpointRegistry endpointRegistry) { + public void bind(ExtensionPointRegistry registry, DomainRegistry domainRegistry) { // TODO Auto-generated method stub } diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java index fe95e5c7d0..e1ffa548de 100644 --- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java +++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java @@ -63,10 +63,10 @@ public class RuntimeSCAServiceBindingProvider implements EndpointAsyncProvider, // 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; } 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 diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java index e18b96c50b..6b99b77802 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/DomainRegistryImpl.java @@ -36,18 +36,18 @@ import org.apache.tuscany.sca.assembly.Endpoint; 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 extends BaseEndpointRegistry implements Endpoi 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)); diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java index b7d83e754a..002eb774ef 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.core.assembly.impl; 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 extends BaseDomainRegistryFactory { 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() { diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java index adad30c778..8e04a6ae47 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java @@ -95,7 +95,7 @@ import org.apache.tuscany.sca.provider.PolicyProviderFactory; 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 EndpointImpl implements RuntimeEndpoint 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 EndpointImpl implements RuntimeEndpoint // 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 EndpointImpl implements RuntimeEndpoint 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 EndpointImpl implements RuntimeEndpoint } // 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 EndpointImpl implements RuntimeEndpoint } // 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() { diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java index 410056628b..e990231841 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java @@ -81,7 +81,7 @@ import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint; 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 RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen 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 RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen 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 RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen 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 RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen public boolean isOutOfDate() { resolve(); - return eprBinder.isOutOfDate(endpointRegistry, this); + return eprBinder.isOutOfDate(domainRegistry, this); } public synchronized ReferenceBindingProvider getBindingProvider() { @@ -648,7 +648,7 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen 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 RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen } // 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; diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java index 87b8da62a9..1ebc9c633a 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java @@ -37,7 +37,7 @@ import org.apache.tuscany.sca.invocation.Message; 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> implements InvokerAsyncResponse, Serializab 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> implements InvokerAsyncResponse, Serializab */
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> implements InvokerAsyncResponse, Serializab /**
* 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> implements InvokerAsyncResponse, Serializab 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> implements InvokerAsyncResponse, Serializab } // 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;
}
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java index 068f13f953..cfdb099423 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java @@ -60,7 +60,7 @@ import org.apache.tuscany.sca.provider.EndpointReferenceAsyncProvider; 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 implements EndpointReferenceBinder { * 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 implements EndpointReferenceBinder { // 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 implements EndpointReferenceBinder { // 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 implements EndpointReferenceBinder { * * @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; diff --git a/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java b/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java index 9b51cf4888..1d4de5192d 100644 --- a/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java +++ b/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java @@ -86,9 +86,9 @@ import org.apache.tuscany.sca.definitions.xml.DefinitionsExtensionPoint; 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 Deployer { 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 Deployer { } } - 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 Deployer { // 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>(); diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java index 7caf3e4841..9bf5f4c21a 100644 --- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java +++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java @@ -29,14 +29,14 @@ import javax.xml.namespace.QName; import org.apache.tuscany.sca.common.xml.dom.DOMHelper; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.endpoint.hazelcast.HazelcastEndpointRegistry; +import org.apache.tuscany.sca.endpoint.hazelcast.HazelcastDomainRegistry; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.interfacedef.util.FaultException; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.invocation.MessageFactory; import org.apache.tuscany.sca.runtime.DomainRegistryFactory; -import org.apache.tuscany.sca.runtime.EndpointRegistry; +import org.apache.tuscany.sca.runtime.DomainRegistry; import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory; import org.oasisopen.sca.ServiceRuntimeException; import org.w3c.dom.Document; @@ -48,7 +48,7 @@ import com.hazelcast.core.Member; public class ReferenceInvoker implements Invoker { - HazelcastEndpointRegistry hzRegistry; + HazelcastDomainRegistry hzRegistry; DOMHelper domHelper; String serviceURI; private Operation operation; @@ -58,9 +58,9 @@ public class ReferenceInvoker implements Invoker { this.serviceURI = serviceURI; this.operation = operation; DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionsRegistry); - for (EndpointRegistry r : domainRegistryFactory.getEndpointRegistries()) { - if (r instanceof HazelcastEndpointRegistry) { - hzRegistry = (HazelcastEndpointRegistry)r; + for (DomainRegistry r : domainRegistryFactory.getEndpointRegistries()) { + if (r instanceof HazelcastDomainRegistry) { + hzRegistry = (HazelcastDomainRegistry)r; break; } } diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistry.java index b7e661c1ee..7d65a5fe57 100644 --- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java +++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistry.java @@ -60,9 +60,9 @@ import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract; -import org.apache.tuscany.sca.runtime.BaseEndpointRegistry; +import org.apache.tuscany.sca.runtime.BaseDomainRegistry; import org.apache.tuscany.sca.runtime.ContributionListener; -import org.apache.tuscany.sca.runtime.EndpointRegistry; +import org.apache.tuscany.sca.runtime.DomainRegistry; import org.apache.tuscany.sca.runtime.InstalledContribution; import org.apache.tuscany.sca.runtime.RuntimeEndpoint; import org.apache.tuscany.sca.runtime.RuntimeProperties; @@ -87,10 +87,10 @@ import com.hazelcast.core.Transaction; import com.hazelcast.nio.Address; /** - * An EndpointRegistry using a Hazelcast + * An DomainRegistry using a Hazelcast */ -public class HazelcastEndpointRegistry extends BaseEndpointRegistry implements EndpointRegistry, LifeCycleListener, EntryListener<String, Endpoint>, MembershipListener { - private final static Logger logger = Logger.getLogger(HazelcastEndpointRegistry.class.getName()); +public class HazelcastDomainRegistry extends BaseDomainRegistry implements DomainRegistry, LifeCycleListener, EntryListener<String, Endpoint>, MembershipListener { + private final static Logger logger = Logger.getLogger(HazelcastDomainRegistry.class.getName()); private HazelcastInstance hazelcastInstance; @@ -108,13 +108,13 @@ public class HazelcastEndpointRegistry extends BaseEndpointRegistry implements E protected Object shutdownMutex = new Object(); protected Properties properties; - public HazelcastEndpointRegistry(ExtensionPointRegistry registry, Properties properties, String endpointRegistryURI, String domainURI) { + public HazelcastDomainRegistry(ExtensionPointRegistry registry, Properties properties, String endpointRegistryURI, String domainURI) { super(registry, null, endpointRegistryURI, domainURI); this.assemblyFactory = registry.getExtensionPoint(FactoryExtensionPoint.class).getFactory(AssemblyFactory.class); this.properties = properties; } - public HazelcastEndpointRegistry(ExtensionPointRegistry registry, + public HazelcastDomainRegistry(ExtensionPointRegistry registry, Map<String, String> attributes, String domainRegistryURI, String domainURI) { diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java index 291553705b..a96648d365 100644 --- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java +++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java @@ -24,7 +24,7 @@ import java.util.Properties; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.runtime.BaseDomainRegistryFactory; -import org.apache.tuscany.sca.runtime.EndpointRegistry; +import org.apache.tuscany.sca.runtime.DomainRegistry; import org.apache.tuscany.sca.runtime.RuntimeProperties; /** @@ -38,9 +38,9 @@ public class HazelcastDomainRegistryFactory extends BaseDomainRegistryFactory { super(registry); } - protected EndpointRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) { + protected DomainRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) { Properties properties = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(RuntimeProperties.class).getProperties(); - return new HazelcastEndpointRegistry(registry, properties, endpointRegistryURI, domainURI); + return new HazelcastDomainRegistry(registry, properties, endpointRegistryURI, domainURI); } public String[] getSupportedSchemes() { diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java index ad4d6d9e64..f6a5b487e4 100644 --- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java +++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.endpoint.hazelcast.client; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.runtime.BaseDomainRegistryFactory; -import org.apache.tuscany.sca.runtime.EndpointRegistry; +import org.apache.tuscany.sca.runtime.DomainRegistry; /** * The utility responsible for finding the endpoint regstry by the scheme and creating instances for the @@ -37,10 +37,10 @@ public class HazelcastClientDomainRegistryFactory extends BaseDomainRegistryFact super(registry); } - protected EndpointRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) { - EndpointRegistry endpointRegistry = + protected DomainRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) { + DomainRegistry domainRegistry = new HazelcastClientEndpointRegistry(registry, null, endpointRegistryURI, domainURI); - return endpointRegistry; + return domainRegistry; } public String[] getSupportedSchemes() { diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java index 4f1820951a..ce1075f207 100644 --- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java +++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.endpoint.hazelcast.HazelcastEndpointRegistry; +import org.apache.tuscany.sca.endpoint.hazelcast.HazelcastDomainRegistry; import org.apache.tuscany.sca.endpoint.hazelcast.RegistryConfig; import org.apache.tuscany.sca.runtime.RuntimeProperties; @@ -38,9 +38,9 @@ import com.hazelcast.client.HazelcastClient; import com.hazelcast.core.HazelcastInstance; /** - * An EndpointRegistry using a Hazelcast Native Client + * An DomainRegistry using a Hazelcast Native Client */ -public class HazelcastClientEndpointRegistry extends HazelcastEndpointRegistry { +public class HazelcastClientEndpointRegistry extends HazelcastDomainRegistry { RegistryConfig rc; HazelcastClient hazelcastClient; diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java index dcdf1a94e0..65926dddb1 100644 --- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java +++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java @@ -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()); diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java index af0dc0df10..74e86e5421 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java @@ -44,7 +44,7 @@ import org.apache.tuscany.sca.node.configuration.ContributionConfiguration; 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); } /** diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java index e79590d164..3ac55ceac7 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java @@ -36,7 +36,7 @@ import org.apache.tuscany.sca.monitor.Monitor; 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); } diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java index 3c0cbe4a83..a8b7cac8f3 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java @@ -70,7 +70,7 @@ import org.apache.tuscany.sca.monitor.Monitor; 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; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; @@ -82,16 +82,16 @@ public class NodeImpl implements Node { private String domainName; private Deployer deployer; private CompositeActivator compositeActivator; - private EndpointRegistry endpointRegistry; + private DomainRegistry domainRegistry; private ExtensionPointRegistry extensionPointRegistry; private TuscanyRuntime tuscanyRuntime; private Map<String, InstalledContribution> locallyInstalledContributions = new HashMap<String, InstalledContribution>(); - public NodeImpl(String domainName, Deployer deployer, CompositeActivator compositeActivator, EndpointRegistry endpointRegistry, ExtensionPointRegistry extensionPointRegistry, TuscanyRuntime tuscanyRuntime) { + public NodeImpl(String domainName, Deployer deployer, CompositeActivator compositeActivator, DomainRegistry domainRegistry, ExtensionPointRegistry extensionPointRegistry, TuscanyRuntime tuscanyRuntime) { this.domainName = domainName; this.deployer = deployer; this.compositeActivator = compositeActivator; - this.endpointRegistry = endpointRegistry; + this.domainRegistry = domainRegistry; this.extensionPointRegistry = extensionPointRegistry; this.tuscanyRuntime = tuscanyRuntime; } @@ -104,7 +104,7 @@ public class NodeImpl implements Node { // TODO: sort out deployables and exports org.apache.tuscany.sca.runtime.InstalledContribution ic = new org.apache.tuscany.sca.runtime.InstalledContribution(uri, contributionURL); peekIntoContribution(ic); - endpointRegistry.installContribution(ic); + domainRegistry.installContribution(ic); if (startDeployables) { for (String compositeURI : ic.getDeployables()) { start(ic.getURI(), compositeURI); @@ -222,7 +222,7 @@ public class NodeImpl implements Node { InstalledContribution ic = locallyInstalledContributions.get(contributionURI); if (ic == null) { - org.apache.tuscany.sca.runtime.InstalledContribution icx = endpointRegistry.getInstalledContribution(contributionURI); + org.apache.tuscany.sca.runtime.InstalledContribution icx = domainRegistry.getInstalledContribution(contributionURI); String url = null; if (icx != null) { url = icx.getURL(); @@ -261,10 +261,10 @@ public class NodeImpl implements Node { domainComposite.setAutowire(false); domainComposite.setLocal(false); List<Composite> domainIncludes = domainComposite.getIncludes(); - Map<String, List<QName>> runningComposites = endpointRegistry.getRunningCompositeNames(); + Map<String, List<QName>> runningComposites = domainRegistry.getRunningCompositeNames(); for (String curi : runningComposites.keySet()) { for (QName name : runningComposites.get(curi)) { - domainIncludes.add(endpointRegistry.getRunningComposite(curi, name)); + domainIncludes.add(domainRegistry.getRunningComposite(curi, name)); } } return domainComposite; @@ -292,7 +292,7 @@ public class NodeImpl implements Node { } public List<String> removeContribution(String contributionURI) throws ActivationException { - endpointRegistry.uninstallContribution(contributionURI); + domainRegistry.uninstallContribution(contributionURI); // TODO: should this next bit happen? List<String> removedContributionURIs = new ArrayList<String>(); @@ -345,7 +345,7 @@ public class NodeImpl implements Node { public <T> T getService(Class<T> interfaze, String serviceURI) throws NoSuchServiceException { - List<Endpoint> endpoints = endpointRegistry.findEndpoint(serviceURI); + List<Endpoint> endpoints = domainRegistry.findEndpoint(serviceURI); if (endpoints.size() < 1) { throw new NoSuchServiceException(serviceURI); } @@ -374,7 +374,7 @@ public class NodeImpl implements Node { new ExtensibleProxyFactory(extensionPointRegistry.getExtensionPoint(ProxyFactoryExtensionPoint.class)); CompositeContext compositeContext = - new CompositeContext(extensionPointRegistry, endpointRegistry, null, null, null, + new CompositeContext(extensionPointRegistry, domainRegistry, null, null, null, deployer.getSystemDefinitions()); RuntimeEndpointReference epr; @@ -481,7 +481,7 @@ public class NodeImpl implements Node { } public List<String> getInstalledContributionURIs() { - Set<String> ls = new HashSet<String>(endpointRegistry.getInstalledContributionURIs()); + Set<String> ls = new HashSet<String>(domainRegistry.getInstalledContributionURIs()); ls.addAll(locallyInstalledContributions.keySet()); return new ArrayList<String>(ls); } @@ -509,7 +509,7 @@ public class NodeImpl implements Node { protected void startComposite(Composite c, InstalledContribution ic) throws ActivationException, ValidationException { List<Contribution> dependentContributions = calculateDependentContributions(ic); - DeployedComposite dc = new DeployedComposite(c, ic.getContribution(), dependentContributions, deployer, compositeActivator, endpointRegistry, extensionPointRegistry); + DeployedComposite dc = new DeployedComposite(c, ic.getContribution(), dependentContributions, deployer, compositeActivator, domainRegistry, extensionPointRegistry); ic.start(dc); } @@ -554,8 +554,8 @@ public class NodeImpl implements Node { return uri; } - public EndpointRegistry getEndpointRegistry() { - return endpointRegistry; + public DomainRegistry getEndpointRegistry() { + return domainRegistry; } } diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl2.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl2.java index 0091bf545f..be3838ba54 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl2.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl2.java @@ -59,7 +59,7 @@ 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.ContributionListener;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
import org.apache.tuscany.sca.runtime.InstalledContribution;
import org.oasisopen.sca.NoSuchServiceException;
@@ -68,7 +68,7 @@ public class NodeImpl2 { private String domainName;
private Deployer deployer;
private CompositeActivator compositeActivator;
- private EndpointRegistry endpointRegistry;
+ private DomainRegistry domainRegistry;
private ExtensionPointRegistry extensionPointRegistry;
private TuscanyRuntime tuscanyRuntime;
@@ -80,17 +80,17 @@ public class NodeImpl2 { public NodeImpl2(String domainName,
Deployer deployer,
CompositeActivator compositeActivator,
- EndpointRegistry endpointRegistry,
+ DomainRegistry domainRegistry,
ExtensionPointRegistry extensionPointRegistry,
TuscanyRuntime tuscanyRuntime) {
this.domainName = domainName;
this.deployer = deployer;
this.compositeActivator = compositeActivator;
- this.endpointRegistry = endpointRegistry;
+ this.domainRegistry = domainRegistry;
this.extensionPointRegistry = extensionPointRegistry;
this.tuscanyRuntime = tuscanyRuntime;
- endpointRegistry.addContributionListener(new ContributionListener() {
+ domainRegistry.addContributionListener(new ContributionListener() {
public void contributionUpdated(String uri) {
loadedContributions.remove(uri);
}
@@ -121,13 +121,13 @@ public class NodeImpl2 { peekIntoContribution(ic);
- endpointRegistry.installContribution(ic);
+ domainRegistry.installContribution(ic);
return ic.getURI();
}
public void uninstallContribution(String contributionURI) {
- endpointRegistry.uninstallContribution(contributionURI);
+ domainRegistry.uninstallContribution(contributionURI);
}
protected void mergeContributionMetaData(String metaDataURL, Contribution contribution) throws ValidationException {
@@ -180,7 +180,7 @@ public class NodeImpl2 { }
public List<String> getInstalledContributionURIs() {
- return new ArrayList<String>(endpointRegistry.getInstalledContributionURIs());
+ return new ArrayList<String>(domainRegistry.getInstalledContributionURIs());
}
public Contribution getContribution(String contributionURI) throws ContributionReadException, ValidationException {
@@ -188,7 +188,7 @@ public class NodeImpl2 { }
public List<String> getDeployableCompositeURIs(String contributionURI) {
- InstalledContribution ic = endpointRegistry.getInstalledContribution(contributionURI);
+ InstalledContribution ic = domainRegistry.getInstalledContribution(contributionURI);
return new ArrayList<String>(ic.getDeployables());
}
@@ -220,7 +220,7 @@ public class NodeImpl2 { composite.setURI(composite.getName().getLocalPart() + ".composite");
}
ic.getAdditionalDeployables().put(composite.getURI(), compositeToXML(composite));
- endpointRegistry.updateInstalledContribution(ic);
+ domainRegistry.updateInstalledContribution(ic);
}
public void validateContribution(String contributionURI) throws ContributionReadException, ValidationException {
@@ -243,7 +243,7 @@ public class NodeImpl2 { }
public Map<String, List<QName>> getStartedComposites() {
- return endpointRegistry.getRunningCompositeNames();
+ return domainRegistry.getRunningCompositeNames();
}
public void startComposite(String contributionURI, String compositeURI) throws ActivationException, ValidationException, ContributionReadException {
@@ -260,7 +260,7 @@ public class NodeImpl2 { Contribution contribution = loadContribution(ic);
Composite composite = contribution.getArtifactModel(compositeURI);
List<Contribution> dependentContributions = calculateDependentContributions(ic);
- dc = new DeployedComposite(composite, contribution, dependentContributions, deployer, compositeActivator, endpointRegistry, extensionPointRegistry);
+ dc = new DeployedComposite(composite, contribution, dependentContributions, deployer, compositeActivator, domainRegistry, extensionPointRegistry);
dc.start();
startedComposites.put(key, dc);
}
@@ -288,21 +288,21 @@ public class NodeImpl2 { domainComposite.setAutowire(false);
domainComposite.setLocal(false);
List<Composite> domainIncludes = domainComposite.getIncludes();
- Map<String, List<QName>> runningComposites = endpointRegistry.getRunningCompositeNames();
+ Map<String, List<QName>> runningComposites = domainRegistry.getRunningCompositeNames();
for (String curi : runningComposites.keySet()) {
for (QName name : runningComposites.get(curi)) {
- domainIncludes.add(endpointRegistry.getRunningComposite(curi, name));
+ domainIncludes.add(domainRegistry.getRunningComposite(curi, name));
}
}
return domainComposite;
}
public <T> T getService(Class<T> interfaze, String serviceURI) throws NoSuchServiceException {
- return ServiceHelper.getService(interfaze, serviceURI, endpointRegistry, extensionPointRegistry, deployer);
+ return ServiceHelper.getService(interfaze, serviceURI, domainRegistry, extensionPointRegistry, deployer);
}
protected InstalledContribution getInstalledContribution(String contributionURI) {
- InstalledContribution ic = endpointRegistry.getInstalledContribution(contributionURI);
+ InstalledContribution ic = domainRegistry.getInstalledContribution(contributionURI);
if (ic == null) {
throw new IllegalArgumentException("Contribution not installed: " + contributionURI);
}
@@ -338,7 +338,7 @@ public class NodeImpl2 { if (ic.getDependentContributionURIs() != null && ic.getDependentContributionURIs().size() > 0) {
// if the install specified dependent uris use just those contributions
for (String uri : ic.getDependentContributionURIs()) {
- InstalledContribution dependee = endpointRegistry.getInstalledContribution(uri);
+ InstalledContribution dependee = domainRegistry.getInstalledContribution(uri);
if (dependee != null) {
dependentContributions.add(loadContribution(dependee));
}
@@ -357,8 +357,8 @@ public class NodeImpl2 { private List<InstalledContribution> findExportingContributions(Import imprt) {
List<InstalledContribution> ics = new ArrayList<InstalledContribution>();
// TODO: Handle Imports in a more extensible way
- for (String curi : endpointRegistry.getInstalledContributionURIs()) {
- InstalledContribution ic = endpointRegistry.getInstalledContribution(curi);
+ for (String curi : domainRegistry.getInstalledContributionURIs()) {
+ InstalledContribution ic = domainRegistry.getInstalledContribution(curi);
if (imprt instanceof JavaImport) {
for (String s : ic.getJavaExports()) {
if (s.startsWith(((JavaImport)imprt).getPackage())) {
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/ServiceHelper.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/ServiceHelper.java index ffb3281ebc..42a550d543 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/ServiceHelper.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/ServiceHelper.java @@ -41,7 +41,7 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContract; import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-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.RuntimeComponentReference;
import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
@@ -55,9 +55,9 @@ import org.oasisopen.sca.ServiceRuntimeException; */
public class ServiceHelper {
- public static <T> T getService(Class<T> interfaze, String serviceURI, EndpointRegistry endpointRegistry, ExtensionPointRegistry extensionPointRegistry, Deployer deployer) throws NoSuchServiceException {
+ public static <T> T getService(Class<T> interfaze, String serviceURI, DomainRegistry domainRegistry, ExtensionPointRegistry extensionPointRegistry, Deployer deployer) throws NoSuchServiceException {
- List<Endpoint> endpoints = endpointRegistry.findEndpoint(serviceURI);
+ List<Endpoint> endpoints = domainRegistry.findEndpoint(serviceURI);
if (endpoints.size() < 1) {
throw new NoSuchServiceException(serviceURI);
}
@@ -74,11 +74,11 @@ public class ServiceHelper { if (((RuntimeComponent)ep.getComponent()).getComponentContext() != null) {
return ((RuntimeComponent)ep.getComponent()).getServiceReference(interfaze, serviceName).getService();
} else {
- return getRemoteProxy(interfaze, ep, endpointRegistry, extensionPointRegistry, deployer);
+ return getRemoteProxy(interfaze, ep, domainRegistry, extensionPointRegistry, deployer);
}
}
- private static <T> T getRemoteProxy(Class<T> serviceInterface, Endpoint endpoint, EndpointRegistry endpointRegistry, ExtensionPointRegistry extensionPointRegistry, Deployer deployer) throws NoSuchServiceException {
+ private static <T> T getRemoteProxy(Class<T> serviceInterface, Endpoint endpoint, DomainRegistry domainRegistry, ExtensionPointRegistry extensionPointRegistry, Deployer deployer) throws NoSuchServiceException {
FactoryExtensionPoint factories = extensionPointRegistry.getExtensionPoint(FactoryExtensionPoint.class);
AssemblyFactory assemblyFactory = factories.getFactory(AssemblyFactory.class);
JavaInterfaceFactory javaInterfaceFactory = factories.getFactory(JavaInterfaceFactory.class);
@@ -86,7 +86,7 @@ public class ServiceHelper { new ExtensibleProxyFactory(extensionPointRegistry.getExtensionPoint(ProxyFactoryExtensionPoint.class));
CompositeContext compositeContext =
- new CompositeContext(extensionPointRegistry, endpointRegistry, null, null, null,
+ new CompositeContext(extensionPointRegistry, domainRegistry, null, null, null,
deployer.getSystemDefinitions());
RuntimeEndpointReference epr;
diff --git a/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java b/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java index cf275bd50f..e94b710186 100644 --- a/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java +++ b/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java @@ -51,18 +51,18 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.LifeCycleListener; import org.apache.tuscany.sca.endpoint.tribes.AbstractReplicatedMap.MapEntry; import org.apache.tuscany.sca.endpoint.tribes.MapStore.MapListener; -import org.apache.tuscany.sca.runtime.BaseEndpointRegistry; +import org.apache.tuscany.sca.runtime.BaseDomainRegistry; import org.apache.tuscany.sca.runtime.DomainRegistryURI; -import org.apache.tuscany.sca.runtime.EndpointRegistry; +import org.apache.tuscany.sca.runtime.DomainRegistry; import org.apache.tuscany.sca.runtime.InstalledContribution; import org.apache.tuscany.sca.runtime.RuntimeEndpoint; /** - * A replicated EndpointRegistry based on Apache Tomcat Tribes + * A replicated DomainRegistry based on Apache Tomcat Tribes */ -public class ReplicatedEndpointRegistry extends BaseEndpointRegistry implements EndpointRegistry, LifeCycleListener, +public class ReplicatedDomainRegistry extends BaseDomainRegistry implements DomainRegistry, LifeCycleListener, MapListener { - private final static Logger logger = Logger.getLogger(ReplicatedEndpointRegistry.class.getName()); + private final static Logger logger = Logger.getLogger(ReplicatedDomainRegistry.class.getName()); private static final String MULTICAST_ADDRESS = "228.0.0.100"; private static final int MULTICAST_PORT = 50000; @@ -103,7 +103,7 @@ public class ReplicatedEndpointRegistry extends BaseEndpointRegistry implements return channel; } - public ReplicatedEndpointRegistry(ExtensionPointRegistry registry, + public ReplicatedDomainRegistry(ExtensionPointRegistry registry, Map<String, String> attributes, String domainRegistryURI, String domainURI) { @@ -221,7 +221,7 @@ public class ReplicatedEndpointRegistry extends BaseEndpointRegistry implements GroupChannel channel = createChannel(address, port, bind); map = new ReplicatedMap(null, channel, timeout, this.domainURI, - new ClassLoader[] {ReplicatedEndpointRegistry.class.getClassLoader()}); + new ClassLoader[] {ReplicatedDomainRegistry.class.getClassLoader()}); map.addListener(this); if (noMultiCast) { diff --git a/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java index 91314b4c37..d0beb95141 100644 --- a/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java +++ b/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.endpoint.tribes; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.runtime.BaseDomainRegistryFactory; -import org.apache.tuscany.sca.runtime.EndpointRegistry; +import org.apache.tuscany.sca.runtime.DomainRegistry; /** * The utility responsible for finding the endpoint regstry by the scheme and creating instances for the @@ -37,10 +37,10 @@ public class TribesDomainRegistryFactory extends BaseDomainRegistryFactory { super(registry); } - protected EndpointRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) { - EndpointRegistry endpointRegistry = - new ReplicatedEndpointRegistry(registry, null, endpointRegistryURI, domainURI); - return endpointRegistry; + protected DomainRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) { + DomainRegistry domainRegistry = + new ReplicatedDomainRegistry(registry, null, endpointRegistryURI, domainURI); + return domainRegistry; } public String[] getSupportedSchemes() { diff --git a/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java b/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java index c28a303070..b72d8e5de3 100644 --- a/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java +++ b/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java @@ -69,7 +69,7 @@ public class MultiRegTestCase implements EndpointListener { attrs1.put("receiverPort", port1); attrs1.put("receiverAutoBind", range); // attrs1.put("routes", host + ":" + port2 + " " + host + ":" + port3); - ReplicatedEndpointRegistry reg1 = new ReplicatedEndpointRegistry(extensionPoints, attrs1, "foo", "bar"); + ReplicatedDomainRegistry reg1 = new ReplicatedDomainRegistry(extensionPoints, attrs1, "foo", "bar"); reg1.addListener(this); reg1.start(); @@ -79,7 +79,7 @@ public class MultiRegTestCase implements EndpointListener { attrs2.put("receiverPort", port2); attrs2.put("receiverAutoBind", range); // attrs2.put("routes", host + ":"+port1); - ReplicatedEndpointRegistry reg2 = new ReplicatedEndpointRegistry(extensionPoints, attrs2, "foo", "bar"); + ReplicatedDomainRegistry reg2 = new ReplicatedDomainRegistry(extensionPoints, attrs2, "foo", "bar"); reg2.addListener(this); reg2.start(); @@ -89,7 +89,7 @@ public class MultiRegTestCase implements EndpointListener { attrs3.put("receiverPort", port3); attrs3.put("receiverAutoBind", range); // attrs3.put("routes", host + ":"+port1); - ReplicatedEndpointRegistry reg3 = new ReplicatedEndpointRegistry(extensionPoints, attrs3, "foo", "bar"); + ReplicatedDomainRegistry reg3 = new ReplicatedDomainRegistry(extensionPoints, attrs3, "foo", "bar"); reg3.addListener(this); reg3.start(); @@ -126,7 +126,7 @@ public class MultiRegTestCase implements EndpointListener { System.out.println(); // closed } - private Endpoint assertExists(ReplicatedEndpointRegistry reg, String uri) throws InterruptedException { + private Endpoint assertExists(ReplicatedDomainRegistry reg, String uri) throws InterruptedException { Endpoint ep = null; int count = 0; while (ep == null && count < 15) { diff --git a/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java b/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java index 99c5472c82..f469983c76 100644 --- a/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java +++ b/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java @@ -43,7 +43,7 @@ public class ReplicatedEndpointRegistryTestCase { Map<String, String> attrs = new HashMap<String, String>(); attrs.put("bind", "127.0.0.1"); - ReplicatedEndpointRegistry ep1 = new ReplicatedEndpointRegistry(extensionPoints, attrs, "foo", "bar"); + ReplicatedDomainRegistry ep1 = new ReplicatedDomainRegistry(extensionPoints, attrs, "foo", "bar"); System.out.println("ep1 is: " + ep1); ep1.start(); @@ -56,7 +56,7 @@ public class ReplicatedEndpointRegistryTestCase { System.out.println("EP1 in Registry 1: " + e1p); Assert.assertNotNull(e1p); - ReplicatedEndpointRegistry ep2 = new ReplicatedEndpointRegistry(extensionPoints, attrs, "foo", "bar"); + ReplicatedDomainRegistry ep2 = new ReplicatedDomainRegistry(extensionPoints, attrs, "foo", "bar"); System.out.println("ep2 is: " + ep2); ep2.start(); Thread.sleep(5000); @@ -65,7 +65,7 @@ public class ReplicatedEndpointRegistryTestCase { System.out.println("EP1 in Registry 2: " + e1p2); Assert.assertNotNull(e1p2); - ReplicatedEndpointRegistry ep3 = new ReplicatedEndpointRegistry(extensionPoints, attrs, "foo", "bar"); + ReplicatedDomainRegistry ep3 = new ReplicatedDomainRegistry(extensionPoints, attrs, "foo", "bar"); System.out.println("ep3 is: " + ep3); ep3.start(); Thread.sleep(5000); 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(); } } diff --git a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java index e46c8b720b..b747e947fd 100644 --- a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java +++ b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java @@ -53,7 +53,7 @@ import org.apache.tuscany.sca.node.extensibility.NodeExtension; import org.apache.tuscany.sca.runtime.ActivationException; import org.apache.tuscany.sca.runtime.CompositeActivator; 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.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentService; @@ -139,12 +139,12 @@ public class NodeImpl implements Node, NodeExtension { domainComposite = nodeFactory.configureNode(configuration, contributions, context); DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(nodeFactory.registry); - EndpointRegistry endpointRegistry = + DomainRegistry domainRegistry = domainRegistryFactory.getEndpointRegistry(configuration.getDomainRegistryURI(), configuration.getDomainURI()); this.compositeContext = new CompositeContext(nodeFactory.registry, - endpointRegistry, + domainRegistry, domainComposite, configuration.getDomainURI(), configuration.getURI(), diff --git a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RemoteServiceInvocationHandler.java b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RemoteServiceInvocationHandler.java index a79e4bee0a..ddab2de95b 100644 --- a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RemoteServiceInvocationHandler.java +++ b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RemoteServiceInvocationHandler.java @@ -43,7 +43,7 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContract; import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; -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.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; @@ -64,7 +64,7 @@ public class RemoteServiceInvocationHandler implements InvocationHandler { private Class<?> serviceInterface; private ExtensionPointRegistry extensionsRegistry; - private EndpointRegistry endpointRegistry; + private DomainRegistry domainRegistry; private InvocationHandler handler; private boolean reuse; @@ -72,10 +72,10 @@ public class RemoteServiceInvocationHandler implements InvocationHandler { /** * Constructor for when there is an existing Tuscany runtime for the domain */ - public RemoteServiceInvocationHandler(ExtensionPointRegistry extensionsRegistry, EndpointRegistry endpointRegistry, String serviceName, Class<?> serviceInterface) { + public RemoteServiceInvocationHandler(ExtensionPointRegistry extensionsRegistry, DomainRegistry domainRegistry, String serviceName, Class<?> serviceInterface) { this.extensionsRegistry = extensionsRegistry; - this.endpointRegistry = endpointRegistry; - this.domainURI = endpointRegistry.getDomainURI(); + this.domainRegistry = domainRegistry; + this.domainURI = domainRegistry.getDomainURI(); this.serviceName = serviceName; this.serviceInterface = serviceInterface; this.reuse = true; @@ -86,9 +86,9 @@ public class RemoteServiceInvocationHandler implements InvocationHandler { * @param endpointRegistry2 * @param extensionPointRegistry */ - public RemoteServiceInvocationHandler(ExtensionPointRegistry extensionsRegistry, EndpointRegistry endpointRegistry, String domainURI, String serviceName, Class<?> serviceInterface) throws NoSuchDomainException { + public RemoteServiceInvocationHandler(ExtensionPointRegistry extensionsRegistry, DomainRegistry domainRegistry, String domainURI, String serviceName, Class<?> serviceInterface) throws NoSuchDomainException { this.extensionsRegistry = extensionsRegistry; - this.endpointRegistry = endpointRegistry; + this.domainRegistry = domainRegistry; this.domainURI = domainURI; this.serviceName = serviceName; this.serviceInterface = serviceInterface; @@ -114,8 +114,8 @@ public class RemoteServiceInvocationHandler implements InvocationHandler { if (extensionsRegistry == null) { extensionsRegistry = RuntimeUtils.createExtensionPointRegistry(); } - if (endpointRegistry == null) { - endpointRegistry = RuntimeUtils.getClientEndpointRegistry(extensionsRegistry, domainURI); + if (domainRegistry == null) { + domainRegistry = RuntimeUtils.getClientEndpointRegistry(extensionsRegistry, domainURI); } FactoryExtensionPoint factories = extensionsRegistry.getExtensionPoint(FactoryExtensionPoint.class); @@ -123,9 +123,9 @@ public class RemoteServiceInvocationHandler implements InvocationHandler { JavaInterfaceFactory javaInterfaceFactory = factories.getFactory(JavaInterfaceFactory.class); ProxyFactory proxyFactory = new ExtensibleProxyFactory(extensionsRegistry.getExtensionPoint(ProxyFactoryExtensionPoint.class)); - CompositeContext compositeContext = new CompositeContext(extensionsRegistry, endpointRegistry, null, domainURI, null, null); + CompositeContext compositeContext = new CompositeContext(extensionsRegistry, domainRegistry, null, domainURI, null, null); - List<Endpoint> eps = endpointRegistry.findEndpoint(serviceName); + List<Endpoint> eps = domainRegistry.findEndpoint(serviceName); if (eps == null || eps.size() < 1) { throw new NoSuchServiceException(serviceName); } diff --git a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RuntimeUtils.java b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RuntimeUtils.java index 57690de199..4e7479809f 100644 --- a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RuntimeUtils.java +++ b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RuntimeUtils.java @@ -28,7 +28,7 @@ import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint; import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory; 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.RuntimeProperties; import org.apache.tuscany.sca.work.WorkScheduler; @@ -60,7 +60,7 @@ public class RuntimeUtils { return extensionsRegistry; } - public static EndpointRegistry getClientEndpointRegistry(ExtensionPointRegistry extensionsRegistry, String domainURI) throws NoSuchDomainException { + public static DomainRegistry getClientEndpointRegistry(ExtensionPointRegistry extensionsRegistry, String domainURI) throws NoSuchDomainException { DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionsRegistry); String registryURI = domainURI; diff --git a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java index 3252b900c5..0f51d472ee 100644 --- a/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java +++ b/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java @@ -27,7 +27,7 @@ import java.util.List; import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.ExtensionPointRegistryLocator; -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.RuntimeComponent; import org.oasisopen.sca.NoSuchDomainException; @@ -38,7 +38,7 @@ import org.oasisopen.sca.client.SCAClientFactoryFinder; public class SCAClientFactoryImpl extends SCAClientFactory { private ExtensionPointRegistry extensionPointRegistry; - private EndpointRegistry endpointRegistry; + private DomainRegistry domainRegistry; private boolean remoteClient; public static void setSCAClientFactoryFinder(SCAClientFactoryFinder factoryFinder) { @@ -54,10 +54,10 @@ public class SCAClientFactoryImpl extends SCAClientFactory { String domainURI = getDomainURI().toString(); for (ExtensionPointRegistry xpr : ExtensionPointRegistryLocator.getExtensionPointRegistries()) { ExtensibleDomainRegistryFactory drf = ExtensibleDomainRegistryFactory.getInstance(xpr); - for (EndpointRegistry epr : drf.getEndpointRegistries()) { + for (DomainRegistry epr : drf.getEndpointRegistries()) { if (domainURI.equals(epr.getDomainURI())) { this.extensionPointRegistry = xpr; - this.endpointRegistry = epr; + this.domainRegistry = epr; return; } } @@ -65,7 +65,7 @@ public class SCAClientFactoryImpl extends SCAClientFactory { remoteClient = true; extensionPointRegistry = RuntimeUtils.createExtensionPointRegistry(); - endpointRegistry = RuntimeUtils.getClientEndpointRegistry(extensionPointRegistry, domainURI); + domainRegistry = RuntimeUtils.getClientEndpointRegistry(extensionPointRegistry, domainURI); } @Override @@ -81,7 +81,7 @@ public class SCAClientFactoryImpl extends SCAClientFactory { // The service is a component in a local runtime if (!remoteClient) { - List<Endpoint> endpoints = endpointRegistry.findEndpoint(serviceURI); + List<Endpoint> endpoints = domainRegistry.findEndpoint(serviceURI); if (endpoints.size() < 1) { throw new NoSuchServiceException(serviceURI); } @@ -94,10 +94,10 @@ public class SCAClientFactoryImpl extends SCAClientFactory { InvocationHandler handler; if (!remoteClient) { // There is a local runtime but the service is a remote component - handler = new RemoteServiceInvocationHandler(extensionPointRegistry, endpointRegistry, serviceURI, serviceInterface); + handler = new RemoteServiceInvocationHandler(extensionPointRegistry, domainRegistry, serviceURI, serviceInterface); } else { // no local runtime - handler = new RemoteServiceInvocationHandler(extensionPointRegistry, endpointRegistry, getDomainURI().toString(), serviceURI, serviceInterface); + handler = new RemoteServiceInvocationHandler(extensionPointRegistry, domainRegistry, getDomainURI().toString(), serviceURI, serviceInterface); } return (T)Proxy.newProxyInstance(serviceInterface.getClassLoader(), new Class[]{serviceInterface}, handler); diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java index faef5c1937..dc479d2de2 100644 --- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java +++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java @@ -51,7 +51,7 @@ import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.impl.NodeImpl;
import org.apache.tuscany.sca.monitor.ValidationException;
import org.apache.tuscany.sca.runtime.ActivationException;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
import org.apache.tuscany.sca.runtime.Version;
import org.apache.tuscany.sca.shell.jline.JLine;
import org.oasisopen.sca.NoSuchServiceException;
@@ -351,7 +351,7 @@ public class Shell { if (getNode() == null) {
return true;
}
- EndpointRegistry reg = ((NodeImpl)getNode()).getEndpointRegistry();
+ DomainRegistry reg = ((NodeImpl)getNode()).getEndpointRegistry();
for (Endpoint endpoint : reg.getEndpoints()) {
out.println(endpoint.getComponent().getURI() + "/" + endpoint.getService().getName());
for (Binding b : endpoint.getService().getBindings()) {
diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java index 891e2957f2..4f86b1d1b3 100644 --- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java +++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java @@ -26,7 +26,7 @@ import jline.SimpleCompletor; import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.impl.NodeImpl; -import org.apache.tuscany.sca.runtime.EndpointRegistry; +import org.apache.tuscany.sca.runtime.DomainRegistry; import org.apache.tuscany.sca.shell.Shell; /** @@ -45,7 +45,7 @@ public class ServiceCompletor extends SimpleCompletor { public int complete(final String buffer, final int cursor, final List clist) { if (shell.getNode() != null) { List<String> services = new ArrayList<String>(); - EndpointRegistry reg = ((NodeImpl)shell.getNode()).getEndpointRegistry(); + DomainRegistry reg = ((NodeImpl)shell.getNode()).getEndpointRegistry(); for (Endpoint endpoint : reg.getEndpoints()) { services.add(endpoint.getComponent().getURI() + "/" + endpoint.getService().getName()); } diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java index 8c065c471f..3525bacdee 100644 --- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java +++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java @@ -28,7 +28,7 @@ import jline.SimpleCompletor; import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.impl.NodeImpl; -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.shell.Shell; @@ -58,7 +58,7 @@ public class ServiceOperationCompletor extends SimpleCompletor { @Override public int complete(final String buffer, final int cursor, final List clist) { String service = TShellCompletor.lastArg; - EndpointRegistry reg = ((NodeImpl)shell.getNode()).getEndpointRegistry(); + DomainRegistry reg = ((NodeImpl)shell.getNode()).getEndpointRegistry(); List<Endpoint> endpoints = reg.findEndpoint(service); if (endpoints.size() < 1) { return -1; |