You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/11/10 15:49:16 UTC
svn commit: r1200353 - in /karaf/trunk/features/command/src/main:
java/org/apache/karaf/features/command/ resources/OSGI-INF/blueprint/
Author: jbonofre
Date: Thu Nov 10 14:49:15 2011
New Revision: 1200353
URL: http://svn.apache.org/viewvc?rev=1200353&view=rev
Log:
[KARAF-945] Use singular for feature:* commands
Modified:
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/AddUrlCommand.java
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/InfoFeatureCommand.java
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeatureVersionsCommand.java
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeaturesCommand.java
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListRepositoriesCommand.java
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RefreshUrlCommand.java
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RemoveRepositoryCommand.java
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RemoveUrlCommand.java
karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/UninstallFeatureCommand.java
karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
Modified: karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/AddUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/AddUrlCommand.java?rev=1200353&r1=1200352&r2=1200353&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/AddUrlCommand.java (original)
+++ karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/AddUrlCommand.java Thu Nov 10 14:49:15 2011
@@ -23,7 +23,7 @@ import org.apache.felix.gogo.commands.Co
import org.apache.karaf.features.FeaturesService;
import org.apache.karaf.features.Repository;
-@Command(scope = "features", name = "addUrl", description = "Adds a list of repository URLs to the features service.")
+@Command(scope = "feature", name = "add-url", description = "Adds a list of repository URLs to the features service.")
public class AddUrlCommand extends FeaturesCommandSupport {
@Argument(index = 0, name = "urls", description = "One or more repository URLs separated by whitespaces", required = true, multiValued = true)
Modified: karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/InfoFeatureCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/InfoFeatureCommand.java?rev=1200353&r1=1200352&r2=1200353&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/InfoFeatureCommand.java (original)
+++ karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/InfoFeatureCommand.java Thu Nov 10 14:49:15 2011
@@ -31,7 +31,7 @@ import org.apache.karaf.features.Feature
/**
* Utility command to display info about features.
*/
-@Command(scope = "features", name = "info", description = "Shows information about selected information.")
+@Command(scope = "feature", name = "info", description = "Shows information about selected information.")
public class InfoFeatureCommand extends FeaturesCommandSupport {
private static final String INDENT = " ";
Modified: karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java?rev=1200353&r1=1200352&r2=1200353&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java (original)
+++ karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java Thu Nov 10 14:49:15 2011
@@ -24,7 +24,7 @@ import org.apache.karaf.features.Feature
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-@Command(scope = "features", name = "install", description = "Installs a feature with the specified name and version.")
+@Command(scope = "feature", name = "install", description = "Installs a feature with the specified name and version.")
public class InstallFeatureCommand extends FeaturesCommandSupport {
private static String DEFAULT_VERSION = "0.0.0";
Modified: karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeatureVersionsCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeatureVersionsCommand.java?rev=1200353&r1=1200352&r2=1200353&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeatureVersionsCommand.java (original)
+++ karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeatureVersionsCommand.java Thu Nov 10 14:49:15 2011
@@ -26,7 +26,7 @@ import org.apache.karaf.features.Feature
import org.apache.karaf.features.FeaturesService;
import org.apache.karaf.features.Repository;
-@Command(scope = "features", name = "listVersions", description = "Lists all versions of a feature available from the currently available repositories.")
+@Command(scope = "feature", name = "list-version", description = "Lists all versions of a feature available from the currently available repositories.")
public class ListFeatureVersionsCommand extends FeaturesCommandSupport {
@Argument(index = 0, name = "feature", description = "Name of feature.", required = true, multiValued = false)
Modified: karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeaturesCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeaturesCommand.java?rev=1200353&r1=1200352&r2=1200353&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeaturesCommand.java (original)
+++ karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListFeaturesCommand.java Thu Nov 10 14:49:15 2011
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-@Command(scope = "features", name = "list", description = "Lists all existing features available from the defined repositories.")
+@Command(scope = "feature", name = "list", description = "Lists all existing features available from the defined repositories.")
public class ListFeaturesCommand extends FeaturesCommandSupport {
@Option(name = "-i", aliases = {"--installed"}, description = "Display a list of all installed features only", required = false, multiValued = false)
Modified: karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListRepositoriesCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListRepositoriesCommand.java?rev=1200353&r1=1200352&r2=1200353&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListRepositoriesCommand.java (original)
+++ karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListRepositoriesCommand.java Thu Nov 10 14:49:15 2011
@@ -21,7 +21,7 @@ import org.apache.karaf.features.Reposit
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Option;
-@Command(scope = "features", name = "listRepositories", description = "Displays a list of all defined repositories.")
+@Command(scope = "feature", name = "list-repository", description = "Displays a list of all defined repositories.")
public class ListRepositoriesCommand extends FeaturesCommandSupport {
private static final String REPOSITORY = "Repository";
Modified: karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java?rev=1200353&r1=1200352&r2=1200353&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java (original)
+++ karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java Thu Nov 10 14:49:15 2011
@@ -27,7 +27,7 @@ import org.apache.karaf.features.Reposit
* Command which lists feature URLs.
*
*/
-@Command(scope = "features", name = "listUrl", description = "Displays a list of all defined repository URLs.")
+@Command(scope = "feature", name = "list-url", description = "Displays a list of all defined repository URLs.")
public class ListUrlCommand extends FeaturesCommandSupport {
@Option(name = "-v", aliases = "-validate", description = "Validate current version of descriptors", required = false, multiValued = false)
Modified: karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RefreshUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RefreshUrlCommand.java?rev=1200353&r1=1200352&r2=1200353&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RefreshUrlCommand.java (original)
+++ karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RefreshUrlCommand.java Thu Nov 10 14:49:15 2011
@@ -23,7 +23,7 @@ import org.apache.felix.gogo.commands.Co
import org.apache.karaf.features.FeaturesService;
import org.apache.karaf.features.Repository;
-@Command(scope = "features", name = "refreshUrl", description = "Reloads the list of available features from the repositories.")
+@Command(scope = "feature", name = "refresh-url", description = "Reloads the list of available features from the repositories.")
public class RefreshUrlCommand extends FeaturesCommandSupport {
@Argument(index = 0, name = "urls", description = "Repository URLs to reload (leave empty for all)", required = false, multiValued = true)
Modified: karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RemoveRepositoryCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RemoveRepositoryCommand.java?rev=1200353&r1=1200352&r2=1200353&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RemoveRepositoryCommand.java (original)
+++ karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RemoveRepositoryCommand.java Thu Nov 10 14:49:15 2011
@@ -23,7 +23,7 @@ import org.apache.felix.gogo.commands.Co
import org.apache.karaf.features.FeaturesService;
import org.apache.karaf.features.Repository;
-@Command(scope = "features", name = "removeRepository", description = "Removes the specified repository features service.")
+@Command(scope = "feature", name = "remove-repository", description = "Removes the specified repository features service.")
public class RemoveRepositoryCommand extends FeaturesCommandSupport {
@Argument(index = 0, name = "repository", description = "Name of the repository to remove.", required = true, multiValued = false)
Modified: karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RemoveUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RemoveUrlCommand.java?rev=1200353&r1=1200352&r2=1200353&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RemoveUrlCommand.java (original)
+++ karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/RemoveUrlCommand.java Thu Nov 10 14:49:15 2011
@@ -23,7 +23,7 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.Command;
import org.apache.karaf.features.FeaturesService;
-@Command(scope = "features", name = "removeUrl", description = "Removes the given list of repository URLs from the features service.")
+@Command(scope = "feature", name = "remove-url", description = "Removes the given list of repository URLs from the features service.")
public class RemoveUrlCommand extends FeaturesCommandSupport {
@Argument(index = 0, name = "urls", description = "One or more repository URLs separated by whitespaces", required = true, multiValued = true)
Modified: karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/UninstallFeatureCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/UninstallFeatureCommand.java?rev=1200353&r1=1200352&r2=1200353&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/UninstallFeatureCommand.java (original)
+++ karaf/trunk/features/command/src/main/java/org/apache/karaf/features/command/UninstallFeatureCommand.java Thu Nov 10 14:49:15 2011
@@ -22,7 +22,7 @@ import org.apache.karaf.features.Feature
import java.util.List;
-@Command(scope = "features", name = "uninstall", description = "Uninstalls a feature with the specified name and version.")
+@Command(scope = "feature", name = "uninstall", description = "Uninstalls a feature with the specified name and version.")
public class UninstallFeatureCommand extends FeaturesCommandSupport {
@Argument(index = 0, name = "features", description = "The name and version of the features to uninstall. A feature id looks like name/version. The version is optional.", required = true, multiValued = true)
Modified: karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml?rev=1200353&r1=1200352&r2=1200353&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml (original)
+++ karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml Thu Nov 10 14:49:15 2011
@@ -20,55 +20,55 @@
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
- <command name="features/addUrl">
+ <command name="feature/add-url">
<action class="org.apache.karaf.features.command.AddUrlCommand"/>
</command>
- <command name="features/listUrl">
+ <command name="feature/list-url">
<action class="org.apache.karaf.features.command.ListUrlCommand"/>
</command>
- <command name="features/listRepositories">
+ <command name="feature/list-repository">
<action class="org.apache.karaf.features.command.ListRepositoriesCommand"/>
</command>
- <command name="features/removeUrl">
+ <command name="feature/remove-url">
<action class="org.apache.karaf.features.command.RemoveUrlCommand"/>
<completers>
<ref component-id="featureUrlCompleter" />
</completers>
</command>
- <command name="features/removeRepository">
+ <command name="feature/remove-repository">
<action class="org.apache.karaf.features.command.RemoveRepositoryCommand"/>
<completers>
<ref component-id="featureRepositoryNameCompleter" />
</completers>
</command>
- <command name="features/refreshUrl">
+ <command name="feature/refresh-url">
<action class="org.apache.karaf.features.command.RefreshUrlCommand"/>
<completers>
<ref component-id="featureUrlCompleter" />
</completers>
</command>
- <command name="features/install">
+ <command name="feature/install">
<action class="org.apache.karaf.features.command.InstallFeatureCommand"/>
<completers>
<ref component-id="uninstalledFeatureCompleter" />
</completers>
</command>
- <command name="features/uninstall">
+ <command name="feature/uninstall">
<action class="org.apache.karaf.features.command.UninstallFeatureCommand"/>
<completers>
<ref component-id="installedFeatureCompleter" />
</completers>
</command>
- <command name="features/list">
+ <command name="feature/list">
<action class="org.apache.karaf.features.command.ListFeaturesCommand"/>
</command>
- <command name="features/listVersions">
+ <command name="feature/list-version">
<action class="org.apache.karaf.features.command.ListFeatureVersionsCommand"/>
<completers>
<ref component-id="allFeatureCompleter" />
</completers>
</command>
- <command name="features/info">
+ <command name="feature/info">
<action class="org.apache.karaf.features.command.InfoFeatureCommand"/>
<completers>
<ref component-id="allFeatureCompleter" />