Remove old or currently unused commands

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

2 files changed, 1 insertions, 39 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 db6ec54a01..57b27515ce 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
@@ -59,7 +59,7 @@ public class Shell {
     private Map<String, Node> nodes = new HashMap<String, Node>();

 

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

-                                                          "load", "printDomainLevelComposite", "remove", "run", "save", "start", "status",

+                                                          "load", "remove", "run", "save", "start", "status",

                                                           "stop"};

 

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

@@ -198,18 +198,6 @@ public class Shell {
         return true;

     }

 

-    boolean printDomainLevelComposite() throws ContributionReadException, ActivationException, ValidationException {

-        out.println("TODO");

-        // out.println(node.getDomainLevelCompositeAsString());

-        return true;

-    }

-

-    boolean getQNameDefinition(final String curi, String definintion, String symbolSpace)

-        throws ContributionReadException, ActivationException, ValidationException {

-        // TODO:

-        return true;

-    }

-

     boolean remove(final String curi) throws ContributionReadException, ActivationException, ValidationException {

         if (getNode() == null) {

             out.println("not in domain, use domain command first");

@@ -418,18 +406,6 @@ public class Shell {
                     return load(toks.get(1));

                 }

             };

-        if (op.equalsIgnoreCase("printDomainLevelComposite"))

-            return new Callable<Boolean>() {

-                public Boolean call() throws Exception {

-                    return printDomainLevelComposite();

-                }

-            };

-        if (op.equalsIgnoreCase("getQNameDefinition"))

-            return new Callable<Boolean>() {

-                public Boolean call() throws Exception {

-                    return getQNameDefinition(toks.get(1), toks.get(2), toks.get(3));

-                }

-            };

         if (op.equalsIgnoreCase("remove"))

             return new Callable<Boolean>() {

                 public Boolean call() throws Exception {

@@ -555,8 +531,6 @@ public class Shell {
             helpRemove();

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

             helpRun();

-        } else if ("printDomainLevelComposite".equalsIgnoreCase(command)) {

-            helpPrintDomainLevelComposite();

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

             helpSave();

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

@@ -590,7 +564,6 @@ public class Shell {
         out.println("   load <configXmlURL>");

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

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

-        out.println("   printDomainLevelComposite");

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

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

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

@@ -696,15 +669,6 @@ public class Shell {
         out.println("      commandsFileURL - (required) the URL of the commands file to run");

     }

 

-    void helpPrintDomainLevelComposite() {

-        out.println("   printDomainLevelComposite");

-        out.println();

-        out.println("   Not yet implemented");

-        out.println();

-        out.println("   Arguments:");

-        out.println("      none");

-    }

-

     void helpSave() {

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

         out.println();

diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
index 5bcf772f57..fea28795a8 100644
--- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
+++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
@@ -57,8 +57,6 @@ public class TShellCompletor extends ArgumentCompletor {
         completors.put("load", new Completor[]{commandCompletor, new FileNameCompletor(), new NullCompletor()});    
         completors.put("remove", new Completor[]{commandCompletor, new ICURICompletor(shell), new NullCompletor()});    
         completors.put("run", new Completor[]{commandCompletor, new FileNameCompletor(), new NullCompletor()});    
-        completors.put("addDeploymentComposite", new Completor[]{commandCompletor, new ICURICompletor(shell), new FileNameCompletor(), new NullCompletor()});    
-        completors.put("printDomainLevelComposite", new Completor[]{commandCompletor, new NullCompletor()});    
         completors.put("save", new Completor[]{commandCompletor, new FileNameCompletor(), new NullCompletor()});    
         completors.put("start", new Completor[]{commandCompletor, new ICURICompletor(shell), new CompositeURICompletor(shell), new NullCompletor()});    
         completors.put("status", new Completor[]{commandCompletor, new ICURICompletor(shell), new CompositeURICompletor(shell), new NullCompletor()});