servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r709779 - in /servicemix/smx4/nmr/trunk: assembly/src/main/filtered-resources/ jbi/commands/ jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ jbi/commands/src/main/resources/META-INF/spring/ jbi/commands/src/main/resources/org...
Date Sat, 01 Nov 2008 21:24:40 GMT
Author: gnodet
Date: Sat Nov  1 14:24:39 2008
New Revision: 709779

URL: http://svn.apache.org/viewvc?rev=709779&view=rev
Log:
SMX4NMR-53: Upgrade to kernel 1.1.0

Added:
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ListCommand.properties
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ShutdownCommand.properties
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StartCommand.properties
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StopCommand.properties
Modified:
    servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
    servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandSupport.java
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java
    servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/META-INF/spring/servicemix-jbi-commands.xml

Modified: servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml?rev=709779&r1=709778&r2=709779&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml Sat Nov  1
14:24:39 2008
@@ -17,7 +17,7 @@
       limitations under the License.
 -->
 <features>
-    <feature name="nmr">
+    <feature name="nmr" version="${version}">
         <bundle>mvn:org.apache.servicemix.document/org.apache.servicemix.document/${pom.version}</bundle>
         <bundle>mvn:org.apache.servicemix.nmr/org.apache.servicemix.nmr.api/${pom.version}</bundle>
         <bundle>mvn:org.apache.servicemix.nmr/org.apache.servicemix.nmr.core/${pom.version}</bundle>
@@ -26,9 +26,8 @@
         <bundle>mvn:org.apache.servicemix.nmr/org.apache.servicemix.nmr.commands/${pom.version}</bundle>
         <bundle>mvn:org.apache.servicemix.nmr/org.apache.servicemix.nmr.management/${pom.version}</bundle>
     </feature>
-    <feature name="jbi">
+    <feature name="jbi" version="${version}">
         <feature>nmr</feature>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-javamail_1.4_spec/${geronimo.javamail.version}</bundle>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta.version}</bundle>

