You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2011/06/09 09:42:29 UTC
svn commit: r1133694 - in
/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca:
Node.java impl/NodeImpl.java
Author: antelder
Date: Thu Jun 9 07:42:29 2011
New Revision: 1133694
URL: http://svn.apache.org/viewvc?rev=1133694&view=rev
Log:
Move the node name to be the last parameter on the start to make it more consistent
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java?rev=1133694&r1=1133693&r2=1133694&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java Thu Jun 9 07:42:29 2011
@@ -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
Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java?rev=1133694&r1=1133693&r2=1133694&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java Thu Jun 9 07:42:29 2011
@@ -50,9 +50,9 @@ import org.apache.tuscany.sca.monitor.Va
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);
}