Update the registry to use a single class for all the installed contribution attributes, and to correct the storing of running composites to be qualified by the contribution uri. As per a previous commit comment this is still work in progress so a little rough, but its getting closer now to show the type of thing thats needed

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

1 files changed, 11 insertions, 23 deletions

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/ReplicatedEndpointRegistry.java
index 1edcdf498f..f5b54f1ea8 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/ReplicatedEndpointRegistry.java
@@ -47,7 +47,6 @@ import org.apache.catalina.tribes.membership.StaticMember;
 import org.apache.catalina.tribes.transport.ReceiverBase;
 import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.contribution.Export;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.LifeCycleListener;
 import org.apache.tuscany.sca.endpoint.tribes.AbstractReplicatedMap.MapEntry;
@@ -55,6 +54,7 @@ import org.apache.tuscany.sca.endpoint.tribes.MapStore.MapListener;
 import org.apache.tuscany.sca.runtime.BaseEndpointRegistry;
 import org.apache.tuscany.sca.runtime.DomainRegistryURI;
 import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.InstalledContribution;
 import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
 
 /**
@@ -422,61 +422,49 @@ public class ReplicatedEndpointRegistry extends BaseEndpointRegistry implements
     }
 
     @Override
-    public void addRunningComposite(Composite composite) {
-        // TODO Auto-generated method stub
-        
-    }
-
-    @Override
-    public void removeRunningComposite(QName name) {
-        // TODO Auto-generated method stub
-        
-    }
-
-    @Override
-    public Composite getRunningComposite(QName name) {
+    public List<String> getInstalledContributionURIs() {
         // TODO Auto-generated method stub
         return null;
     }
 
     @Override
-    public List<QName> getRunningCompositeNames() {
+    public void uninstallContribution(String uri) {
         // TODO Auto-generated method stub
-        return null;
+        
     }
 
     @Override
-    public List<String> getInstalledContributionURIs() {
+    public void installContribution(InstalledContribution ic) {
         // TODO Auto-generated method stub
-        return null;
+        
     }
 
     @Override
-    public String getInstalledContributionURL(String uri) {
+    public InstalledContribution getInstalledContribution(String uri) {
         // TODO Auto-generated method stub
         return null;
     }
 
     @Override
-    public void uninstallContribution(String uri) {
+    public void addRunningComposite(String contributionURI, Composite composite) {
         // TODO Auto-generated method stub
         
     }
 
     @Override
-    public void installContribution(String uri, String url, List<QName> deployables, List<Export> exports) {
+    public void removeRunningComposite(String contributionURI, QName name) {
         // TODO Auto-generated method stub
         
     }
 
     @Override
-    public List<QName> getInstalledContributionDeployables(String uri) {
+    public Composite getRunningComposite(String contributionURI, QName name) {
         // TODO Auto-generated method stub
         return null;
     }
 
     @Override
-    public List<Export> getInstalledContributionExports(String uri) {
+    public Map<String, List<QName>> getRunningCompositeNames() {
         // TODO Auto-generated method stub
         return null;
     }