Author: antelder
Date: Wed Jul 7 07:30:44 2010
New Revision: 961270
URL: http://svn.apache.org/viewvc?rev=961270&view=rev
Log:
Move all JLine classes into a sub package
Added:
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/CompositeURICompletor.java
- copied, changed from r961259,
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/CompositeURICompletor.java
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ICURICompletor.java
- copied, changed from r961030,
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/ICURICompletor.java
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/JLine.java
- copied, changed from r961257,
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/JLine.java
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
- copied, changed from r961259,
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/TShellCompletor.java
Removed:
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/CompositeURICompletor.java
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/ICURICompletor.java
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/JLine.java
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/TShellCompletor.java
Modified:
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
Modified:
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java?rev=961270&r1=961269&r2=961270&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
Wed Jul 7 07:30:44 2010
@@ -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();
Copied:
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/CompositeURICompletor.java
(from r961259,
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/CompositeURICompletor.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/CompositeURICompletor.java?p2=tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/CompositeURICompletor.java&p1=tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/CompositeURICompletor.java&r1=961259&r2=961270&rev=961270&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/CompositeURICompletor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/CompositeURICompletor.java
Wed Jul 7 07:30:44 2010
@@ -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;
Copied:
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ICURICompletor.java
(from r961030,
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/ICURICompletor.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ICURICompletor.java?p2=tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ICURICompletor.java&p1=tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/ICURICompletor.java&r1=961030&r2=961270&rev=961270&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/ICURICompletor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ICURICompletor.java
Wed Jul 7 07:30:44 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.shell;
+package org.apache.tuscany.sca.shell.jline;
import java.util.List;
Copied:
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/JLine.java
(from r961257,
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/JLine.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/JLine.java?p2=tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/JLine.java&p1=tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/JLine.java&r1=961257&r2=961270&rev=961270&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/JLine.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/JLine.java
Wed Jul 7 07:30:44 2010
@@ -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
Copied:
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
(from r961259,
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/TShellCompletor.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java?p2=tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java&p1=tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/TShellCompletor.java&r1=961259&r2=961270&rev=961270&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/TShellCompletor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
Wed Jul 7 07:30:44 2010
@@ -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
