Move all JLine classes into a sub package

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

5 files changed, 10 insertions, 7 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 9211a8af09..67c2eb29a8 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
@@ -46,17 +46,18 @@ import org.apache.tuscany.sca.node2.Node;
 import org.apache.tuscany.sca.node2.NodeFactory;

 import org.apache.tuscany.sca.runtime.ActivationException;

 import org.apache.tuscany.sca.runtime.Version;

+import org.apache.tuscany.sca.shell.jline.JLine;

 

 /**

  * A little SCA command shell.

  */

 public class Shell {

     

-    Node node;

+    public Node node;

     private boolean useJline;

     final List<String> history = new ArrayList<String>();

     private NodeFactory factory;

-    static final String[] COMMANDS = new String[] {"addDeploymentComposite", "addToDomainLevelComposite", "help",

+    public static final String[] COMMANDS = new String[] {"addDeploymentComposite", "addToDomainLevelComposite", "help",

                                                    "install", "installed", "listDeployedCompostes", "listInstalledContributions",

                                                    "printDomainLevelComposite", "removeFromDomainLevelComposite", 

                                                    "remove", "start", "status", "stop"};

@@ -219,7 +220,7 @@ public class Shell {
         return true;

     }

 

-    boolean stop(List<String> toks) throws ActivationException {

+    public boolean stop(List<String> toks) throws ActivationException {

         if (toks == null || toks.size() < 2) {

             node.stop();

             factory.stop();

diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/CompositeURICompletor.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/CompositeURICompletor.java
index 025b03fc92..fcfd5f0e28 100644
--- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/CompositeURICompletor.java
+++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/CompositeURICompletor.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.shell;
+package org.apache.tuscany.sca.shell.jline;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/ICURICompletor.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ICURICompletor.java
index c80c829142..c0273320df 100644
--- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/ICURICompletor.java
+++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ICURICompletor.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.shell;
+package org.apache.tuscany.sca.shell.jline;
 
 import java.util.List;
 
diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/JLine.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/JLine.java
index ed6e392eb3..3acf69b4bd 100644
--- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/JLine.java
+++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/JLine.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.shell;
+package org.apache.tuscany.sca.shell.jline;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -33,6 +33,7 @@ import jline.FileNameCompletor;
 import jline.SimpleCompletor;
 
 import org.apache.tuscany.sca.runtime.ActivationException;
+import org.apache.tuscany.sca.shell.Shell;
 
 /**
  * Keep all the JLine specific code out of the Shell class so that it runs ok
diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/TShellCompletor.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
index be70b1e375..0f6bbb6245 100644
--- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/TShellCompletor.java
+++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.shell;
+package org.apache.tuscany.sca.shell.jline;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -32,6 +32,7 @@ import jline.NullCompletor;
 import jline.SimpleCompletor;
 
 import org.apache.tuscany.sca.node2.Node;
+import org.apache.tuscany.sca.shell.Shell;
 
 /**
  * A Completor thats specific to the Tuscany Shell that knows about