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 2009/08/25 18:02:27 UTC
svn commit: r807683 - in /servicemix/sandbox/karaf/nmr: ./ jbi/commands/
jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/
jbi/commands/src/main/resources/META-INF/
jbi/commands/src/main/resources/OSGI-INF/ jbi/commands/src/main/resources/...
Author: gnodet
Date: Tue Aug 25 16:02:27 2009
New Revision: 807683
URL: http://svn.apache.org/viewvc?rev=807683&view=rev
Log:
Switch to blueprint for nmr / jbi commands
Added:
servicemix/sandbox/karaf/nmr/jbi/commands/src/main/resources/OSGI-INF/
servicemix/sandbox/karaf/nmr/jbi/commands/src/main/resources/OSGI-INF/blueprint/
servicemix/sandbox/karaf/nmr/jbi/commands/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-commands.xml
- copied, changed from r807663, servicemix/sandbox/karaf/nmr/jbi/commands/src/main/resources/META-INF/spring/servicemix-jbi-commands.xml
servicemix/sandbox/karaf/nmr/nmr/commands/src/main/resources/OSGI-INF/
servicemix/sandbox/karaf/nmr/nmr/commands/src/main/resources/OSGI-INF/blueprint/
servicemix/sandbox/karaf/nmr/nmr/commands/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-commands.xml
- copied, changed from r807663, servicemix/sandbox/karaf/nmr/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml
Removed:
servicemix/sandbox/karaf/nmr/jbi/commands/src/main/resources/META-INF/
servicemix/sandbox/karaf/nmr/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/
servicemix/sandbox/karaf/nmr/nmr/commands/src/main/resources/META-INF/
servicemix/sandbox/karaf/nmr/nmr/commands/src/main/resources/org/apache/servicemix/nmr/commands/
Modified:
servicemix/sandbox/karaf/nmr/jbi/commands/pom.xml
servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java
servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java
servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java
servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java
servicemix/sandbox/karaf/nmr/nmr/commands/pom.xml
servicemix/sandbox/karaf/nmr/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java
servicemix/sandbox/karaf/nmr/pom.xml
Modified: servicemix/sandbox/karaf/nmr/jbi/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/commands/pom.xml?rev=807683&r1=807682&r2=807683&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/jbi/commands/pom.xml (original)
+++ servicemix/sandbox/karaf/nmr/jbi/commands/pom.xml Tue Aug 25 16:02:27 2009
@@ -52,13 +52,12 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
- org.apache.geronimo.gshell.wisdom.command,
- org.apache.geronimo.gshell.wisdom.registry,
- org.apache.felix.karaf.gshell.console,
- *
+ org.osgi.service.command,
+ org.apache.felix.gogo.commands,
+ org.apache.felix.karaf.gshell.console,
+ *
</Import-Package>
- <Export-Package>${pom.artifactId}*</Export-Package>
- <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
+ <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
</instructions>
</configuration>
</plugin>
Modified: servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java?rev=807683&r1=807682&r2=807683&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java (original)
+++ servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java Tue Aug 25 16:02:27 2009
@@ -23,10 +23,12 @@
import org.apache.servicemix.jbi.deployer.Component;
import org.apache.servicemix.jbi.deployer.ServiceAssembly;
import org.apache.servicemix.jbi.deployer.SharedLibrary;
+import org.apache.felix.gogo.commands.Command;
/**
* List JBI artifacts
*/
+@Command(scope = "jbi", name = "list", description = "List JBI endpoints")
public class ListCommand extends JbiCommandSupport {
private static final int NAME_COL_LENGTH = 30;
Modified: servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java?rev=807683&r1=807682&r2=807683&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java (original)
+++ servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java Tue Aug 25 16:02:27 2009
@@ -20,12 +20,14 @@
import javax.jbi.management.LifeCycleMBean;
import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.gogo.commands.Command;
import org.apache.servicemix.jbi.deployer.ServiceAssembly;
import org.apache.servicemix.jbi.deployer.Component;
/**
* Shutdown a JBI artifact
*/
+@Command(scope = "jbi", name = "shutdown", description = "Shutdown a JBI artifact")
public class ShutdownCommand extends JbiLifeCycleCommandSupport {
@Option(name = "--force")
Modified: servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java?rev=807683&r1=807682&r2=807683&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java (original)
+++ servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java Tue Aug 25 16:02:27 2009
@@ -19,9 +19,12 @@
import javax.jbi.JBIException;
import javax.jbi.management.LifeCycleMBean;
+import org.apache.felix.gogo.commands.Command;
+
/**
* Start a JBI artifact
*/
+@Command(scope = "jbi", name = "start", description = "Start a JBI artifact")
public class StartCommand extends JbiLifeCycleCommandSupport {
protected void handle(LifeCycleMBean artifact) throws JBIException {
Modified: servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java?rev=807683&r1=807682&r2=807683&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java (original)
+++ servicemix/sandbox/karaf/nmr/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java Tue Aug 25 16:02:27 2009
@@ -19,9 +19,12 @@
import javax.jbi.JBIException;
import javax.jbi.management.LifeCycleMBean;
+import org.apache.felix.gogo.commands.Command;
+
/**
* Stop a JBI artifact
*/
+@Command(scope = "jbi", name = "stop", description = "Stop a JBI artifact")
public class StopCommand extends JbiLifeCycleCommandSupport {
protected void handle(LifeCycleMBean artifact) throws JBIException {
Copied: servicemix/sandbox/karaf/nmr/jbi/commands/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-commands.xml (from r807663, servicemix/sandbox/karaf/nmr/jbi/commands/src/main/resources/META-INF/spring/servicemix-jbi-commands.xml)
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/commands/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-commands.xml?p2=servicemix/sandbox/karaf/nmr/jbi/commands/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-commands.xml&p1=servicemix/sandbox/karaf/nmr/jbi/commands/src/main/resources/META-INF/spring/servicemix-jbi-commands.xml&r1=807663&r2=807683&rev=807683&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/jbi/commands/src/main/resources/META-INF/spring/servicemix-jbi-commands.xml (original)
+++ servicemix/sandbox/karaf/nmr/jbi/commands/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-commands.xml Tue Aug 25 16:02:27 2009
@@ -17,42 +17,32 @@
limitations under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:gshell="http://servicemix.apache.org/schema/servicemix-gshell"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://servicemix.apache.org/schema/servicemix-gshell
- http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
- <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
-
- <gshell:command-bundle>
- <gshell:command name="jbi/list">
- <gshell:action class="org.apache.servicemix.jbi.commands.ListCommand" />
- </gshell:command>
- <gshell:link name="jbi/ls" target="jbi/list"/>
- <gshell:command name="jbi/start">
- <gshell:action class="org.apache.servicemix.jbi.commands.StartCommand" />
- <gshell:completers>
- <ref bean="jbiArtifactsCompleter" />
- </gshell:completers>
- </gshell:command>
- <gshell:command name="jbi/stop">
- <gshell:action class="org.apache.servicemix.jbi.commands.StopCommand" />
- <gshell:completers>
- <ref bean="jbiArtifactsCompleter" />
- </gshell:completers>
- </gshell:command>
- <gshell:command name="jbi/shutdown">
- <gshell:action class="org.apache.servicemix.jbi.commands.ShutdownCommand" />
- <gshell:completers>
- <ref bean="jbiArtifactsCompleter" />
- </gshell:completers>
- </gshell:command>
- </gshell:command-bundle>
+ <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0">
+ <command name="jbi/list">
+ <action class="org.apache.servicemix.jbi.commands.ListCommand" />
+ </command>
+ <command name="jbi/start">
+ <action class="org.apache.servicemix.jbi.commands.StartCommand" />
+ <completers>
+ <ref component-id="jbiArtifactsCompleter" />
+ </completers>
+ </command>
+ <command name="jbi/stop">
+ <action class="org.apache.servicemix.jbi.commands.StopCommand" />
+ <completers>
+ <ref component-id="jbiArtifactsCompleter" />
+ </completers>
+ </command>
+ <command name="jbi/shutdown">
+ <action class="org.apache.servicemix.jbi.commands.ShutdownCommand" />
+ <completers>
+ <ref component-id="jbiArtifactsCompleter" />
+ </completers>
+ </command>
+ </command-bundle>
<bean id="jbiArtifactsCompleter" class="org.apache.servicemix.jbi.commands.JbiCommandCompleter" />
-</beans>
+</blueprint>
Modified: servicemix/sandbox/karaf/nmr/nmr/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/nmr/commands/pom.xml?rev=807683&r1=807682&r2=807683&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/nmr/commands/pom.xml (original)
+++ servicemix/sandbox/karaf/nmr/nmr/commands/pom.xml Tue Aug 25 16:02:27 2009
@@ -52,13 +52,12 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
- org.apache.geronimo.gshell.wisdom.command,
- org.apache.geronimo.gshell.wisdom.registry,
- org.apache.felix.karaf.gshell.console,
- *
+ org.osgi.service.command,
+ org.apache.felix.gogo.commands,
+ org.apache.felix.karaf.gshell.console,
+ *
</Import-Package>
- <Export-Package>${pom.artifactId}</Export-Package>
- <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
+ <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
</instructions>
</configuration>
</plugin>
Modified: servicemix/sandbox/karaf/nmr/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java?rev=807683&r1=807682&r2=807683&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java (original)
+++ servicemix/sandbox/karaf/nmr/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java Tue Aug 25 16:02:27 2009
@@ -17,11 +17,13 @@
package org.apache.servicemix.nmr.commands;
import org.apache.servicemix.nmr.api.Endpoint;
+import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.ServiceReference;
/**
* Displays the name of existing NMR endpoints
*/
+@Command(scope = "nmr", name = "list", description = "List NMR endpoints")
public class ListCommand extends NmrCommandSupport {
protected Object doExecute() throws Exception {
Copied: servicemix/sandbox/karaf/nmr/nmr/commands/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-commands.xml (from r807663, servicemix/sandbox/karaf/nmr/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml)
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/nmr/commands/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-commands.xml?p2=servicemix/sandbox/karaf/nmr/nmr/commands/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-commands.xml&p1=servicemix/sandbox/karaf/nmr/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml&r1=807663&r2=807683&rev=807683&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml (original)
+++ servicemix/sandbox/karaf/nmr/nmr/commands/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-commands.xml Tue Aug 25 16:02:27 2009
@@ -17,23 +17,12 @@
limitations under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:gshell="http://servicemix.apache.org/schema/servicemix-gshell"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://servicemix.apache.org/schema/servicemix-gshell
- http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd
- ">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
- <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
+ <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0">
+ <command name="nmr/list">
+ <action class="org.apache.servicemix.nmr.commands.ListCommand"/>
+ </command>
+ </command-bundle>
- <gshell:command-bundle>
- <gshell:command name="nmr/list">
- <gshell:action class="org.apache.servicemix.nmr.commands.ListCommand" />
- </gshell:command>
- <gshell:link name="nmr/ls" target="nmr/list"/>
- </gshell:command-bundle>
-
-</beans>
+</blueprint>
Modified: servicemix/sandbox/karaf/nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/pom.xml?rev=807683&r1=807682&r2=807683&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/pom.xml (original)
+++ servicemix/sandbox/karaf/nmr/pom.xml Tue Aug 25 16:02:27 2009
@@ -98,7 +98,7 @@
<servicemix.http.version>2008.01</servicemix.http.version>
<servicemix.jsr181.version>2008.01</servicemix.jsr181.version>
<servicemix.shared.version>2008.01</servicemix.shared.version>
- <felix.karaf.version>1.2.0-SNAPSHOT</felix.karaf.version>
+ <felix.karaf.version>0.9.0-SNAPSHOT</felix.karaf.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.specs.version>1.3.0</servicemix.specs.version>
<servicemix.utils.version>1.1.0</servicemix.utils.version>