You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2011/05/16 09:22:00 UTC
svn commit: r1103629 [2/2] - in /tuscany/sca-java-2.x/trunk/modules:
binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/
binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/
core-spi...
Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java Mon May 16 07:21:58 2011
@@ -70,7 +70,7 @@ import org.apache.tuscany.sca.monitor.Mo
import org.apache.tuscany.sca.monitor.ValidationException;
import org.apache.tuscany.sca.runtime.ActivationException;
import org.apache.tuscany.sca.runtime.CompositeActivator;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
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;
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl2.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl2.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl2.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl2.java Mon May 16 07:21:58 2011
@@ -59,7 +59,7 @@ import org.apache.tuscany.sca.monitor.Va
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())) {
Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/ServiceHelper.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/ServiceHelper.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/ServiceHelper.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/ServiceHelper.java Mon May 16 07:21:58 2011
@@ -41,7 +41,7 @@ import org.apache.tuscany.sca.interfaced
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.ServiceRuntimeE
*/
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;
Copied: tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java (from r1103525, tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java?p2=tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java&p1=tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java&r1=1103525&r2=1103629&rev=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedDomainRegistry.java Mon May 16 07:21:58 2011
@@ -51,18 +51,18 @@ import org.apache.tuscany.sca.core.Exten
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
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
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) {
Modified: tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java Mon May 16 07:21:58 2011
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.endpoint.
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.runtime.BaseDomainRegistryFactory;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.DomainRegistry;
/**
* The utility responsible for finding the endpoint regstry by the scheme and creating instances for the
@@ -37,10 +37,10 @@ public class TribesDomainRegistryFactory
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() {
Modified: tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java Mon May 16 07:21:58 2011
@@ -69,7 +69,7 @@ public class MultiRegTestCase implements
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
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
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
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) {
Modified: tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java Mon May 16 07:21:58 2011
@@ -43,7 +43,7 @@ public class ReplicatedEndpointRegistryT
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 ReplicatedEndpointRegistryT
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 ReplicatedEndpointRegistryT
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);
Modified: tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java Mon May 16 07:21:58 2011
@@ -30,7 +30,7 @@ import org.apache.tuscany.sca.implementa
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.remoteserviceadm
*/
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 exte
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 exte
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();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java Mon May 16 07:21:58 2011
@@ -53,7 +53,7 @@ import org.apache.tuscany.sca.node.exten
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, N
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(),
Modified: tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RemoteServiceInvocationHandler.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RemoteServiceInvocationHandler.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RemoteServiceInvocationHandler.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RemoteServiceInvocationHandler.java Mon May 16 07:21:58 2011
@@ -43,7 +43,7 @@ import org.apache.tuscany.sca.interfaced
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 RemoteServiceInvocationHand
private Class<?> serviceInterface;
private ExtensionPointRegistry extensionsRegistry;
- private EndpointRegistry endpointRegistry;
+ private DomainRegistry domainRegistry;
private InvocationHandler handler;
private boolean reuse;
@@ -72,10 +72,10 @@ public class RemoteServiceInvocationHand
/**
* 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 RemoteServiceInvocationHand
* @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 RemoteServiceInvocationHand
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 RemoteServiceInvocationHand
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);
}
Modified: tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RuntimeUtils.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RuntimeUtils.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RuntimeUtils.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/RuntimeUtils.java Mon May 16 07:21:58 2011
@@ -28,7 +28,7 @@ import org.apache.tuscany.sca.core.Modul
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;
Modified: tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java Mon May 16 07:21:58 2011
@@ -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.SCAClien
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 extend
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 extend
remoteClient = true;
extensionPointRegistry = RuntimeUtils.createExtensionPointRegistry();
- endpointRegistry = RuntimeUtils.getClientEndpointRegistry(extensionPointRegistry, domainURI);
+ domainRegistry = RuntimeUtils.getClientEndpointRegistry(extensionPointRegistry, domainURI);
}
@Override
@@ -81,7 +81,7 @@ public class SCAClientFactoryImpl extend
// 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 extend
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);
Modified: tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java Mon May 16 07:21:58 2011
@@ -51,7 +51,7 @@ import org.apache.tuscany.sca.contributi
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()) {
Modified: tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java Mon May 16 07:21:58 2011
@@ -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 Si
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());
}
Modified: tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java?rev=1103629&r1=1103628&r2=1103629&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java Mon May 16 07:21:58 2011
@@ -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 e
@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;