You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2010/09/08 02:02:06 UTC
svn commit: r993561 - in
/tuscany/sandbox/sebastien/java/shell/samples/launcher-shell:
scripts/test-remote.txt scripts/test-start.txt scripts/test.txt
src/main/java/sample/Shell.java
Author: jsdelfino
Date: Wed Sep 8 00:02:05 2010
New Revision: 993561
URL: http://svn.apache.org/viewvc?rev=993561&view=rev
Log:
Change uri parameter to location of deployment composite and make it optional. Change restart command to use previous config if not specified.
Modified:
tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test-remote.txt
tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test-start.txt
tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test.txt
tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/src/main/java/sample/Shell.java
Modified: tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test-remote.txt
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test-remote.txt?rev=993561&r1=993560&r2=993561&view=diff
==============================================================================
--- tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test-remote.txt (original)
+++ tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test-remote.txt Wed Sep 8 00:02:05 2010
@@ -14,23 +14,23 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
-start foo c1 http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
+start foo http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
stop foo
-start foo c1 http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
+start foo http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
stop foo
-start foo c1 http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
+start foo http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
stop foo
-start foo c1 http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
+start foo http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
stop foo
-start foo c1 http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
+start foo http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
stop foo
-start foo c1 http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
+start foo http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
stop foo
-start foo c1 http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
+start foo http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
stop foo
-start foo c1 http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
+start foo http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
stop foo
-start foo c1 http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
+start foo http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
stop foo
-start foo c1 http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
+start foo http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
stop foo
Modified: tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test-start.txt
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test-start.txt?rev=993561&r1=993560&r2=993561&view=diff
==============================================================================
--- tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test-start.txt (original)
+++ tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test-start.txt Wed Sep 8 00:02:05 2010
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
-start foo c1 http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
+start foo http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
status
Modified: tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test.txt
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test.txt?rev=993561&r1=993560&r2=993561&view=diff
==============================================================================
--- tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test.txt (original)
+++ tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/scripts/test.txt Wed Sep 8 00:02:05 2010
@@ -14,23 +14,23 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
-start foo c1 ../contribution-implementation-java-calculator/target/classes
+start foo ../contribution-implementation-java-calculator/target/classes
stop foo
-start foo c1 ../contribution-implementation-java-calculator/target/classes
+start foo ../contribution-implementation-java-calculator/target/classes
stop foo
-start foo c1 ../contribution-implementation-java-calculator/target/classes
+start foo ../contribution-implementation-java-calculator/target/classes
stop foo
-start foo c1 ../contribution-implementation-java-calculator/target/classes
+start foo ../contribution-implementation-java-calculator/target/classes
stop foo
-start foo c1 ../contribution-implementation-java-calculator/target/classes
+start foo ../contribution-implementation-java-calculator/target/classes
stop foo
-start foo c1 ../contribution-implementation-java-calculator/target/classes
+start foo ../contribution-implementation-java-calculator/target/classes
stop foo
-start foo c1 ../contribution-implementation-java-calculator/target/classes
+start foo ../contribution-implementation-java-calculator/target/classes
stop foo
-start foo c1 ../contribution-implementation-java-calculator/target/classes
+start foo ../contribution-implementation-java-calculator/target/classes
stop foo
-start foo c1 ../contribution-implementation-java-calculator/target/classes
+start foo ../contribution-implementation-java-calculator/target/classes
stop foo
-start foo c1 ../contribution-implementation-java-calculator/target/classes
+start foo ../contribution-implementation-java-calculator/target/classes
stop foo
Modified: tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/src/main/java/sample/Shell.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/src/main/java/sample/Shell.java?rev=993561&r1=993560&r2=993561&view=diff
==============================================================================
--- tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/src/main/java/sample/Shell.java (original)
+++ tuscany/sandbox/sebastien/java/shell/samples/launcher-shell/src/main/java/sample/Shell.java Wed Sep 8 00:02:05 2010
@@ -44,44 +44,44 @@ import org.apache.tuscany.sca.node.NodeF
* A little SCA command shell.
*/
public class Shell {
- final NodeFactory nodeFactory;
+ final NodeFactory nf;
- public static class NodeInfo {
+ public static class Nodeconf {
final String name;
- final String curi;
final String cloc;
+ final String dcuri;
final Node node;
- NodeInfo(final String name, final String curi, final String cloc, final Node node) {
+ Nodeconf(final String name, final String cloc, final String dcuri, final Node node) {
this.name = name;
- this.curi = curi;
this.cloc = cloc;
+ this.dcuri = dcuri;
this.node = node;
}
public String toString() {
- return name + " " + curi + " " + cloc;
+ return name + " " + cloc + (dcuri != null? " " + dcuri : "");
}
}
- final Map<String, NodeInfo> nodes = new HashMap<String, NodeInfo>();
+ final Map<String, Nodeconf> nodes = new HashMap<String, Nodeconf>();
final List<String> history = new ArrayList<String>();
public Shell(NodeFactory nf) {
- this.nodeFactory = nf;
+ this.nf = nf;
}
- List<?> start(final String name, final String curi, final String cloc) {
+ List<?> start(final String name, final String cloc, final String dcuri) {
if(nodes.containsKey(name))
return emptyList();
- final Node node = nodeFactory.createNode(new Contribution(curi, cloc));
- nodes.put(name, new NodeInfo(name, curi, cloc, node));
+ final Node node = dcuri != null? nf.createNode(dcuri, new Contribution(cloc, cloc)) : nf.createNode(new Contribution(cloc, cloc));
+ nodes.put(name, new Nodeconf(name, cloc, dcuri, node));
node.start();
return emptyList();
}
List<?> stop(final String name) {
- final NodeInfo ninfo = nodes.get(name);
+ final Nodeconf ninfo = nodes.get(name);
if(ninfo == null)
return emptyList();
ninfo.node.stop();
@@ -90,15 +90,21 @@ public class Shell {
}
List<?> stop() {
- for(NodeInfo ninfo: nodes.values())
+ for(Nodeconf ninfo: nodes.values())
ninfo.node.stop();
nodes.clear();
return emptyList();
}
- List<?> restart(final String name, final String curi, final String cloc) {
- stop(name);
- return start(name, curi, cloc);
+ List<?> restart(final String name, final String cloc, final String dcuri) {
+ final Nodeconf ninfo = nodes.get(name);
+ if(ninfo == null)
+ return start(name, cloc, dcuri);
+ ninfo.node.stop();
+ nodes.remove(name);
+ if (cloc == null)
+ return start(ninfo.name, ninfo.cloc, ninfo.dcuri);
+ return start(name, cloc, dcuri);
}
List<?> status() {
@@ -124,7 +130,7 @@ public class Shell {
if(op.equals("start"))
return new Callable<List<?>>() {
public List<?> call() {
- return start(toks.get(1), toks.get(2), toks.get(3));
+ return start(toks.get(1), toks.get(2), toks.size() >= 4? toks.get(3) : null);
}
};
if(op.equals("stop"))
@@ -138,7 +144,7 @@ public class Shell {
if(op.equals("restart"))
return new Callable<List<?>>() {
public List<?> call() {
- return restart(toks.get(1), toks.get(2), toks.get(3));
+ return restart(toks.get(1), toks.size() >= 3? toks.get(2) : null, toks.size() >= 4? toks.get(3) : null);
}
};
if(op.equals("status"))
@@ -184,7 +190,7 @@ public class Shell {
return true;
}
- public Map<String, NodeInfo> run(final BufferedReader r, final PrintWriter w) throws IOException {
+ public Map<String, Nodeconf> run(final BufferedReader r, final PrintWriter w) throws IOException {
while(print(apply(eval(read(r))), w))
;
r.close();