Fix karaf commands
authorGuillaume Nodet <gnodet@apache.org>
Thu, 11 May 2017 11:08:00 +0000 (13:08 +0200)
committerGuillaume Nodet <gnodet@apache.org>
Thu, 11 May 2017 11:08:00 +0000 (13:08 +0200)
commands/src/main/resources/OSGI-INF/blueprint/jclouds-commands.xml

index 244cfff..225c892 100644 (file)
@@ -14,12 +14,10 @@ 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.
 -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
-
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
-        <command name="jclouds/node-create">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.NodeCreateCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -37,7 +35,7 @@ limitations under the License.
                 <entry key="--recipe" value-ref="recipeCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/node-destroy">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.NodeDestroyCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -52,7 +50,7 @@ limitations under the License.
                 <entry key="--api" value-ref="computeApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/node-destroy-all">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.NodeDestroyAllCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -64,7 +62,7 @@ limitations under the License.
                 <entry key="--api" value-ref="computeApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/group-destroy">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.GroupDestroyCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -79,7 +77,7 @@ limitations under the License.
                 <entry key="--api" value-ref="computeApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/node-suspend">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.NodeSuspendCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -94,7 +92,7 @@ limitations under the License.
                 <entry key="--api" value-ref="computeApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/node-resume">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.NodeResumeCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -108,7 +106,7 @@ limitations under the License.
                 <entry key="--api" value-ref="computeApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/node-runscript">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.NodeRunScriptCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -124,7 +122,7 @@ limitations under the License.
                 <entry key="--api" value-ref="computeApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/node-info">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.NodeInfoCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -140,7 +138,7 @@ limitations under the License.
                 <entry key="--api" value-ref="computeApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/group-runscript">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.GroupRunScriptCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -151,7 +149,7 @@ limitations under the License.
                 <null/>
             </completers>
         </command>
-        <command name="jclouds/provider-info">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.ProviderInfoCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -163,14 +161,14 @@ limitations under the License.
                 <entry key="--api" value-ref="computeApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/compute-service-list">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.ComputeServiceListCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
                 <property name="shellTableFactory" ref="shellTableFactory"/>
             </action>
         </command>
-        <command name="jclouds/compute-service-create">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.ComputeServiceCreateCommand">
                 <property name="bundleContext" ref="blueprintBundleContext"/>
                 <property name="configAdmin" ref="configAdmin"/>
@@ -180,7 +178,7 @@ limitations under the License.
               <entry key="--api" value-ref="availableComputeApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/compute-service-destroy">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.ComputeServiceDestroyCommand">
                 <property name="configAdmin" ref="configAdmin"/>
             </action>
@@ -190,13 +188,13 @@ limitations under the License.
             </completers>
         </command>
 
-        <command name="jclouds/blobstore-service-list">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.BlobStoreServiceListCommand">
                 <property name="blobStoreServices" ref="blobStoreServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
             </action>
         </command>
-        <command name="jclouds/blobstore-service-create">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.BlobStoreServiceCreateCommand">
                 <property name="bundleContext" ref="blueprintBundleContext"/>
                 <property name="configAdmin" ref="configAdmin"/>
@@ -206,7 +204,7 @@ limitations under the License.
                 <entry key="--api" value-ref="availableBlobStoreApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/blobstore-service-destroy">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.BlobStoreServiceDestroyCommand">
                 <property name="configAdmin" ref="configAdmin"/>
             </action>
@@ -215,7 +213,7 @@ limitations under the License.
                 <null/>
             </completers>
         </command>
-        <command name="jclouds/node-list">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.NodeListCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -228,7 +226,7 @@ limitations under the License.
                 <entry key="--group" value-ref="groupCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/hardware-list">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.HardwareListCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -240,7 +238,7 @@ limitations under the License.
                 <entry key="--api" value-ref="computeApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/location-list">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.LocationListCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -252,7 +250,7 @@ limitations under the License.
                 <entry key="--api" value-ref="computeApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/image-list">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.ImageListCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -264,7 +262,7 @@ limitations under the License.
                 <entry key="--api" value-ref="computeApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/image-create">
+        <command>
             <action class="org.jclouds.karaf.commands.compute.ImageCreateCommand">
                 <property name="computeServices" ref="computeServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -280,7 +278,7 @@ limitations under the License.
                 <entry key="--api" value-ref="computeApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/blobstore-write">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.BlobWriteCommand">
                 <property name="blobStoreServices" ref="blobStoreServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -297,7 +295,7 @@ limitations under the License.
             </optional-completers>
         </command>
 
-        <command name="jclouds/blobstore-blob-exists">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.BlobExistsCommand">
                 <property name="blobStoreServices" ref="blobStoreServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -313,7 +311,7 @@ limitations under the License.
                 <entry key="--api" value-ref="blobStoreApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/blobstore-read">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.BlobReadCommand">
                 <property name="blobStoreServices" ref="blobStoreServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -329,7 +327,7 @@ limitations under the License.
                 <entry key="--api" value-ref="blobStoreApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/blobstore-list">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.BlobListCommand">
                 <property name="blobStoreServices" ref="blobStoreServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -340,7 +338,7 @@ limitations under the License.
                 <entry key="--api" value-ref="blobStoreApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/blobstore-metadata">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.BlobMetadataCommand">
                 <property name="blobStoreServices" ref="blobStoreServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -351,7 +349,7 @@ limitations under the License.
                 <entry key="--api" value-ref="blobStoreApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/blobstore-container-clear">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.ContainerClearCommand">
                 <property name="blobStoreServices" ref="blobStoreServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -365,7 +363,7 @@ limitations under the License.
                 <entry key="--api" value-ref="blobStoreApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/blobstore-container-list">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.ContainerListCommand">
                 <property name="blobStoreServices" ref="blobStoreServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -379,7 +377,7 @@ limitations under the License.
                 <entry key="--api" value-ref="blobStoreApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/blobstore-container-metadata">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.ContainerMetadataCommand">
                 <property name="blobStoreServices" ref="blobStoreServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -393,7 +391,7 @@ limitations under the License.
                 <entry key="--api" value-ref="blobStoreApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/blobstore-container-exists">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.ContainerExistsCommand">
                 <property name="blobStoreServices" ref="blobStoreServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -407,7 +405,7 @@ limitations under the License.
                 <entry key="--api" value-ref="blobStoreApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/blobstore-container-create">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.ContainerCreateCommand">
                 <property name="blobStoreServices" ref="blobStoreServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -419,7 +417,7 @@ limitations under the License.
                 <entry key="--location" value-ref="locationCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/blobstore-container-delete">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.ContainerDeleteCommand">
                 <property name="blobStoreServices" ref="blobStoreServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -433,7 +431,7 @@ limitations under the License.
                 <entry key="--api" value-ref="blobStoreApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/blobstore-location-list">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.LocationListCommand">
                 <property name="blobStoreServices" ref="blobStoreServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>
@@ -444,7 +442,7 @@ limitations under the License.
                 <entry key="--api" value-ref="blobStoreApiCompleter"/>
             </optional-completers>
         </command>
-        <command name="jclouds/blobstore-remove">
+        <command>
             <action class="org.jclouds.karaf.commands.blobstore.BlobRemoveCommand">
                 <property name="blobStoreServices" ref="blobStoreServices"/>
                 <property name="cacheProvider" ref="cacheProvider"/>