You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by cc...@apache.org on 2008/10/29 05:25:24 UTC
svn commit: r708768 - in /servicemix/smx4: features/trunk/ nmr/trunk/
nmr/trunk/nmr/commands/
nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/
nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/
nmr/trunk/nmr/commands/src...
Author: ccustine
Date: Tue Oct 28 21:25:24 2008
New Revision: 708768
URL: http://svn.apache.org/viewvc?rev=708768&view=rev
Log:
SMX4KNL-128 Updating NMR Commands to gshell trunk + misc fixes for gshell commands
Added:
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/apache/
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/apache/servicemix/
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/apache/servicemix/nmr/
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/apache/servicemix/nmr/commands/
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/apache/servicemix/nmr/commands/ListCommand.properties
Modified:
servicemix/smx4/features/trunk/pom.xml
servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java
servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=708768&r1=708767&r2=708768&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Tue Oct 28 21:25:24 2008
@@ -172,7 +172,7 @@
<servicemix-utils.version>1.0.0</servicemix-utils.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.kernel.version>1.1.0-SNAPSHOT</servicemix.kernel.version>
- <servicemix.nmr.version>1.0.0-m3-SNAPSHOT</servicemix.nmr.version>
+ <servicemix.nmr.version>1.0.0-m4-SNAPSHOT</servicemix.nmr.version>
<servicemix.specs.version>1.1.0</servicemix.specs.version>
<servicemix.bundle.suffix>_1-SNAPSHOT</servicemix.bundle.suffix>
Modified: servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/pom.xml?rev=708768&r1=708767&r2=708768&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/pom.xml Tue Oct 28 21:25:24 2008
@@ -37,11 +37,11 @@
<artifactId>org.apache.servicemix.nmr.core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
- <version>${servicemix.kernel.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.kernel.gshell</groupId>
+ <artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
+ <version>${servicemix.kernel.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -52,7 +52,12 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Import-Package>org.osgi.framework;version="[1.3,2.0)",*</Import-Package>
+ <Import-Package>
+ org.apache.geronimo.gshell.wisdom.command,
+ org.apache.geronimo.gshell.wisdom.registry,
+ org.apache.servicemix.kernel.gshell.core,
+ *
+ </Import-Package>
<Export-Package>${pom.artifactId}</Export-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
Modified: servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java?rev=708768&r1=708767&r2=708768&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java Tue Oct 28 21:25:24 2008
@@ -22,7 +22,6 @@
/**
* Displays the name of existing NMR endpoints
*/
-@org.apache.geronimo.gshell.command.annotation.CommandComponent(id = "nmr:list", description = "List NMR endpoints")
public class ListCommand extends NmrCommandSupport {
protected Object doExecute() throws Exception {
Modified: servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java?rev=708768&r1=708767&r2=708768&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java Tue Oct 28 21:25:24 2008
@@ -17,9 +17,8 @@
package org.apache.servicemix.nmr.commands;
import java.util.List;
-
-import org.apache.geronimo.gshell.support.OsgiCommandSupport;
import org.apache.servicemix.nmr.api.Endpoint;
+import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
/**
* Base class for NMR related commands
Modified: servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml?rev=708768&r1=708767&r2=708768&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml Tue Oct 28 21:25:24 2008
@@ -19,23 +19,21 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xmlns:util="http://www.springframework.org/schema/util"
+ 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://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util.xsd
- http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+ http://servicemix.apache.org/schema/servicemix-gshell
+ http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd
+ ">
- <bean id="list" class="org.apache.servicemix.nmr.commands.ListCommand" />
+ <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
- <osgi:service ref="list" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="nmr"/>
- <entry key="alias" value="ls"/>
- </osgi:service-properties>
- </osgi:service>
+ <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>
Added: servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/apache/servicemix/nmr/commands/ListCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/apache/servicemix/nmr/commands/ListCommand.properties?rev=708768&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/apache/servicemix/nmr/commands/ListCommand.properties (added)
+++ servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/org/apache/servicemix/nmr/commands/ListCommand.properties Tue Oct 28 21:25:24 2008
@@ -0,0 +1,27 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
+##
+## $Rev: 703511 $ $Date: 2008-10-10 18:07:36 +0200 (Fri, 10 Oct 2008) $
+##
+
+command.description=List NMR endpoints.
+
+command.manual=\
+ TODO: date manual
\ No newline at end of file
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=708768&r1=708767&r2=708768&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Tue Oct 28 21:25:24 2008
@@ -82,7 +82,7 @@
<log4j.version>1.2.14</log4j.version>
<pax.logging.version>1.1.1</pax.logging.version>
<servicemix3.version>3.2.1</servicemix3.version>
- <servicemix.kernel.version>1.0.0</servicemix.kernel.version>
+ <servicemix.kernel.version>1.1.0-SNAPSHOT</servicemix.kernel.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.specs.version>1.1.0</servicemix.specs.version>
<spring.osgi.version>1.1.0</spring.osgi.version>