summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-06-09 07:42:29 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-06-09 07:42:29 +0000
commitcf504797e15288d34a5a62ae5748ca100fc5abf5 (patch)
tree0197338f93effa392b5b7316ea026aaf7e373208
parente3ecaeadeba1df24575ec739f747166463285652 (diff)
Move the node name to be the last parameter on the start to make it more consistent
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1133694 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java2
-rw-r--r--sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java6
2 files changed, 4 insertions, 4 deletions
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java
index ad6908723a..c735258367 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java
@@ -154,7 +154,7 @@ public interface Node {
* @throws ContributionReadException
*/
void startComposite(String contributionURI, String compositeURI) throws ActivationException, ValidationException, ContributionReadException;
- void startComposite(String memberName, String contributionURI, String compositeURI) throws ActivationException;
+ void startComposite(String contributionURI, String compositeURI, String nodeName) throws ActivationException;
/**
* 4687 10.7.2 remove From Domain-Level Composite
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 b5814550ab..00eb2e7e06 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
@@ -50,9 +50,9 @@ import org.apache.tuscany.sca.monitor.ValidationException;
import org.apache.tuscany.sca.runtime.ActivationException;
import org.apache.tuscany.sca.runtime.ActiveNodes;
import org.apache.tuscany.sca.runtime.CompositeActivator;
+import org.apache.tuscany.sca.runtime.ContributionDescription;
import org.apache.tuscany.sca.runtime.ContributionListener;
import org.apache.tuscany.sca.runtime.DomainRegistry;
-import org.apache.tuscany.sca.runtime.ContributionDescription;
import org.oasisopen.sca.NoSuchServiceException;
public class NodeImpl implements Node {
@@ -249,8 +249,8 @@ public class NodeImpl implements Node {
}
@Override
- public void startComposite(String memberName, String contributionURI, String compositeURI) throws ActivationException {
- String response = domainRegistry.remoteCommand(memberName, new RemoteCommand(domainName, "start", contributionURI, compositeURI));
+ public void startComposite(String contributionURI, String compositeURI, String nodeName) throws ActivationException {
+ String response = domainRegistry.remoteCommand(nodeName, new RemoteCommand(domainName, "start", contributionURI, compositeURI));
if (!"Started.".equals(response)) {
throw new ActivationException(response);
}