Enable built-in echo command
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@803184 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/EchoCommand.java b/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/EchoAction.java
similarity index 81%
rename from karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/EchoCommand.java
rename to karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/EchoAction.java
index e1d4163..699bb6c 100644
--- a/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/EchoCommand.java
+++ b/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/EchoAction.java
@@ -8,12 +8,12 @@
import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
@Command(scope = "shell", name = "echo", description="Echo or print arguments to STDOUT")
-public class EchoCommand extends OsgiCommandSupport
+public class EchoAction extends OsgiCommandSupport
{
@Option(name="-n", description="Do not print the trailing newline character")
- private boolean trailingNewline = true;
+ private boolean noTrailingNewline = false;
- @Argument(description="Arguments")
+ @Argument(description="Arguments", multiValued = true)
private List<String> args;
protected Object doExecute() throws Exception {
@@ -28,7 +28,7 @@
}
}
- if (trailingNewline) {
+ if (!noTrailingNewline) {
System.out.println();
}
diff --git a/karaf/gshell/gshell-commands/src/main/resources/OSGI-INF/blueprint/gshell-commands.xml b/karaf/gshell/gshell-commands/src/main/resources/OSGI-INF/blueprint/gshell-commands.xml
index 6b4d900..f7a83f9 100644
--- a/karaf/gshell/gshell-commands/src/main/resources/OSGI-INF/blueprint/gshell-commands.xml
+++ b/karaf/gshell/gshell-commands/src/main/resources/OSGI-INF/blueprint/gshell-commands.xml
@@ -23,15 +23,31 @@
<command name="shell/cat">
<action class="org.apache.felix.karaf.gshell.commands.CatAction"/>
</command>
+ <command name="shell/echo">
+ <action class="org.apache.felix.karaf.gshell.commands.EchoAction"/>
+ </command>
<command name="shell/exec">
<action class="org.apache.felix.karaf.gshell.commands.ExecuteAction"/>
</command>
<command name="shell/grep">
<action class="org.apache.felix.karaf.gshell.commands.GrepAction"/>
</command>
+ <!--
+ <command name="shell/history">
+ <action class="org.apache.felix.karaf.gshell.commands.HistoryAction"/>
+ </command>
+ -->
+ <command name="shell/info">
+ <action class="org.apache.felix.karaf.gshell.commands.InfoAction"/>
+ </command>
<command name="shell/java">
<action class="org.apache.felix.karaf.gshell.commands.JavaAction"/>
</command>
+ <!--
+ <command name="shell/more">
+ <action class="org.apache.felix.karaf.gshell.commands.MoreAction"/>
+ </command>
+ -->
<command name="shell/printf">
<action class="org.apache.felix.karaf.gshell.commands.PrintfAction"/>
</command>
@@ -41,6 +57,11 @@
<command name="shell/sort">
<action class="org.apache.felix.karaf.gshell.commands.SortAction"/>
</command>
+ <!--
+ <command name="shell/source">
+ <action class="org.apache.felix.karaf.gshell.commands.SourceAction"/>
+ </command>
+ -->
</command-bundle>
</blueprint>