Repository: karaf Updated Branches: refs/heads/karaf-2.3.x afcd77190 -> 5e2989c0e
[KARAF-2974] Specify the syntax format in OBR commands Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5e2989c0 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5e2989c0 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5e2989c0 Branch: refs/heads/karaf-2.3.x Commit: 5e2989c0ecd218a144f6ae768a2506038a9c571c Parents: afcd771 Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun May 18 08:17:53 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun May 18 08:19:26 2014 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/karaf/shell/obr/DeployCommand.java | 2 +- .../obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java | 2 +- .../src/main/java/org/apache/karaf/shell/obr/SourceCommand.java | 2 +- .../obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/5e2989c0/shell/obr/src/main/java/org/apache/karaf/shell/obr/DeployCommand.java ---------------------------------------------------------------------- diff --git a/shell/obr/src/main/java/org/apache/karaf/shell/obr/DeployCommand.java b/shell/obr/src/main/java/org/apache/karaf/shell/obr/DeployCommand.java index 73ccefd..9553560 100644 --- a/shell/obr/src/main/java/org/apache/karaf/shell/obr/DeployCommand.java +++ b/shell/obr/src/main/java/org/apache/karaf/shell/obr/DeployCommand.java @@ -26,7 +26,7 @@ import org.apache.felix.gogo.commands.Option; @Command(scope = "obr", name = "deploy", description = "Deploys a list of bundles using OBR service.") public class DeployCommand extends ObrCommandSupport { - @Argument(index = 0, name = "bundles", description = "List of bundle names to deploy (separated by whitespaces)", required = true, multiValued = true) + @Argument(index = 0, name = "bundles", description = "List of bundle names to deploy (separated by whitespaces). The bundles are identified using the following syntax: symbolic_name,version where version is optional.", required = true, multiValued = true) protected List<String> bundles; @Option(name = "-s", aliases = { "--start" }, description = "Start all deployed bundles", required = false, multiValued = false) http://git-wip-us.apache.org/repos/asf/karaf/blob/5e2989c0/shell/obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java ---------------------------------------------------------------------- diff --git a/shell/obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java b/shell/obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java index 0dbc918..dfb47d1 100644 --- a/shell/obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java +++ b/shell/obr/src/main/java/org/apache/karaf/shell/obr/InfoCommand.java @@ -32,7 +32,7 @@ import org.apache.felix.gogo.commands.Command; @Command(scope = "obr", name = "info", description = "Prints information about OBR bundles.") public class InfoCommand extends ObrCommandSupport { - @Argument(index = 0, name = "bundles", description = "Specify bundles to query for information (separated by whitespaces)", required = true, multiValued = true) + @Argument(index = 0, name = "bundles", description = "Specify bundles to query for information (separated by whitespaces). The bundles are identified using the following syntax: symbolic_name,version where version is optional.", required = true, multiValued = true) List<String> bundles; protected void doExecute(RepositoryAdmin admin) throws Exception { http://git-wip-us.apache.org/repos/asf/karaf/blob/5e2989c0/shell/obr/src/main/java/org/apache/karaf/shell/obr/SourceCommand.java ---------------------------------------------------------------------- diff --git a/shell/obr/src/main/java/org/apache/karaf/shell/obr/SourceCommand.java b/shell/obr/src/main/java/org/apache/karaf/shell/obr/SourceCommand.java index 8f977fc..4be7e9e 100644 --- a/shell/obr/src/main/java/org/apache/karaf/shell/obr/SourceCommand.java +++ b/shell/obr/src/main/java/org/apache/karaf/shell/obr/SourceCommand.java @@ -36,7 +36,7 @@ public class SourceCommand extends ObrCommandSupport { @Argument(index = 0, name = "folder", description = "Local folder for storing sources", required = true, multiValued = false) String localDir; - @Argument(index = 1, name = "bundles", description = "List of bundles to download the sources for", required = true, multiValued = true) + @Argument(index = 1, name = "bundles", description = "List of bundles to download the sources for. The bundles are identified using the following syntax: symbolic_name,version where version is optional.", required = true, multiValued = true) List<String> bundles; protected void doExecute(RepositoryAdmin admin) throws Exception { http://git-wip-us.apache.org/repos/asf/karaf/blob/5e2989c0/shell/obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java ---------------------------------------------------------------------- diff --git a/shell/obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java b/shell/obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java index bf8fd12..2ecf223 100644 --- a/shell/obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java +++ b/shell/obr/src/main/java/org/apache/karaf/shell/obr/StartCommand.java @@ -26,7 +26,7 @@ import java.util.List; @Command(scope = "obr", name = "start", description = "Deploys and starts a list of bundles using OBR.") public class StartCommand extends ObrCommandSupport { - @Argument(index = 0, name = "bundles", description = "List of bundles to deploy (separated by whitespaces)", required = true, multiValued = true) + @Argument(index = 0, name = "bundles", description = "List of bundles to deploy (separated by whitespaces). The bundles are identified using the following syntax: symbolic_name,version where version is optional.", required = true, multiValued = true) protected List<String> bundles; @Option(name = "-d", aliases = { "--deployOptional" }, description = "Deploy optional bundles", required = false, multiValued = false)
