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/08/07 12:18:22 UTC
svn commit: r801932 - in /felix/trunk/karaf/gshell/gshell-osgi/src/main:
java/org/apache/felix/karaf/gshell/osgi/
resources/org/apache/felix/karaf/gshell/osgi/
Author: gnodet
Date: Fri Aug 7 10:18:21 2009
New Revision: 801932
URL: http://svn.apache.org/viewvc?rev=801932&view=rev
Log:
FELIX-1454: install --help throws an exception
Removed:
felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/BundleLevel.properties
felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/Headers.properties
felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/InstallBundle.properties
felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ListBundles.properties
felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ListServices.properties
felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/RefreshBundle.properties
felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ResolveBundle.properties
felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/RestartBundle.properties
felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/Shutdown.properties
felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StartBundle.properties
felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StartLevel.properties
felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StopBundle.properties
felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/UninstallBundle.properties
felix/trunk/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/UpdateBundle.properties
Modified:
felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java
felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java
felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java
felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListBundles.java
felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListServices.java
felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RefreshBundle.java
felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ResolveBundle.java
felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RestartBundle.java
felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Shutdown.java
felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartBundle.java
felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartLevel.java
felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StopBundle.java
felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UninstallBundle.java
felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UpdateBundle.java
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java?rev=801932&r1=801931&r2=801932&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java Fri Aug 7 10:18:21 2009
@@ -17,10 +17,12 @@
package org.apache.felix.karaf.gshell.osgi;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.startlevel.StartLevel;
+@Command(scope = "osgi", name = "bundle-level", description = "Get or set the start level of a given bundle")
public class BundleLevel extends BundleCommand {
@Argument(required = false, index = 1)
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java?rev=801932&r1=801931&r2=801932&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java Fri Aug 7 10:18:21 2009
@@ -22,8 +22,10 @@
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.Bundle;
+@Command(scope = "osgi", name = "headers", description = "Display OSGi headers of a given bundle")
public class Headers extends OsgiCommandSupport {
@Argument(required = false, multiValued = true, description = "Bundles ids")
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java?rev=801932&r1=801931&r2=801932&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java Fri Aug 7 10:18:21 2009
@@ -23,9 +23,11 @@
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
+@Command(scope = "osgi", name = "install", description = "Install bundle(s)")
public class InstallBundle extends OsgiCommandSupport {
@Argument(required = true, multiValued = true, description = "Bundle URLs")
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListBundles.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListBundles.java?rev=801932&r1=801931&r2=801932&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListBundles.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListBundles.java Fri Aug 7 10:18:21 2009
@@ -18,12 +18,14 @@
import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
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.framework.ServiceReference;
import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.service.startlevel.StartLevel;
+@Command(scope = "osgi", name = "list", description = "List bundles")
public class ListBundles extends OsgiCommandSupport {
@Option(name = "-l", description = "Show locations")
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListServices.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListServices.java?rev=801932&r1=801931&r2=801932&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListServices.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListServices.java Fri Aug 7 10:18:21 2009
@@ -21,10 +21,12 @@
import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
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.ServiceReference;
import org.osgi.service.command.Function;
+@Command(scope = "osgi", name = "ls", description = "List services")
public class ListServices extends OsgiCommandSupport {
@Option(name = "-a", description = "Show all")
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RefreshBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RefreshBundle.java?rev=801932&r1=801931&r2=801932&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RefreshBundle.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RefreshBundle.java Fri Aug 7 10:18:21 2009
@@ -18,10 +18,12 @@
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.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.PackageAdmin;
+@Command(scope = "osgi", name = "refresh", description = "Refresh bundle(s)")
public class RefreshBundle extends OsgiCommandSupport {
@Argument(required = false)
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ResolveBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ResolveBundle.java?rev=801932&r1=801931&r2=801932&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ResolveBundle.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ResolveBundle.java Fri Aug 7 10:18:21 2009
@@ -19,7 +19,9 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.PackageAdmin;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "osgi", name = "resolve", description = "Resolve bundle(s)")
public class ResolveBundle extends BundleCommand {
protected void doExecute(Bundle bundle) throws Exception {
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RestartBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RestartBundle.java?rev=801932&r1=801931&r2=801932&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RestartBundle.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RestartBundle.java Fri Aug 7 10:18:21 2009
@@ -19,7 +19,9 @@
import java.util.List;
import org.osgi.framework.Bundle;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "osgi", name = "restart", description = "Stop and restart bundle(s)")
public class RestartBundle extends BundlesCommand {
protected void doExecute(List<Bundle> bundles) throws Exception {
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Shutdown.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Shutdown.java?rev=801932&r1=801931&r2=801932&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Shutdown.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Shutdown.java Fri Aug 7 10:18:21 2009
@@ -17,11 +17,13 @@
package org.apache.felix.karaf.gshell.osgi;
import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.Bundle;
/**
* Command to shut down Karaf
*/
+@Command(scope = "osgi", name = "shutdown", description = "Shut the framework down")
public class Shutdown extends OsgiCommandSupport {
protected Object doExecute() throws Exception {
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartBundle.java?rev=801932&r1=801931&r2=801932&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartBundle.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartBundle.java Fri Aug 7 10:18:21 2009
@@ -19,7 +19,9 @@
import java.util.List;
import org.osgi.framework.Bundle;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "osgi", name = "start", description = "Start bundle(s)")
public class StartBundle extends BundlesCommand {
protected void doExecute(List<Bundle> bundles) throws Exception {
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartLevel.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartLevel.java?rev=801932&r1=801931&r2=801932&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartLevel.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartLevel.java Fri Aug 7 10:18:21 2009
@@ -18,8 +18,10 @@
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;
+@Command(scope = "osgi", name = "start-level", description = "Get or set the start level")
public class StartLevel extends OsgiCommandSupport {
@Argument(required = false, index = 0)
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StopBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StopBundle.java?rev=801932&r1=801931&r2=801932&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StopBundle.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StopBundle.java Fri Aug 7 10:18:21 2009
@@ -19,7 +19,9 @@
import java.util.List;
import org.osgi.framework.Bundle;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "osgi", name = "stop", description = "Stop bundle(s)")
public class StopBundle extends BundlesCommand {
protected void doExecute(List<Bundle> bundles) throws Exception {
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UninstallBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UninstallBundle.java?rev=801932&r1=801931&r2=801932&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UninstallBundle.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UninstallBundle.java Fri Aug 7 10:18:21 2009
@@ -17,7 +17,9 @@
package org.apache.felix.karaf.gshell.osgi;
import org.osgi.framework.Bundle;
+import org.apache.felix.gogo.commands.Command;
+@Command(scope = "osgi", name = "uninstall", description = "Uninstall bundle")
public class UninstallBundle extends BundleCommand {
protected void doExecute(Bundle bundle) throws Exception {
Modified: felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UpdateBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UpdateBundle.java?rev=801932&r1=801931&r2=801932&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UpdateBundle.java (original)
+++ felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UpdateBundle.java Fri Aug 7 10:18:21 2009
@@ -20,8 +20,10 @@
import java.net.URL;
import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.Bundle;
+@Command(scope = "osgi", name = "update", description = "Update bundle")
public class UpdateBundle extends BundleCommand {
@Argument(required = false, description = "Bundle location", index=1)