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, 9 insertions, 16 deletions

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 ec8be4fe35..6400497f05 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
@@ -89,6 +89,7 @@ import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.runtime.BaseEndpointRegistry;
 import org.apache.tuscany.sca.runtime.EndpointReferenceBinder;
 import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.InstalledContribution;
 import org.apache.tuscany.sca.xsd.XSDFactory;
 import org.apache.tuscany.sca.xsd.XSDefinition;
 
@@ -837,39 +838,31 @@ public class DeployerImpl implements Deployer {
         public void stop() {
         }
 
-        public void addRunningComposite(Composite composite) {
-        }
-
-        public void removeRunningComposite(QName name) {
-        }
-
-        public Composite getRunningComposite(QName name) {
+        public List<String> getInstalledContributionURIs() {
             return null;
         }
 
-        public List<QName> getRunningCompositeNames() {
-            return null;
+        public void uninstallContribution(String uri) {
         }
 
-        public void installContribution(String uri, String url, List<QName> deployables, List<Export> exports) {
+        public void installContribution(InstalledContribution ic) {
         }
 
-        public List<String> getInstalledContributionURIs() {
+        public InstalledContribution getInstalledContribution(String uri) {
             return null;
         }
 
-        public String getInstalledContributionURL(String uri) {
-            return null;
+        public void addRunningComposite(String contributionURI, Composite composite) {
         }
 
-        public void uninstallContribution(String uri) {
+        public void removeRunningComposite(String contributionURI, QName name) {
         }
 
-        public List<QName> getInstalledContributionDeployables(String uri) {
+        public Composite getRunningComposite(String contributionURI, QName name) {
             return null;
         }
 
-        public List<Export> getInstalledContributionExports(String uri) {
+        public Map<String, List<QName>> getRunningCompositeNames() {
             return null;
         }
     }