You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/07/26 21:52:56 UTC
svn commit: r797981 - in /felix/trunk/karaf/gshell:
gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/
gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/
gshell-config/src/main/java/org...
Author: gnodet
Date: Sun Jul 26 19:52:54 2009
New Revision: 797981
URL: http://svn.apache.org/viewvc?rev=797981&view=rev
Log:
Clean commands a bit
Removed:
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.properties
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.properties
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.properties
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.properties
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.properties
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.properties
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.properties
felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/CancelCommand.properties
felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/EditCommand.properties
felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/ListCommand.properties
felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropAppendCommand.properties
felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropDelCommand.properties
felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropListCommand.properties
felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropSetCommand.properties
felix/trunk/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/UpdateCommand.properties
felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.properties
felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.properties
felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.properties
felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/ListUrlCommand.properties
felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.properties
felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.properties
felix/trunk/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.properties
felix/trunk/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/DisplayException.properties
felix/trunk/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/DisplayLog.properties
felix/trunk/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/GetLogLevel.properties
felix/trunk/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/SetLogLevel.properties
felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/AddUrlCommand.properties
felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/DeployCommand.properties
felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/InfoCommand.properties
felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/ListCommand.properties
felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/ListUrlCommand.properties
felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.properties
felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.properties
felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/SourceCommand.properties
felix/trunk/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/StartCommand.properties
felix/trunk/karaf/gshell/gshell-packages/src/main/resources/org/apache/felix/karaf/gshell/packages/ExportsCommand.properties
felix/trunk/karaf/gshell/gshell-packages/src/main/resources/org/apache/felix/karaf/gshell/packages/ImportsCommand.properties
Modified:
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/AdminCommandSupport.java
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.java
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.java
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.java
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.java
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.java
felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/CancelCommand.java
felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/EditCommand.java
felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ListCommand.java
felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropAppendCommand.java
felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropDelCommand.java
felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropListCommand.java
felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropSetCommand.java
felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/UpdateCommand.java
felix/trunk/karaf/gshell/gshell-config/src/main/resources/OSGI-INF/blueprint/gshell-config.xml
felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/commands/BlueprintCommand.java
felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.java
felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.java
felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.java
felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.java
felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.java
felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.java
felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java
felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java
felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java
felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java
felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java
felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java
felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java
felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java
felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java
felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java
felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java
felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/StartCommand.java
felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ExportsCommand.java
felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ImportsCommand.java
Modified: felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/AdminCommandSupport.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/AdminCommandSupport.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/AdminCommandSupport.java (original)
+++ felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/AdminCommandSupport.java Sun Jul 26 19:52:54 2009
@@ -19,6 +19,7 @@
import org.apache.felix.karaf.gshell.admin.AdminService;
import org.apache.felix.karaf.gshell.admin.Instance;
import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.gogo.commands.Command;
public abstract class AdminCommandSupport extends OsgiCommandSupport {
Modified: felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.java Sun Jul 26 19:52:54 2009
@@ -17,7 +17,9 @@
package org.apache.felix.karaf.gshell.admin.internal.commands;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "admin", name = "change-port", description = "Change the port of an existing instance.")
public class ChangePortCommand extends AdminCommandSupport {
@Argument(index=0, required=true, description="The instance name")
Modified: felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.java Sun Jul 26 19:52:54 2009
@@ -20,7 +20,9 @@
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "admin", name = "connect", description = "Connect to an existing instance.")
public class ConnectCommand extends AdminCommandSupport {
@Argument(index=0, name="INSTANCE", required=true, description="The instance name")
Modified: felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java Sun Jul 26 19:52:54 2009
@@ -18,6 +18,7 @@
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.gogo.commands.Command;
/**
@@ -25,6 +26,7 @@
*
* @version $Rev: 679826 $ $Date: 2008-07-25 17:00:12 +0200 (Fri, 25 Jul 2008) $
*/
+@Command(scope = "admin", name = "create", description = "Create a new instance.")
public class CreateCommand extends AdminCommandSupport
{
@Option(name = "-p", aliases = { "--port"}, description = "Port number for remote shell connection")
Modified: felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java Sun Jul 26 19:52:54 2009
@@ -17,12 +17,14 @@
package org.apache.felix.karaf.gshell.admin.internal.commands;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
/**
* Destroy an existing Karaf instance
*
* @version $Rev: 679826 $ $Date: 2008-07-25 17:00:12 +0200 (Fri, 25 Jul 2008) $
*/
+@Command(scope = "admin", name = "destroy", description = "Destroy an existing instance.")
public class DestroyCommand extends AdminCommandSupport
{
@Argument(index=0, required=true, description="The name of the Karaf instance to destroy")
Modified: felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.java Sun Jul 26 19:52:54 2009
@@ -17,11 +17,13 @@
package org.apache.felix.karaf.gshell.admin.internal.commands;
import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.gogo.commands.Command;
import org.apache.felix.karaf.gshell.admin.Instance;
/**
* List available instances
*/
+@Command(scope = "admin", name = "list", description = "List existing instances.")
public class ListCommand extends AdminCommandSupport {
@Option(name = "-l", aliases = { "--location" }, description = "Display instances location")
Modified: felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.java Sun Jul 26 19:52:54 2009
@@ -18,7 +18,9 @@
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "admin", name = "start", description = "Start an existing instance.")
public class StartCommand extends AdminCommandSupport {
@Option(name = "-o", aliases = { "--java-opts"}, description = "Java options when launching the instance")
Modified: felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.java Sun Jul 26 19:52:54 2009
@@ -17,7 +17,9 @@
package org.apache.felix.karaf.gshell.admin.internal.commands;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "admin", name = "stop", description = "Stop an existing instance.")
public class StopCommand extends AdminCommandSupport {
@Argument(index=0, required=true, description="The instance name")
Modified: felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/CancelCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/CancelCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/CancelCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/CancelCommand.java Sun Jul 26 19:52:54 2009
@@ -17,7 +17,9 @@
package org.apache.felix.karaf.gshell.config;
import org.osgi.service.cm.ConfigurationAdmin;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "config", name = "cancel", description = "Cancel the changes to the configuration being edited.")
public class CancelCommand extends ConfigCommandSupport {
protected void doExecute(ConfigurationAdmin admin) throws Exception {
Modified: felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/EditCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/EditCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/EditCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/EditCommand.java Sun Jul 26 19:52:54 2009
@@ -21,8 +21,10 @@
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.gogo.commands.Command;
import org.osgi.service.cm.ConfigurationAdmin;
+@Command(scope = "config", name = "edit", description = "Create or edit a configuration.")
public class EditCommand extends ConfigCommandSupport {
@Argument(required = true, description = "PID of the configuration")
Modified: felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ListCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ListCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ListCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ListCommand.java Sun Jul 26 19:52:54 2009
@@ -22,7 +22,9 @@
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "config", name = "list", description = "List existing configurations.")
public class ListCommand extends ConfigCommandSupport {
@Argument(required = false, description = "LDAP query")
Modified: felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropAppendCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropAppendCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropAppendCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropAppendCommand.java Sun Jul 26 19:52:54 2009
@@ -19,11 +19,13 @@
import java.util.Dictionary;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
import org.osgi.service.cm.ConfigurationAdmin;
/**
* Appends a value to the current property value.
*/
+@Command(scope = "config", name = "propappend", description = "Append the given value to an existing property or create the property with the specified value.")
public class PropAppendCommand extends ConfigCommandSupport {
@Argument(index = 0, required = true, description = "the property to set")
Modified: felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropDelCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropDelCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropDelCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropDelCommand.java Sun Jul 26 19:52:54 2009
@@ -19,8 +19,10 @@
import java.util.Dictionary;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
import org.osgi.service.cm.ConfigurationAdmin;
+@Command(scope = "config", name = "propdel", description = "Delete a property from the edited configuration.")
public class PropDelCommand extends ConfigCommandSupport {
@Argument(name = "prop", index = 0, required = true, description = "the property to delete")
Modified: felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropListCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropListCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropListCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropListCommand.java Sun Jul 26 19:52:54 2009
@@ -20,7 +20,9 @@
import java.util.Enumeration;
import org.osgi.service.cm.ConfigurationAdmin;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "config", name = "proplist", description = "List properties from the edited configuration.")
public class PropListCommand extends ConfigCommandSupport {
protected void doExecute(ConfigurationAdmin admin) throws Exception {
Modified: felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropSetCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropSetCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropSetCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropSetCommand.java Sun Jul 26 19:52:54 2009
@@ -19,8 +19,10 @@
import java.util.Dictionary;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
import org.osgi.service.cm.ConfigurationAdmin;
+@Command(scope = "config", name = "propset", description = "Set a property on the edited configuration.")
public class PropSetCommand extends ConfigCommandSupport {
@Argument(index = 0, required = true, description = "the property to set")
Modified: felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/UpdateCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/UpdateCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/UpdateCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/UpdateCommand.java Sun Jul 26 19:52:54 2009
@@ -20,7 +20,9 @@
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "config", name = "update", description = "Save and propagate changes from the configuration being edited.")
public class UpdateCommand extends ConfigCommandSupport {
protected void doExecute(ConfigurationAdmin admin) throws Exception {
Modified: felix/trunk/karaf/gshell/gshell-config/src/main/resources/OSGI-INF/blueprint/gshell-config.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-config/src/main/resources/OSGI-INF/blueprint/gshell-config.xml?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/resources/OSGI-INF/blueprint/gshell-config.xml (original)
+++ felix/trunk/karaf/gshell/gshell-config/src/main/resources/OSGI-INF/blueprint/gshell-config.xml Sun Jul 26 19:52:54 2009
@@ -51,6 +51,13 @@
<null/>
</completers>
</command>
+ <command name="config/propappend">
+ <action class="org.apache.felix.karaf.gshell.config.PropAppendCommand"/>
+ <completers>
+ <ref component-id="configPropertyCompleter" />
+ <null/>
+ </completers>
+ </command>
<command name="config/update">
<action class="org.apache.felix.karaf.gshell.config.UpdateCommand"/>
</command>
Modified: felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/commands/BlueprintCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/commands/BlueprintCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/commands/BlueprintCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/commands/BlueprintCommand.java Sun Jul 26 19:52:54 2009
@@ -19,8 +19,15 @@
import java.lang.reflect.Type;
import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Arrays;
+import java.io.PrintStream;
import org.apache.felix.gogo.commands.Action;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.basic.AbstractCommand;
import org.apache.felix.gogo.commands.basic.ActionPreparator;
import org.apache.felix.gogo.commands.basic.DefaultActionPreparator;
@@ -32,6 +39,7 @@
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.container.Converter;
import org.osgi.service.command.CommandSession;
+import org.fusesource.jansi.Ansi;
public class BlueprintCommand extends AbstractCommand implements CompletableFunction
{
@@ -73,6 +81,96 @@
return blueprintConverter.convert(o, new GenericType(type));
}
+ @Override
+ protected void printUsage(Command command, Set<Option> options, Set<Argument> arguments, PrintStream out)
+ {
+ options = new HashSet<Option>(options);
+ options.add(HELP);
+ if (command != null && (command.description() != null) || command.name() != null)
+ {
+ out.println(Ansi.ansi().a(Ansi.Attribute.INTENSITY_BOLD).a("DESCRIPTION").a(Ansi.Attribute.RESET));
+ out.print("\t");
+ if (command.name() != null) {
+ out.println(Ansi.ansi().a(command.scope()).a(":").a(Ansi.Attribute.INTENSITY_BOLD).a(command.name()).a(Ansi.Attribute.RESET));
+ out.println();
+ }
+ out.print("\t");
+ out.println(command.description());
+ out.println();
+ }
+ String syntax = "";
+ if (command != null)
+ {
+ syntax += command.scope() + ":" + command.name();
+ }
+ if (options.size() > 0)
+ {
+ syntax += " [options]";
+ }
+ if (arguments.size() > 0)
+ {
+ if (arguments.size() > 0) {
+ syntax += " ";
+ }
+ for (Argument argument : arguments)
+ {
+ if (argument.required())
+ {
+ syntax += "[" + argument.name() + "]";
+ }
+ else
+ {
+ syntax += argument.name();
+ }
+ }
+ }
+
+ out.println(Ansi.ansi().a(Ansi.Attribute.INTENSITY_BOLD).a("SYNTAX").a(Ansi.Attribute.RESET));
+ out.print("\t");
+ out.println(syntax);
+ out.println();
+ if (arguments.size() > 0)
+ {
+ out.println(Ansi.ansi().a(Ansi.Attribute.INTENSITY_BOLD).a("ARGUMENTS").a(Ansi.Attribute.RESET));
+ for (Argument argument : arguments)
+ {
+ out.print("\t");
+ out.print(argument.name());
+ out.print("\t");
+ out.print(argument.description());
+ out.println();
+ }
+ out.println();
+ }
+ if (options.size() > 0)
+ {
+ out.println(Ansi.ansi().a(Ansi.Attribute.INTENSITY_BOLD).a("OPTIONS").a(Ansi.Attribute.RESET));
+ for (Option option : options)
+ {
+ String opt = option.name();
+ for (String alias : option.aliases())
+ {
+ opt += ", " + alias;
+ }
+ out.print("\t");
+ out.println(opt);
+ out.print("\t\t");
+ out.print(option.description());
+ out.println();
+ }
+ out.println();
+ }
+ }
+
+ protected void printFormatted(String prefix, String str, int termWidth, PrintStream out) {
+ int pfxLen = length(prefix);
+
+ }
+
+ protected int length(String str) {
+ return str.length();
+ }
+
}
protected Action createNewAction() throws Exception {
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.java Sun Jul 26 19:52:54 2009
@@ -21,7 +21,9 @@
import org.apache.felix.karaf.gshell.features.FeaturesService;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "features", name = "addUrl", description = "Add a list of repository URLs to the features service.")
public class AddUrlCommand extends FeaturesCommandSupport {
@Argument(required = true, multiValued = true, description = "Repository URLs")
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.java Sun Jul 26 19:52:54 2009
@@ -18,7 +18,9 @@
import org.apache.felix.karaf.gshell.features.FeaturesService;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "features", name = "install", description = "Install a feature.")
public class InstallFeatureCommand extends FeaturesCommandSupport {
@Argument(required = true, description = "The name of the feature")
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.java Sun Jul 26 19:52:54 2009
@@ -18,7 +18,9 @@
import org.apache.felix.karaf.gshell.features.FeaturesService;
import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "features", name = "list", description = "List existing features.")
public class ListFeaturesCommand extends FeaturesCommandSupport {
@Option(name = "-i", aliases={"--installed"}, description="Display the list of installed features")
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.java Sun Jul 26 19:52:54 2009
@@ -23,7 +23,9 @@
import org.apache.felix.karaf.gshell.features.FeaturesService;
import org.apache.felix.karaf.gshell.features.Repository;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "features", name = "refreshUrl", description = "Reload the repositories to obtain a fresh list of features.")
public class RefreshUrlCommand extends FeaturesCommandSupport {
@Argument(required = false, multiValued = true, description = "Repository URLs (leave empty for all)")
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.java Sun Jul 26 19:52:54 2009
@@ -21,7 +21,9 @@
import org.apache.felix.karaf.gshell.features.FeaturesService;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "features", name = "removeUrl", description = "Remove a list of repository URLs from the features service.")
public class RemoveUrlCommand extends FeaturesCommandSupport {
@Argument(required = true, multiValued = true, description = "Repository URLs")
Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.java Sun Jul 26 19:52:54 2009
@@ -18,7 +18,9 @@
import org.apache.felix.karaf.gshell.features.FeaturesService;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "features", name = "uninstall", description = "Uninstall a feature.")
public class UninstallFeatureCommand extends FeaturesCommandSupport {
@Argument(required = true, description = "The name of the feature")
Modified: felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java (original)
+++ felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java Sun Jul 26 19:52:54 2009
@@ -18,7 +18,9 @@
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "log", name = "display-exception", description = "Display the last exception from the log.")
public class DisplayException extends OsgiCommandSupport {
protected LruList events;
Modified: felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java (original)
+++ felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java Sun Jul 26 19:52:54 2009
@@ -26,13 +26,15 @@
import org.osgi.service.cm.ConfigurationAdmin;
import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
/**
* Get the log level for a given logger
*/
+@Command(scope = "log", name = "get", description = "Show log level.")
public class GetLogLevel extends OsgiCommandSupport {
- @Argument(required = false, description = "Logger name, ALL or ROOT (default)")
+ @Argument(required = false, name = "LOGGER", description = "Logger name, ALL or ROOT (default)")
String logger;
static final String CONFIGURATION_PID = "org.ops4j.pax.logging";
Modified: felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java (original)
+++ felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java Sun Jul 26 19:52:54 2009
@@ -20,6 +20,7 @@
import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -27,12 +28,13 @@
/**
* Set the log level for a given logger
*/
+@Command(scope = "log", name = "set", description = "Set the log level.")
public class SetLogLevel extends OsgiCommandSupport {
- @Argument(index = 0, required = true, description = "Level (TRACE, DEBUG, INFO, WARN, ERROR or - to unset")
+ @Argument(index = 0, required = true, name = "LEVEL", description = "Level (TRACE, DEBUG, INFO, WARN, ERROR or - to unset")
String level;
- @Argument(index = 1, required = false, description = "Logger name or ROOT (default)")
+ @Argument(index = 1, required = false, name = "LOGGER", description = "Logger name or ROOT (default)")
String logger;
static final String CONFIGURATION_PID = "org.ops4j.pax.logging";
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java Sun Jul 26 19:52:54 2009
@@ -21,7 +21,9 @@
import org.osgi.service.obr.RepositoryAdmin;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "obr", name = "addUrl", description = "Add a list of repository URLs to the OBR service.")
public class AddUrlCommand extends ObrCommandSupport {
@Argument(required = true, multiValued = true, description = "Repository URLs")
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java Sun Jul 26 19:52:54 2009
@@ -20,7 +20,9 @@
import org.osgi.service.obr.RepositoryAdmin;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "obr", name = "deploy", description = "Deploy a list of bundles using OBR")
public class DeployCommand extends ObrCommandSupport {
@Argument(required = true, multiValued = true, description = "List of bundles")
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java Sun Jul 26 19:52:54 2009
@@ -23,11 +23,13 @@
import java.util.Map;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
import org.osgi.service.obr.Capability;
import org.osgi.service.obr.RepositoryAdmin;
import org.osgi.service.obr.Requirement;
import org.osgi.service.obr.Resource;
+@Command(scope = "obr", name = "info", description = "Print informations about OBR bundles")
public class InfoCommand extends ObrCommandSupport {
@Argument(required = true, multiValued = true)
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java Sun Jul 26 19:52:54 2009
@@ -22,7 +22,9 @@
import org.osgi.service.obr.RepositoryAdmin;
import org.osgi.service.obr.Resource;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "obr", name = "list", description = "List OBR bundles")
public class ListCommand extends ObrCommandSupport {
@Argument(required = false, multiValued = true)
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java Sun Jul 26 19:52:54 2009
@@ -18,7 +18,9 @@
import org.osgi.service.obr.Repository;
import org.osgi.service.obr.RepositoryAdmin;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "obr", name = "listUrl", description = "Display the repository URLs currently associated with the OBR service.")
public class ListUrlCommand extends ObrCommandSupport {
protected void doExecute(RepositoryAdmin admin) {
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java Sun Jul 26 19:52:54 2009
@@ -22,7 +22,9 @@
import org.osgi.service.obr.Repository;
import org.osgi.service.obr.RepositoryAdmin;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "obr", name = "refreshUrl", description = "Reload the repositories to obtain a fresh list of bundles.")
public class RefreshUrlCommand extends ObrCommandSupport {
@Argument(required = false, multiValued = true, description = "Repository URLs (leave empty for all)")
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java Sun Jul 26 19:52:54 2009
@@ -20,8 +20,10 @@
import java.util.List;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
import org.osgi.service.obr.RepositoryAdmin;
+@Command(scope = "obr", name = "removeUrl", description = "Remove a list of repository URLs from the OBR service.")
public class RemoveUrlCommand extends ObrCommandSupport {
@Argument(required = true, multiValued = true, description = "Repository URLs")
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java Sun Jul 26 19:52:54 2009
@@ -21,9 +21,11 @@
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
import org.osgi.service.obr.RepositoryAdmin;
import org.osgi.service.obr.Resource;
+@Command(scope = "obr", name = "source", description = "Download the sources for an OBR bundle.")
public class SourceCommand extends ObrCommandSupport {
@Option(name = "-x", description = "Extract")
Modified: felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/StartCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/StartCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/StartCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/StartCommand.java Sun Jul 26 19:52:54 2009
@@ -17,7 +17,9 @@
package org.apache.felix.karaf.gshell.obr;
import org.osgi.service.obr.RepositoryAdmin;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "obr", name = "start", description = "Deploy and start a list of bundles using OBR.")
public class StartCommand extends DeployCommand {
protected void doExecute(RepositoryAdmin admin) throws Exception {
Modified: felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ExportsCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ExportsCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ExportsCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ExportsCommand.java Sun Jul 26 19:52:54 2009
@@ -21,11 +21,13 @@
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.service.packageadmin.ExportedPackage;
import org.osgi.service.packageadmin.PackageAdmin;
+@Command(scope = "packages", name = "exports", description = "Display exported packages")
public class ExportsCommand extends PackageCommandSupport {
@Option(name = "-i", aliases = { "--imports"}, description = "List bundles importing the packages")
Modified: felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ImportsCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ImportsCommand.java?rev=797981&r1=797980&r2=797981&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ImportsCommand.java (original)
+++ felix/trunk/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ImportsCommand.java Sun Jul 26 19:52:54 2009
@@ -27,7 +27,9 @@
import org.osgi.service.packageadmin.ExportedPackage;
import org.osgi.service.packageadmin.PackageAdmin;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "packages", name = "imports", description = "Display imported packages")
public class ImportsCommand extends PackageCommandSupport {
@Argument(required = false, multiValued = true, description = "bundle ids")