You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/11/19 16:40:43 UTC
svn commit: r596334 - in /servicemix/branches/servicemix-4.0/gshell:
gshell-core/ gshell-core/src/main/java/org/apache/geronimo/gshell/branding/
gshell-core/src/main/java/org/apache/geronimo/gshell/spring/
gshell-core/src/main/resources/META-INF/spring...
Author: gnodet
Date: Mon Nov 19 07:40:41 2007
New Revision: 596334
URL: http://svn.apache.org/viewvc?rev=596334&view=rev
Log:
Update to latest gshell snapshots
Modified:
servicemix/branches/servicemix-4.0/gshell/gshell-core/pom.xml
servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/ServiceMixBranding.java
servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandExecutor.java
servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml
servicemix/branches/servicemix-4.0/gshell/gshell-osgi/pom.xml
servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/BundleLevel.java
servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/Headers.java
servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ListBundles.java
servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ListServices.java
servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/RefreshBundle.java
servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ResolveBundle.java
servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/Shutdown.java
servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StartBundle.java
servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StartLevel.java
servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StopBundle.java
servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/UninstallBundle.java
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-core/pom.xml?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-core/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-core/pom.xml Mon Nov 19 07:40:41 2007
@@ -46,6 +46,7 @@
net.sf.cglib*;resolution:=optional,
org.codehaus.jettison*;resolution:=optional,
org.codehaus.plexus*;resolution:=optional,
+ org.apache.mina*;resolution:=optional,
org.dom4j*;resolution:=optional,
org.joda*;resolution:=optional,
org.jdom*;resolution:=optional,
@@ -106,6 +107,26 @@
<version>${gshell.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.gshell</groupId>
+ <artifactId>gshell-whisper</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell</groupId>
+ <artifactId>gshell-whisper</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.remote</groupId>
+ <artifactId>gshell-remote-common</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.remote</groupId>
+ <artifactId>gshell-remote-server</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-jexl</groupId>
<artifactId>commons-jexl</artifactId>
<version>1.1</version>
@@ -197,13 +218,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Name>${artifactId}</Bundle-Name>
<Bundle-SymbolicName>${groupId}-${artifactId}</Bundle-SymbolicName>
<Import-Package>${gshell.osgi.import}</Import-Package>
+ <DynamicImport-Package>sun.misc.*</DynamicImport-Package>
<Export-Package>${gshell.osgi.export}</Export-Package>
<Private-Package>${gshell.osgi.private}</Private-Package>
- <Implementation-Title>Apache GShell</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
<Spring-Context>*;publish-context:=false</Spring-Context>
</instructions>
</configuration>
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/ServiceMixBranding.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/ServiceMixBranding.java?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/ServiceMixBranding.java (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/ServiceMixBranding.java Mon Nov 19 07:40:41 2007
@@ -36,7 +36,7 @@
}
public String getName() {
- return "smx";
+ return "servicemix";
}
public String getDisplayName() {
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandExecutor.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandExecutor.java?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandExecutor.java (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandExecutor.java Mon Nov 19 07:40:41 2007
@@ -18,6 +18,7 @@
import org.apache.geronimo.gshell.CommandLineBuilder;
import org.apache.geronimo.gshell.DefaultCommandExecutor;
+import org.apache.geronimo.gshell.registry.CommandRegistry;
import org.apache.geronimo.gshell.command.CommandExecutor;
import org.apache.geronimo.gshell.layout.LayoutManager;
import org.apache.geronimo.gshell.shell.Environment;
@@ -31,6 +32,7 @@
private CommandExecutor executor;
private LayoutManager layoutManager;
+ private CommandRegistry commandRegistry;
private CommandLineBuilder commandLineBuilder;
private Environment env;
@@ -38,6 +40,10 @@
this.layoutManager = layoutManager;
}
+ public void setCommandRegistry(CommandRegistry commandRegistry) {
+ this.commandRegistry = commandRegistry;
+ }
+
public void setCommandLineBuilder(CommandLineBuilder commandLineBuilder) {
this.commandLineBuilder = commandLineBuilder;
}
@@ -47,7 +53,7 @@
}
public void init() {
- executor = new DefaultCommandExecutor(layoutManager, commandLineBuilder, env);
+ executor = new DefaultCommandExecutor(layoutManager, commandRegistry, commandLineBuilder, env);
}
public Object execute(String s) throws Exception {
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml Mon Nov 19 07:40:41 2007
@@ -26,6 +26,8 @@
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd">
+ <bean id="clear" class="org.apache.geronimo.gshell.commands.builtins.ClearCommand" />
+
<bean id="echo" class="org.apache.geronimo.gshell.commands.builtins.EchoCommand" />
<bean id="exit" class="org.apache.geronimo.gshell.commands.builtins.ExitCommand" />
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml Mon Nov 19 07:40:41 2007
@@ -36,6 +36,8 @@
<osgi:listener ref="commandRegistry" bind-method="register" unbind-method="unregister" />
</osgi:list>
+ <osgi:service ref="clear" interface="org.apache.geronimo.gshell.command.Command" />
+
<osgi:service ref="help" interface="org.apache.geronimo.gshell.command.Command" />
<osgi:service ref="exit" interface="org.apache.geronimo.gshell.command.Command" />
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml Mon Nov 19 07:40:41 2007
@@ -37,13 +37,14 @@
<bean id="terminal" class="jline.Terminal" factory-method="getTerminal" />
- <bean id="promptReader" class="org.apache.geronimo.gshell.console.PromptReader">
+ <bean id="promptReader" class="org.apache.geronimo.gshell.console.PromptReader" init-method="initialize">
<constructor-arg ref="terminal" />
<constructor-arg ref="io" />
</bean>
<bean id="commandExecutor" class="org.apache.geronimo.gshell.spring.SpringCommandExecutor" init-method="init">
<property name="commandLineBuilder" ref="commandLineBuilder" />
+ <property name="commandRegistry" ref="commandRegistry" />
<property name="env" ref="environment" />
<property name="layoutManager" ref="layoutManager" />
</bean>
@@ -61,13 +62,12 @@
<constructor-arg ref="branding" />
</bean>
- <bean id="layoutManager" class="org.apache.geronimo.gshell.layout.DefaultLayoutManager">
- <constructor-arg ref="commandRegistry" />
- <constructor-arg ref="layoutLoader" />
- <constructor-arg ref="environment" />
+ <bean id="layoutManager" class="org.apache.geronimo.gshell.layout.DefaultLayoutManager" init-method="initialize">
+ <constructor-arg ref="layoutLoader" index="0" type="org.apache.geronimo.gshell.layout.loader.LayoutLoader" />
+ <constructor-arg ref="environment" index="1" />
</bean>
- <bean id="layoutLoader" class="org.apache.geronimo.gshell.layout.loader.XMLLayoutLoader">
+ <bean id="layoutLoader" class="org.apache.geronimo.gshell.layout.loader.XMLLayoutLoader" init-method="initialize">
<constructor-arg ref="shellInfo" />
</bean>
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/pom.xml?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-osgi/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-osgi/pom.xml Mon Nov 19 07:40:41 2007
@@ -67,14 +67,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Name>${artifactId}</Bundle-Name>
<Bundle-SymbolicName>${groupId}.${artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.geronimo.gshell.osgi*;version=${project.version}</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>!*</Private-Package>
- <Implementation-Title>Apache GShell</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <DynamicImport-Package>*</DynamicImport-Package>
<Spring-Context>*;publish-context:=false</Spring-Context>
</instructions>
</configuration>
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/BundleLevel.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/BundleLevel.java?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/BundleLevel.java (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/BundleLevel.java Mon Nov 19 07:40:41 2007
@@ -29,7 +29,7 @@
* Time: 12:37:30 PM
* To change this template use File | Settings | File Templates.
*/
-@CommandComponent(id="bundlelevel", description="Get or set the start level of a given bundle")
+@CommandComponent(id="osgi:bundlelevel", description="Get or set the start level of a given bundle")
public class BundleLevel extends BundleCommand {
@Argument
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/Headers.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/Headers.java?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/Headers.java (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/Headers.java Mon Nov 19 07:40:41 2007
@@ -33,7 +33,7 @@
* Time: 12:10:15 PM
* To change this template use File | Settings | File Templates.
*/
-@CommandComponent(id="headers", description="Display headers")
+@CommandComponent(id="osgi:headers", description="Display headers")
public class Headers extends OsgiCommandSupport {
@Argument(required = false, multiValued = true, description = "Bundles ids")
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ListBundles.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ListBundles.java?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ListBundles.java (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ListBundles.java Mon Nov 19 07:40:41 2007
@@ -30,7 +30,7 @@
* Time: 9:44:20 AM
* To change this template use File | Settings | File Templates.
*/
-@CommandComponent(id="lb", description="List bundles")
+@CommandComponent(id="osgi:listBundles", description="List bundles")
public class ListBundles extends OsgiCommandSupport {
@Option(name = "-l", description = "Show locations")
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ListServices.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ListServices.java?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ListServices.java (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ListServices.java Mon Nov 19 07:40:41 2007
@@ -32,7 +32,7 @@
* Time: 9:44:20 AM
* To change this template use File | Settings | File Templates.
*/
-@CommandComponent(id = "ls", description = "List services")
+@CommandComponent(id = "osgi:listServices", description = "List services")
public class ListServices extends OsgiCommandSupport {
@Option(name = "-a", description = "Show all")
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/RefreshBundle.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/RefreshBundle.java?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/RefreshBundle.java (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/RefreshBundle.java Mon Nov 19 07:40:41 2007
@@ -29,7 +29,7 @@
* Time: 12:37:30 PM
* To change this template use File | Settings | File Templates.
*/
-@CommandComponent(id="refresh", description="Refresh bundle")
+@CommandComponent(id="osgi:refresh", description="Refresh bundle")
public class RefreshBundle extends OsgiCommandSupport {
@Argument(required = false)
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ResolveBundle.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ResolveBundle.java?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ResolveBundle.java (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ResolveBundle.java Mon Nov 19 07:40:41 2007
@@ -28,7 +28,7 @@
* Time: 12:37:30 PM
* To change this template use File | Settings | File Templates.
*/
-@CommandComponent(id="resolve", description="Resolve bundle")
+@CommandComponent(id="osgi:resolve", description="Resolve bundle")
public class ResolveBundle extends BundleCommand {
protected void doExecute(Bundle bundle) throws Exception {
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/Shutdown.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/Shutdown.java?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/Shutdown.java (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/Shutdown.java Mon Nov 19 07:40:41 2007
@@ -26,7 +26,7 @@
* Time: 1:59:04 PM
* To change this template use File | Settings | File Templates.
*/
-@CommandComponent(id="shutdown", description="Shutdown")
+@CommandComponent(id="osgi:shutdown", description="Shutdown")
public class Shutdown extends OsgiCommandSupport {
protected Object doExecute() throws Exception {
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StartBundle.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StartBundle.java?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StartBundle.java (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StartBundle.java Mon Nov 19 07:40:41 2007
@@ -26,7 +26,7 @@
* Time: 12:10:15 PM
* To change this template use File | Settings | File Templates.
*/
-@CommandComponent(id="start", description="Start bundle")
+@CommandComponent(id="osgi:start", description="Start bundle")
public class StartBundle extends BundleCommand {
protected void doExecute(Bundle bundle) throws Exception {
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StartLevel.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StartLevel.java?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StartLevel.java (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StartLevel.java Mon Nov 19 07:40:41 2007
@@ -29,7 +29,7 @@
* Time: 12:37:30 PM
* To change this template use File | Settings | File Templates.
*/
-@CommandComponent(id="startlevel", description="Get or set the start level")
+@CommandComponent(id="osgi:startlevel", description="Get or set the start level")
public class StartLevel extends OsgiCommandSupport {
@Argument
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StopBundle.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StopBundle.java?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StopBundle.java (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StopBundle.java Mon Nov 19 07:40:41 2007
@@ -26,7 +26,7 @@
* Time: 12:10:15 PM
* To change this template use File | Settings | File Templates.
*/
-@CommandComponent(id="stop", description="Stop bundle")
+@CommandComponent(id="osgi:stop", description="Stop bundle")
public class StopBundle extends BundleCommand {
protected void doExecute(Bundle bundle) throws Exception {
Modified: servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/UninstallBundle.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/UninstallBundle.java?rev=596334&r1=596333&r2=596334&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/UninstallBundle.java (original)
+++ servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/UninstallBundle.java Mon Nov 19 07:40:41 2007
@@ -26,7 +26,7 @@
* Time: 12:37:30 PM
* To change this template use File | Settings | File Templates.
*/
-@CommandComponent(id="uninstall", description="Uninstall bundle")
+@CommandComponent(id="osgi:uninstall", description="Uninstall bundle")
public class UninstallBundle extends BundleCommand {
protected void doExecute(Bundle bundle) throws Exception {