You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2014/02/03 16:34:53 UTC

git commit: Have the cli scripts continue to support --version and --help options.

Updated Branches:
  refs/heads/trunk e26e3a0bb -> 2937141bb


Have the cli scripts continue to support --version and --help options.

Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/2937141b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/2937141b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/2937141b

Branch: refs/heads/trunk
Commit: 2937141bb8b862125d4757bc1e5a01ae1ec1d0d6
Parents: e26e3a0
Author: Hiram Chirino <hi...@hiramchirino.com>
Authored: Mon Feb 3 10:34:47 2014 -0500
Committer: Hiram Chirino <hi...@hiramchirino.com>
Committed: Mon Feb 3 10:34:47 2014 -0500

----------------------------------------------------------------------
 .../org.apache.activemq.apollo/apollo-broker-commands.index     | 2 ++
 .../services/org.apache.activemq.apollo/apollo-commands.index   | 2 ++
 .../org/apache/activemq/apollo/cli/commands/HelpAction.scala    | 5 +++++
 .../scala/org/apache/activemq/apollo/cli/commands/Version.scala | 4 ++++
 4 files changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/2937141b/apollo-cli/src/main/resources/META-INF/services/org.apache.activemq.apollo/apollo-broker-commands.index
----------------------------------------------------------------------
diff --git a/apollo-cli/src/main/resources/META-INF/services/org.apache.activemq.apollo/apollo-broker-commands.index b/apollo-cli/src/main/resources/META-INF/services/org.apache.activemq.apollo/apollo-broker-commands.index
index 3ee7327..f098db8 100644
--- a/apollo-cli/src/main/resources/META-INF/services/org.apache.activemq.apollo/apollo-broker-commands.index
+++ b/apollo-cli/src/main/resources/META-INF/services/org.apache.activemq.apollo/apollo-broker-commands.index
@@ -21,4 +21,6 @@ org.apache.activemq.apollo.cli.commands.StoreExport
 org.apache.activemq.apollo.cli.commands.StoreImport
 org.apache.activemq.apollo.cli.commands.DiskBenchmark
 org.apache.activemq.apollo.cli.commands.Version
+org.apache.activemq.apollo.cli.commands.DashVersion
 org.apache.activemq.apollo.cli.commands.HelpAction
+org.apache.activemq.apollo.cli.commands.DashHelpAction

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/2937141b/apollo-cli/src/main/resources/META-INF/services/org.apache.activemq.apollo/apollo-commands.index
----------------------------------------------------------------------
diff --git a/apollo-cli/src/main/resources/META-INF/services/org.apache.activemq.apollo/apollo-commands.index b/apollo-cli/src/main/resources/META-INF/services/org.apache.activemq.apollo/apollo-commands.index
index 1be77c5..d6f0dc2 100644
--- a/apollo-cli/src/main/resources/META-INF/services/org.apache.activemq.apollo/apollo-commands.index
+++ b/apollo-cli/src/main/resources/META-INF/services/org.apache.activemq.apollo/apollo-commands.index
@@ -17,4 +17,6 @@
 org.apache.activemq.apollo.cli.commands.Create
 org.apache.activemq.apollo.cli.commands.DiskBenchmark
 org.apache.activemq.apollo.cli.commands.Version
+org.apache.activemq.apollo.cli.commands.DashVersion
 org.apache.activemq.apollo.cli.commands.HelpAction
+org.apache.activemq.apollo.cli.commands.DashHelpAction

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/2937141b/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/HelpAction.scala
----------------------------------------------------------------------
diff --git a/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/HelpAction.scala b/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/HelpAction.scala
index dbcbf15..70fdf73 100644
--- a/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/HelpAction.scala
+++ b/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/HelpAction.scala
@@ -27,3 +27,8 @@ class HelpAction extends Help with Action {
     0
   }
 }
+
+@Command(name = "--help", description = "Display help information", hidden = true)
+class DashHelpAction extends HelpAction {
+
+}

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/2937141b/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Version.scala
----------------------------------------------------------------------
diff --git a/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Version.scala b/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Version.scala
index b4392ca..5c94914 100644
--- a/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Version.scala
+++ b/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Version.scala
@@ -32,3 +32,7 @@ class Version extends Action {
   }
 
 }
+
+@Command(name = "--version", description = "Displays the broker version", hidden = true)
+class DashVersion extends Version {
+}