diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules/shell/src/main')
| -rw-r--r-- | sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java index 8543ea1b14..d475af6a89 100644 --- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java +++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java @@ -55,18 +55,28 @@ public class Shell { Node node;
private boolean useJline;
final List<String> history = new ArrayList<String>();
+ private NodeFactory factory;
static final String[] COMMANDS = new String[] {"addDeploymentComposite", "addToDomainLevelComposite", "help",
"install", "installed", "listDeployedCompostes", "listInstalledContributions",
"printDomainLevelComposite", "removeFromDomainLevelComposite",
"remove", "start", "status", "stop"};
public static void main(final String[] args) throws Exception {
- boolean useJline = !Arrays.asList(args).contains("-nojline");
- new Shell(args.length > 0 ? args[0] : "default", useJline).run();
+ boolean useJline = true;
+ String domainURI = "default";
+ for (String s : args) {
+ if ("-nojline".equals(s)) {
+ useJline = false;
+ } else {
+ domainURI = s;
+ }
+ }
+ new Shell(domainURI, useJline).run();
}
public Shell(String domainURI, boolean useJLine) {
- this.node = NodeFactory.newInstance().createNode(domainURI);
+ this.factory = NodeFactory.newInstance();
+ this.node = factory.createNode(domainURI);
this.useJline = useJLine;
}
@@ -212,6 +222,7 @@ public class Shell { boolean stop(List<String> toks) throws ActivationException {
if (toks == null || toks.size() < 2) {
node.stop();
+ factory.stop();
return false;
}
String curi = toks.get(1);
|