Modified: servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/pom.xml?rev=709779&r1=709778&r2=709779&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/pom.xml Sat Nov  1 14:24:39 2008
@@ -52,6 +52,12 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <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/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandSupport.java?rev=709779&r1=709778&r2=709779&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandSupport.java
(original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/JbiCommandSupport.java
Sat Nov  1 14:24:39 2008
@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.geronimo.gshell.support.OsgiCommandSupport;
+import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
 import org.apache.servicemix.jbi.deployer.Component;
 import org.apache.servicemix.jbi.deployer.ServiceAssembly;
 import org.apache.servicemix.jbi.deployer.SharedLibrary;

Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java?rev=709779&r1=709778&r2=709779&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java
(original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ListCommand.java
Sat Nov  1 14:24:39 2008
@@ -25,7 +25,6 @@
 /**
  * List JBI artifacts
  */
-@org.apache.geronimo.gshell.command.annotation.CommandComponent(id = "jbi:list", description
= "List deployed JBI artifacts")
 public class ListCommand extends JbiCommandSupport {
 
     protected Object doExecute() throws Exception {

Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java?rev=709779&r1=709778&r2=709779&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java
(original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/ShutdownCommand.java
Sat Nov  1 14:24:39 2008
@@ -22,7 +22,6 @@
 /**
  * Shutdown a JBI artifact
  */
-@org.apache.geronimo.gshell.command.annotation.CommandComponent(id = "jbi:shutdown", description
= "Shutdown a JBI artifact")
 public class ShutdownCommand extends JbiLifeCycleCommandSupport {
 
     protected void handle(LifeCycleMBean artifact) throws JBIException {

Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java?rev=709779&r1=709778&r2=709779&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java
(original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StartCommand.java
Sat Nov  1 14:24:39 2008
@@ -22,7 +22,6 @@
 /**
  * Start a JBI artifact
  */
-@org.apache.geronimo.gshell.command.annotation.CommandComponent(id = "jbi:start", description
= "Start a JBI artifact")
 public class StartCommand extends JbiLifeCycleCommandSupport {
 
     protected void handle(LifeCycleMBean artifact) throws JBIException {

Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java?rev=709779&r1=709778&r2=709779&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java
(original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/java/org/apache/servicemix/jbi/commands/StopCommand.java
Sat Nov  1 14:24:39 2008
@@ -22,7 +22,6 @@
 /**
  * Stop a JBI artifact
  */
-@org.apache.geronimo.gshell.command.annotation.CommandComponent(id = "jbi:stop", description
= "Stop a JBI artifact")
 public class StopCommand extends JbiLifeCycleCommandSupport {
 
     protected void handle(LifeCycleMBean artifact) throws JBIException {

Modified: servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/META-INF/spring/servicemix-jbi-commands.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/META-INF/spring/servicemix-jbi-commands.xml?rev=709779&r1=709778&r2=709779&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/META-INF/spring/servicemix-jbi-commands.xml
(original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/META-INF/spring/servicemix-jbi-commands.xml
Sat Nov  1 14:24:39 2008
@@ -19,48 +19,29 @@
 -->
 <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.jbi.commands.ListCommand" />
-
-    <bean id="start" class="org.apache.servicemix.jbi.commands.StartCommand" />
-
-    <bean id="stop" class="org.apache.servicemix.jbi.commands.StopCommand" />
-
-    <bean id="shutdown" class="org.apache.servicemix.jbi.commands.ShutdownCommand" />
-
-    <osgi:service ref="list" interface="org.apache.geronimo.gshell.command.Command">
-      <osgi:service-properties>
-        <entry key="shell" value="jbi"/>
-        <entry key="alias" value="ls"/>
-      </osgi:service-properties>
-    </osgi:service>
-
-    <osgi:service ref="start" interface="org.apache.geronimo.gshell.command.Command">
-      <osgi:service-properties>
-        <entry key="shell" value="jbi"/>
-      </osgi:service-properties>
-    </osgi:service>
-
-    <osgi:service ref="stop" interface="org.apache.geronimo.gshell.command.Command">
-      <osgi:service-properties>
-        <entry key="shell" value="jbi"/>
-      </osgi:service-properties>
-    </osgi:service>
-
-    <osgi:service ref="shutdown" interface="org.apache.geronimo.gshell.command.Command">
-      <osgi:service-properties>
-        <entry key="shell" value="jbi"/>
-      </osgi:service-properties>
-    </osgi:service>
+    <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:alias name="jbi/ls" alias="jbi/list" />
+        <gshell:command name="jbi/start">
+            <gshell:action class="org.apache.servicemix.jbi.commands.StartCommand" />
+        </gshell:command>
+        <gshell:command name="jbi/stop">
+            <gshell:action class="org.apache.servicemix.jbi.commands.StopCommand" />
+        </gshell:command>
+        <gshell:command name="jbi/shutdown">
+            <gshell:action class="org.apache.servicemix.jbi.commands.ShutdownCommand"
/>
+        </gshell:command>
+    </gshell:command-bundle>
 
 </beans>

Added: servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ListCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ListCommand.properties?rev=709779&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ListCommand.properties
(added)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ListCommand.properties
Sat Nov  1 14:24:39 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 JBI endpoints.
+
+command.manual=\
+  TODO: date manual
\ No newline at end of file

Added: servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ShutdownCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ShutdownCommand.properties?rev=709779&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ShutdownCommand.properties
(added)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/ShutdownCommand.properties
Sat Nov  1 14:24:39 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=Shutdown a JBI artifact.
+
+command.manual=\
+  TODO: date manual
\ No newline at end of file

Added: servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StartCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StartCommand.properties?rev=709779&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StartCommand.properties
(added)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StartCommand.properties
Sat Nov  1 14:24:39 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=Start a JBI artifact.
+
+command.manual=\
+  TODO: date manual
\ No newline at end of file

Added: servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StopCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StopCommand.properties?rev=709779&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StopCommand.properties
(added)
+++ servicemix/smx4/nmr/trunk/jbi/commands/src/main/resources/org/apache/servicemix/jbi/commands/StopCommand.properties
Sat Nov  1 14:24:39 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=Stop a JBI artifact.
+
+command.manual=\
+  TODO: date manual
\ No newline at end of file



Mime
View raw message