Do some clean up, simplify dependencies, remove unused classes and folders, update to restart stopped composites

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

1 files changed, 14 insertions, 13 deletions

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 6788f29ca5..c82fc3a81c 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
@@ -52,6 +52,7 @@ public class DeployedComposite {
     private Deployer deployer;
     private EndpointRegistry endpointRegistry;
     private ExtensionPointRegistry extensionPointRegistry;
+    private Contribution systemContribution;
 
     public DeployedComposite(Composite composite,
                              InstalledContribution ic,
@@ -83,18 +84,14 @@ public class DeployedComposite {
         contribution.get(0).getDeployables().clear();
         contribution.get(0).getDeployables().add(composite);
         
+        
         Monitor monitor = deployer.createMonitor();
-// TODO: is the ContextMonitor neccessary here?         
-//        Monitor tcm = monitorFactory.setContextMonitor(monitor);
-//        try {
-            
-            domainComposite = deployer.build(contribution, dependedOnContributions, new HashMap<QName, List<String>>(), monitor);
-            monitor.analyzeProblems();
+        if (systemContribution == null) {
+            this.systemContribution = deployer.cloneSystemContribution(monitor);
+        }
+        domainComposite = deployer.build(contribution, dependedOnContributions, systemContribution, new HashMap<QName, List<String>>(), monitor);
+        monitor.analyzeProblems();
 
-//        } finally {
-//            monitorFactory.setContextMonitor(tcm);
-//        }
-        
         compositeContext = new CompositeContext(extensionPointRegistry, 
                                                 endpointRegistry, 
                                                 domainComposite, 
@@ -102,13 +99,17 @@ public class DeployedComposite {
                                                 null, // don't need node uri
                                                 deployer.getSystemDefinitions());
                        
-        compositeActivator.activate(compositeContext, domainComposite);
-        compositeActivator.start(compositeContext, domainComposite);
+        start();
 
         this.uri = getCompositeURI(composite, installedContribution);
     }
 
-    public void unDeploy() throws ActivationException {
+    public void start() throws ActivationException {
+        compositeActivator.activate(compositeContext, domainComposite);
+        compositeActivator.start(compositeContext, domainComposite);
+    }
+
+    public void stop() throws ActivationException {
         compositeActivator.stop(compositeContext, domainComposite);
         compositeActivator.deactivate(domainComposite);
     }