Start some clean up of the Shell commands to match what the runtime is doing

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

1 files changed, 19 insertions, 6 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 cec7194129..5ca4272762 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
@@ -72,7 +72,7 @@ public class Shell {
     private Map<String, Node> standaloneNodes = new HashMap<String, Node>();

     private Map<String, Node> nodes = new HashMap<String, Node>();

 

-    public static final String[] COMMANDS = new String[] {"bye", "addComposite", "domain", "domains", "domainComposite", "help", "install", "installed", "invoke",

+    public static final String[] COMMANDS = new String[] {"addComposite", "bye", "domain", "domains", "domainComposite", "help", "install", "installed", "invoke",

                                                           "load", "members", "remove", "run", "save", "services", "start", "started", "stop"};

 

     public static void main(final String[] args) throws Exception {

@@ -768,6 +768,8 @@ public class Shell {
             helpOverview();

         } else if ("help".equalsIgnoreCase(command)) {

             helpHelp();

+        } else if ("addComposite".equalsIgnoreCase(command)) {

+            helpAddComposite();

         } else if ("install".equalsIgnoreCase(command)) {

             helpInstall();

         } else if ("installed".equalsIgnoreCase(command)) {

@@ -805,21 +807,22 @@ public class Shell {
         out.println("Commands:");

         out.println();

         out.println("   help");

+        out.println("   addComposite <contributionURI> <compositeURI");

         out.println("   domain <domainURI>");

         out.println("   domains");

-        out.println("   install [<uri>] <contributionURL> [-start] [-metadata <url>] [-duris <uri,uri,...>]");

+        out.println("   install [<uri>] <contributionURL> [-metadata <url>] [-duris <uri,uri,...>]");

         out.println("   installed [<contributionURI>]");

         out.println("   invoke <component>[/<service>] <operation> [<arg0> <arg1> ...]");

         out.println("   load <configXmlURL>");

+        out.println("   members");

         out.println("   remove <contributionURI>");

         out.println("   run <commandsFileURL>");

         out.println("   save <directoryPath>");

         out.println("   services");

-        out.println("   start <curi> <compositeUri>|<contentURL>");

-        out.println("   start <name> [<compositeUri>] <contributionURL> [-duris <uri,uri,...>]");

-        out.println("   started [<curi> [<compositeUri>]]");

+        out.println("   start <curi> <compositeUri> [<member>]");

+        out.println("   started");

         out.println("   status");

-        out.println("   stop [<curi> [<compositeUri>]]");

+        out.println("   stop <curi> <compositeUri>");

         out.println("   bye");

         out.println();

         if (useJline)

@@ -828,6 +831,16 @@ public class Shell {
         return true;

     }

 

+    void helpAddComposite() {

+        out.println("   addComposite <contributionURI> <compositeURI");

+        out.println();

+        out.println("   Adds a deployable composite to an installed contribution.");

+        out.println();

+        out.println("   Arguments:");

+        out.println("      contributionURI - (required) the URI of the installed contribution");

+        out.println("      compositeURL    - (required) the URL to an external composite file");

+    }

+

     void helpHelp() {

         out.println("   help [<command>]");

         out.println();