Update the registry to store info about a contributions deployables and exports so that distrubuted nodes are able to see what is available without having to actually go get and install a remote contribution. This is work in progress, an alternative is to just put the Contribution model object itself in the registry and have the registry impl hide the details, but this approach is easier for now as we see how things can work

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1101793 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 2 deletions

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 28a7952b19..fc7cf43711 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
@@ -107,7 +107,8 @@ public class NodeImpl implements Node {
         if (uri == null) {
             uri = getDefaultContributionURI(contributionURL);
         }
-        endpointRegistry.installContribution(uri, contributionURL);
+        // TODO: sort out deployables and exports
+        endpointRegistry.installContribution(uri, contributionURL, null, null);
         if (startDeployables) {
             // TODO: sort out metadata and dependents in distributed
             localInstall(uri, contributionURL, metaDataURL, dependentContributionURIs, startDeployables);
@@ -454,7 +455,9 @@ public class NodeImpl implements Node {
     }
 
     public List<String> getInstalledContributionURIs() {
-        return new ArrayList<String>(locallyInstalledContributions.keySet());
+        Set<String> ls = new HashSet<String>(endpointRegistry.getInstalledContributionURIs());
+        ls.addAll(locallyInstalledContributions.keySet());
+        return new ArrayList<String>(ls);
     }
 
     public Contribution getInstalledContribution(String uri) {