svn commit: r1200380 - in /karaf/trunk/shell/obr/src/main: java/org/apache/karaf/shell/obr/ resources/OSGI-INF/blueprint/

[jb...@apache.org]

Author: jbonofre
Date: Thu Nov 10 15:27:50 2011
New Revision: 1200380

URL: http://svn.apache.org/viewvc?rev=1200380&view=rev
Log:
[KARAF-948] Normalize the obr:* commands

Modified:
    karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/AddUrlCommand.java
    karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListUrlCommand.java
    karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RefreshUrlCommand.java
    karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RemoveUrlCommand.java
    karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml

Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/AddUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/AddUrlCommand.java?rev=1200380&r1=1200379&r2=1200380&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/AddUrlCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/AddUrlCommand.java Thu Nov 10 15:27:50 2011
@@ -22,7 +22,7 @@ import org.apache.felix.bundlerepository
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
 
-@Command(scope = "obr", name = "addUrl", description = "Adds a list of repository URLs to the OBR service.")
+@Command(scope = "obr", name = "add-url", description = "Adds a list of repository URLs to the OBR service.")
 public class AddUrlCommand extends ObrCommandSupport {
 
     @Argument(index = 0, name = "urls", description = "Repository URLs to add to the OBR service separated by whitespaces", required = true, multiValued = true)

Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListUrlCommand.java?rev=1200380&r1=1200379&r2=1200380&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListUrlCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ListUrlCommand.java Thu Nov 10 15:27:50 2011
@@ -20,7 +20,7 @@ import org.apache.felix.bundlerepository
 import org.apache.felix.bundlerepository.RepositoryAdmin;
 import org.apache.felix.gogo.commands.Command;
 
-@Command(scope = "obr", name = "listUrl", description = "Displays the repository URLs currently associated with the OBR service.")
+@Command(scope = "obr", name = "list-url", description = "Displays the repository URLs currently associated with the OBR service.")
 public class ListUrlCommand extends ObrCommandSupport {
 
     protected void doExecute(RepositoryAdmin admin) {

Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RefreshUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RefreshUrlCommand.java?rev=1200380&r1=1200379&r2=1200380&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RefreshUrlCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RefreshUrlCommand.java Thu Nov 10 15:27:50 2011
@@ -23,7 +23,7 @@ import org.apache.felix.bundlerepository
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
 
-@Command(scope = "obr", name = "refreshUrl", description = "Reloads the repositories to obtain a fresh list of bundles.")
+@Command(scope = "obr", name = "refresh-url", description = "Reloads the repositories to obtain a fresh list of bundles.")
 public class RefreshUrlCommand extends ObrCommandSupport {
 
     @Argument(index = 0, name = "urls", description = "Repository URLs to refresh (leave empty for all)", required = false, multiValued = true)

Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RemoveUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RemoveUrlCommand.java?rev=1200380&r1=1200379&r2=1200380&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RemoveUrlCommand.java (original)
+++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/RemoveUrlCommand.java Thu Nov 10 15:27:50 2011
@@ -22,7 +22,7 @@ import org.apache.felix.bundlerepository
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
 
-@Command(scope = "obr", name = "removeUrl", description = "Removes a list of repository URLs from the OBR service.")
+@Command(scope = "obr", name = "remove-url", description = "Removes a list of repository URLs from the OBR service.")
 public class RemoveUrlCommand extends ObrCommandSupport {
 
     @Argument(index = 0, name = "urls", description = "Repository URLs to remove from OBR service", required = true, multiValued = true)

Modified: karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml?rev=1200380&r1=1200379&r2=1200380&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml (original)
+++ karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml Thu Nov 10 15:27:50 2011
@@ -24,7 +24,7 @@
         availability="optional" />
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
-        <command name="obr/addUrl">
+        <command name="obr/add-url">
             <action class="org.apache.karaf.shell.obr.AddUrlCommand" />
         </command>
         <command name="obr/deploy">
@@ -41,13 +41,13 @@
                 <property name="repoAdmin" ref="repoAdmin" />
             </action>
         </command>
-        <command name="obr/listUrl">
+        <command name="obr/list-url">
             <action class="org.apache.karaf.shell.obr.ListUrlCommand" />
         </command>
-        <command name="obr/refreshUrl">
+        <command name="obr/refresh-url">
             <action class="org.apache.karaf.shell.obr.RefreshUrlCommand" />
         </command>
-        <command name="obr/removeUrl">
+        <command name="obr/remove-url">
             <action class="org.apache.karaf.shell.obr.RemoveUrlCommand" />
         </command>
         <command name="obr/resolve">