Remove remoteStart/Stop commands to simplify - don't need remoteStop as stop can see that the composte is running remotely and for start just overload the start command to take a member name to run the composite on

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

1 files changed, 19 insertions, 14 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 2682ec493b..dcf243eab9 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
@@ -33,8 +33,6 @@ import javax.xml.stream.XMLStreamException;
 
 import org.apache.tuscany.sca.Node;
 import org.apache.tuscany.sca.TuscanyRuntime;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Base;
 import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.xml.Utils;
 import org.apache.tuscany.sca.common.java.io.IOHelper;
@@ -45,7 +43,6 @@ import org.apache.tuscany.sca.contribution.java.JavaImport;
 import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.deployment.Deployer;
 import org.apache.tuscany.sca.monitor.Monitor;
@@ -249,12 +246,30 @@ public class NodeImpl implements Node {
             startedComposites.put(key, dc);
         }
     }
+
+    @Override
+    public void startComposite(String memberName, String contributionURI, String compositeURI) throws ActivationException {
+        String response = domainRegistry.remoteCommand(memberName, new RemoteCommand(domainName, "start", contributionURI, compositeURI));
+        if (!"Started.".equals(response)) {
+            throw new ActivationException(response);
+        }
+    }
+
+    
     
     public void stopComposite(String contributionURI, String compositeURI) throws ActivationException {
         String key = contributionURI+"/"+compositeURI;
         DeployedComposite dc = startedComposites.remove(key);
         if (dc == null) {
-            throw new IllegalStateException("composite not started: " + compositeURI);
+            String member = domainRegistry.getRunningMember(contributionURI, compositeURI);
+            if (member == null) {
+                throw new IllegalStateException("composite not started: " + compositeURI);
+            }
+            RemoteCommand command = new RemoteCommand(domainName, "stop", contributionURI, compositeURI);
+            String response = domainRegistry.remoteCommand(member, command);
+            if (!"Stopped.".equals(response)) {
+                throw new ActivationException(response);
+            }
         }
         dc.stop();
         stoppedComposites.put(key, dc);
@@ -399,14 +414,4 @@ public class NodeImpl implements Node {
         return domainRegistry.getRunningMember(contributionURI, compositeURI);
     }
 
-    @Override
-    public String remoteStart(String memberName, String contributionURI, String compositeURI) {
-        return domainRegistry.remoteCommand(memberName, new RemoteCommand(domainName, "start", contributionURI, compositeURI));
-    }
-
-    @Override
-    public String remoteStop(String memberName, String contributionURI, String compositeURI) {
-        return domainRegistry.remoteCommand(memberName, new RemoteCommand(domainName, "stop", contributionURI, compositeURI));
-    }
-
 }