You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2017/05/11 11:55:39 UTC
[1/4] jclouds-karaf git commit: Add built time karaf feature
verification
Repository: jclouds-karaf
Updated Branches:
refs/heads/master 011e811c0 -> 15d2f9992
Add built time karaf feature verification
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/7e7f9cea
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/7e7f9cea
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/7e7f9cea
Branch: refs/heads/master
Commit: 7e7f9cea42068cac519abf6b03c27fdac35e990b
Parents: 011e811
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed May 10 09:45:01 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed May 10 09:49:58 2017 +0200
----------------------------------------------------------------------
feature-labs/pom.xml | 34 ++++++++++++++++++++++++++++++-
feature/pom.xml | 33 +++++++++++++++++++++++++++++-
feature/src/main/feature/feature.xml | 6 ++++--
3 files changed, 69 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/7e7f9cea/feature-labs/pom.xml
----------------------------------------------------------------------
diff --git a/feature-labs/pom.xml b/feature-labs/pom.xml
index fa2a66b..3d88eac 100644
--- a/feature-labs/pom.xml
+++ b/feature-labs/pom.xml
@@ -32,13 +32,45 @@ limitations under the License.
<packaging>feature</packaging>
<name>jclouds :: Karaf :: Feature Labs</name>
+ <properties>
+ <karaf.plugin.version>4.1.1</karaf.plugin.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${karaf.version}</version>
+ <type>kar</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.version}</version>
+ <version>${karaf.plugin.version}</version>
<extensions>true</extensions>
+ <configuration>
+ <descriptors>
+ <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+ <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
+ </descriptors>
+ <distribution>org.apache.karaf.features:framework</distribution>
+ <javase>1.8</javase>
+ <framework>
+ <feature>framework</feature>
+ <feature>shell-compat</feature>
+ </framework>
+ <features>
+ jclouds*
+ </features>
+ <verifyTransitive>false</verifyTransitive>
+ <enableGeneration>false</enableGeneration>
+ </configuration>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/7e7f9cea/feature/pom.xml
----------------------------------------------------------------------
diff --git a/feature/pom.xml b/feature/pom.xml
index 2265bab..1163554 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -29,6 +29,20 @@ limitations under the License.
<packaging>feature</packaging>
<name>jclouds :: Karaf :: Feature</name>
+ <properties>
+ <karaf.plugin.version>4.1.1</karaf.plugin.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${karaf.version}</version>
+ <type>kar</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<!-- Attaches config files referenced in feature.xml (mvn protocol) as artifacts -->
@@ -63,8 +77,25 @@ limitations under the License.
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.version}</version>
+ <version>${karaf.plugin.version}</version>
<extensions>true</extensions>
+ <configuration>
+ <descriptors>
+ <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+ <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
+ </descriptors>
+ <distribution>org.apache.karaf.features:framework</distribution>
+ <javase>1.8</javase>
+ <framework>
+ <feature>framework</feature>
+ <feature>shell-compat</feature>
+ </framework>
+ <features>
+ jclouds*
+ </features>
+ <enableGeneration>false</enableGeneration>
+ </configuration>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/7e7f9cea/feature/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/feature/feature.xml b/feature/src/main/feature/feature.xml
index ba24fd9..cedefa0 100644
--- a/feature/src/main/feature/feature.xml
+++ b/feature/src/main/feature/feature.xml
@@ -84,7 +84,7 @@ limitations under the License.
</feature>
<feature name='jclouds-loadbalancer' description='jclouds - loadbalancer' version='${project.version}'>
- <feature version='${project.version}'>jclouds</feature>
+ <feature version='${project.version}'>jclouds-compute</feature>
<bundle>mvn:org.apache.jclouds/jclouds-loadbalancer/${jclouds.version}</bundle>
</feature>
@@ -211,6 +211,7 @@ limitations under the License.
<feature version='${project.version}'>jclouds-compute</feature>
<feature version='${project.version}'>jclouds-loadbalancer</feature>
<feature version='${project.version}'>jclouds-api-openstack-keystone</feature>
+ <feature version='${project.version}'>jclouds-api-rackspace-cloudidentity</feature>
<bundle>mvn:org.apache.jclouds.api/rackspace-cloudloadbalancers/${jclouds.version}</bundle>
</feature>
@@ -596,8 +597,9 @@ limitations under the License.
<bundle>mvn:org.apache.jclouds.karaf.chef/commands/${project.version}</bundle>
</feature>
- <feature name="jclouds-url-handler" description="Url Handler for jclouds Blobs" version="${project.version}">
+ <feature name="jclouds-url-handler" description="Url Handler for jclouds Blobs" version="${project.version}">
<feature version='${project.version}'>jclouds</feature>
+ <feature version='${project.version}'>jclouds-services</feature>
<bundle>mvn:org.apache.jclouds.karaf/urlhandler/${project.version}</bundle>
</feature>
[2/4] jclouds-karaf git commit: Use Karaf 4.0.x plugin to preserve
JDK 7 compatibility. As the 4.0.x plugin does not have a way to disable the
feature generation, don't use the feature packaging,
but call all plugins explicitly.
Posted by na...@apache.org.
Use Karaf 4.0.x plugin to preserve JDK 7 compatibility.
As the 4.0.x plugin does not have a way to disable the feature generation, don't use the feature packaging, but call all plugins explicitly.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/1d96d88b
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/1d96d88b
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/1d96d88b
Branch: refs/heads/master
Commit: 1d96d88b672ed1755251580d0e21f0e00504ee5a
Parents: 7e7f9ce
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu May 11 08:25:50 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu May 11 08:27:49 2017 +0200
----------------------------------------------------------------------
feature-labs/pom.xml | 92 ++++++++----
feature-labs/src/main/feature/feature.xml | 2 +-
feature/pom.xml | 188 ++++++++++++++-----------
feature/src/main/feature/feature.xml | 6 +-
4 files changed, 179 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/1d96d88b/feature-labs/pom.xml
----------------------------------------------------------------------
diff --git a/feature-labs/pom.xml b/feature-labs/pom.xml
index 3d88eac..ae99655 100644
--- a/feature-labs/pom.xml
+++ b/feature-labs/pom.xml
@@ -29,13 +29,9 @@ limitations under the License.
<groupId>org.apache.jclouds.karaf</groupId>
<artifactId>jclouds-karaf-labs</artifactId>
- <packaging>feature</packaging>
+ <packaging>pom</packaging>
<name>jclouds :: Karaf :: Feature Labs</name>
- <properties>
- <karaf.plugin.version>4.1.1</karaf.plugin.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.karaf.features</groupId>
@@ -47,30 +43,76 @@ limitations under the License.
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/feature</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.build.directory}/feature</targetPath>
+ </resource>
+ </resources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>attach-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/feature/feature.xml</file>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.plugin.version}</version>
- <extensions>true</extensions>
- <configuration>
- <descriptors>
- <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
- <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
- <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
- </descriptors>
- <distribution>org.apache.karaf.features:framework</distribution>
- <javase>1.8</javase>
- <framework>
- <feature>framework</feature>
- <feature>shell-compat</feature>
- </framework>
- <features>
- jclouds*
- </features>
- <verifyTransitive>false</verifyTransitive>
- <enableGeneration>false</enableGeneration>
- </configuration>
+ <version>${karaf.version}</version>
+ <executions>
+ <execution>
+ <id>verify</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+ <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
+ </descriptors>
+ <distribution>org.apache.karaf.features:framework</distribution>
+ <javase>1.7</javase>
+ <framework>
+ <feature>framework</feature>
+ </framework>
+ <features>
+ <feature>jclouds*</feature>
+ </features>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/1d96d88b/feature-labs/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/feature-labs/src/main/feature/feature.xml b/feature-labs/src/main/feature/feature.xml
index 346e00a..e78d927 100644
--- a/feature-labs/src/main/feature/feature.xml
+++ b/feature-labs/src/main/feature/feature.xml
@@ -15,7 +15,7 @@ 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.
-->
-<features name="jclouds-labs-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
+<features name="jclouds-labs-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0">
<repository>mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds.version}/xml/features</repository>
<feature name='jclouds-labs-all-blobstore' description='jclouds-labs - all - macro feature to bundle all blobstores' version='${project.version}'>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/1d96d88b/feature/pom.xml
----------------------------------------------------------------------
diff --git a/feature/pom.xml b/feature/pom.xml
index 1163554..7c30988 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -15,88 +15,114 @@ 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.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>jclouds-karaf</artifactId>
- <groupId>org.apache.jclouds</groupId>
- <version>2.1.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.jclouds.karaf</groupId>
- <artifactId>jclouds-karaf</artifactId>
- <packaging>feature</packaging>
- <name>jclouds :: Karaf :: Feature</name>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>jclouds-karaf</artifactId>
+ <groupId>org.apache.jclouds</groupId>
+ <version>2.1.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
- <properties>
- <karaf.plugin.version>4.1.1</karaf.plugin.version>
- </properties>
+ <groupId>org.apache.jclouds.karaf</groupId>
+ <artifactId>jclouds-karaf</artifactId>
+ <packaging>pom</packaging>
+ <name>jclouds :: Karaf :: Feature</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>framework</artifactId>
- <version>${karaf.version}</version>
- <type>kar</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${karaf.version}</version>
+ <type>kar</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <!-- Attaches config files referenced in feature.xml (mvn protocol) as artifacts -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin.version}</version>
- <executions>
- <execution>
- <id>attach-feature-config</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>src/main/resources/credentials.cfg</file>
- <type>cfg</type>
- <classifier>credentials</classifier>
- </artifact>
- <artifact>
- <file>src/main/resources/shell.cfg</file>
- <type>cfg</type>
- <classifier>shell</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.plugin.version}</version>
- <extensions>true</extensions>
- <configuration>
- <descriptors>
- <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
- <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
- <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
- </descriptors>
- <distribution>org.apache.karaf.features:framework</distribution>
- <javase>1.8</javase>
- <framework>
- <feature>framework</feature>
- <feature>shell-compat</feature>
- </framework>
- <features>
- jclouds*
- </features>
- <enableGeneration>false</enableGeneration>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/feature</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.build.directory}/feature</targetPath>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Attaches config files referenced in feature.xml (mvn protocol) as artifacts -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>attach-feature-config</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>src/main/resources/credentials.cfg</file>
+ <type>cfg</type>
+ <classifier>credentials</classifier>
+ </artifact>
+ <artifact>
+ <file>src/main/resources/shell.cfg</file>
+ <type>cfg</type>
+ <classifier>shell</classifier>
+ </artifact>
+ <artifact>
+ <file>target/feature/feature.xml</file>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>${karaf.version}</version>
+ <executions>
+ <execution>
+ <id>verify</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+ <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
+ </descriptors>
+ <distribution>org.apache.karaf.features:framework</distribution>
+ <javase>1.7</javase>
+ <framework>
+ <feature>framework</feature>
+ </framework>
+ <features>
+ <feature>jclouds*</feature>
+ </features>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/1d96d88b/feature/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/feature/feature.xml b/feature/src/main/feature/feature.xml
index cedefa0..6dc2050 100644
--- a/feature/src/main/feature/feature.xml
+++ b/feature/src/main/feature/feature.xml
@@ -15,7 +15,7 @@ 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.
-->
-<features name="jclouds-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
+<features name="jclouds-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0">
<feature name='jclouds-all-blobstore' description='jclouds - all - macro feature to bundle all blobstores' version='${project.version}'>
<feature version='${project.version}'>jclouds-api-s3</feature>
@@ -558,6 +558,7 @@ limitations under the License.
<!-- SERVICES -->
<feature name="jclouds-services" description="OSGi Service Factories for jclouds" version="${project.version}">
<configfile finalname="${karaf.etc}/org.apache.jclouds.credentials.cfg">mvn:org.apache.jclouds.karaf/jclouds-karaf/${project.version}/cfg/credentials</configfile>
+ <feature>aries-blueprint</feature>
<feature version='${project.version}'>jclouds-compute</feature>
<feature version='${project.version}'>jclouds-blobstore</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch.bundle.version}</bundle>
@@ -580,6 +581,7 @@ limitations under the License.
<feature name="jclouds-commands" description="Karaf Commands for jclouds" version="${project.version}">
<configfile finalname="/etc/org.apache.jclouds.shell.cfg">mvn:org.apache.jclouds.karaf/jclouds-karaf/${project.version}/cfg/shell</configfile>
+ <feature>shell-compat</feature>
<feature version='${project.version}'>jclouds-services</feature>
<bundle dependency="true">mvn:org.codehaus.groovy/groovy/${groovy.version}</bundle>
<bundle dependency="true">mvn:org.codehaus.groovy/groovy-jsr223/${groovy.version}</bundle>
@@ -598,7 +600,7 @@ limitations under the License.
</feature>
<feature name="jclouds-url-handler" description="Url Handler for jclouds Blobs" version="${project.version}">
- <feature version='${project.version}'>jclouds</feature>
+ <feature>aries-blueprint</feature>
<feature version='${project.version}'>jclouds-services</feature>
<bundle>mvn:org.apache.jclouds.karaf/urlhandler/${project.version}</bundle>
</feature>
[3/4] jclouds-karaf git commit: Remove the integration tests for
feature installation as they are now verified by the karaf plugin
Posted by na...@apache.org.
Remove the integration tests for feature installation as they are now verified by the karaf plugin
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/18f0d03c
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/18f0d03c
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/18f0d03c
Branch: refs/heads/master
Commit: 18f0d03c4e18a7e4ef102d99fe1d4cb0d3857e16
Parents: 1d96d88
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu May 11 08:39:07 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu May 11 08:39:07 2017 +0200
----------------------------------------------------------------------
.../karaf/itests/FeatureInstallationTest.java | 425 -------------------
.../itests/FeatureLabsInstallationTest.java | 112 -----
2 files changed, 537 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/18f0d03c/itests/src/test/java/org/jclouds/karaf/itests/FeatureInstallationTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/FeatureInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/FeatureInstallationTest.java
deleted file mode 100644
index e057264..0000000
--- a/itests/src/test/java/org/jclouds/karaf/itests/FeatureInstallationTest.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * 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.
- */
-package org.jclouds.karaf.itests;
-
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureSecurity;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFileExtend;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
-
-import java.io.File;
-
-import javax.inject.Inject;
-
-import org.apache.karaf.features.FeaturesService;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption;
-import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
-public class FeatureInstallationTest extends BasePaxExamTest {
-
- @Inject
- FeaturesService featuresService;
-
- @Before
- public void setUp() throws Exception {
- featuresService.addRepository(getFeaturesFile("features.xml").toURI());
- }
-
- @Test
- public void testJcloudsFeature() throws Exception {
- featuresService.installFeature("jclouds");
- }
-
- @Test
- public void testJcloudsComputeFeature() throws Exception {
- featuresService.installFeature("jclouds-compute");
- }
-
- @Test
- public void testJcloudsBlobstoreFeature() throws Exception {
- featuresService.installFeature("jclouds-blobstore");
- }
-
- @Test
- public void testJcloudsAllBlobstoreFeature() throws Exception {
- featuresService.installFeature("jclouds-all-blobstore");
- }
-
- @Test
- public void testJcloudsAllComputeFeature() throws Exception {
- featuresService.installFeature("jclouds-all-compute");
- }
-
- // Drivers
- @Test
- public void testDriverApachehcFeature() throws Exception {
- featuresService.installFeature("jclouds-driver-apachehc");
- }
-
- @Test
- public void testDriverBouncycastleFeature() throws Exception {
- featuresService.installFeature("jclouds-driver-bouncycastle");
- }
-
- @Test
- public void testDriverEnterpriseFeature() throws Exception {
- featuresService.installFeature("jclouds-driver-enterprise");
- }
-
- @Test
- public void testDriverJodaFeature() throws Exception {
- featuresService.installFeature("jclouds-driver-joda");
- }
-
- @Test
- public void testDriverJschFeature() throws Exception {
- featuresService.installFeature("jclouds-driver-jsch");
- }
-
- @Test
- public void testDriverLog4jFeature() throws Exception {
- featuresService.installFeature("jclouds-driver-log4j");
- }
-
- @Test
- public void testDriverNettyClientFeature() throws Exception {
- featuresService.installFeature("jclouds-driver-netty");
- }
-
- @Test
- public void testDriverOkHttpClientFeature() throws Exception {
- featuresService.installFeature("jclouds-driver-okhttp");
- }
-
- @Test
- public void testDriverSlf4jFeature() throws Exception {
- featuresService.installFeature("jclouds-driver-slf4j");
- }
-
- @Test
- public void testDriverSshjFeature() throws Exception {
- featuresService.installFeature("jclouds-driver-sshj");
- }
-
- // SCRIPTBUILDER
- @Test
- public void testJcloudsScriptbuilderFeature() throws Exception {
- featuresService.installFeature("jclouds-scriptbuilder");
- }
-
- // APIS
- @Test
- public void testApiAtmosCoreFeature() throws Exception {
- featuresService.installFeature("jclouds-api-atmos");
- }
-
- @Test
- public void testApiByonFeature() throws Exception {
- featuresService.installFeature("jclouds-api-byon");
- }
-
- @Test
- public void testApiCloudstackFeature() throws Exception {
- featuresService.installFeature("jclouds-api-cloudstack");
- }
-
- @Test
- public void testApiCloudwatchFeature() throws Exception {
- featuresService.installFeature("jclouds-api-cloudwatch");
- }
-
- @Test
- public void testApiDockerFeature() throws Exception {
- featuresService.installFeature("jclouds-api-docker");
- }
-
- @Test
- public void testApiElasticStackFeature() throws Exception {
- featuresService.installFeature("jclouds-api-elasticstack");
- }
-
- @Test
- public void testApiFileSystemFeature() throws Exception {
- featuresService.installFeature("jclouds-api-filesystem");
- }
-
- @Test
- public void testApiOauthFeature() throws Exception {
- featuresService.installFeature("jclouds-api-oauth");
- }
-
- @Test
- public void testApiOpenstackCinderFeature() throws Exception {
- featuresService.installFeature("jclouds-api-openstack-cinder");
- }
-
- @Test
- public void testApiOpenstackKeystoneFeature() throws Exception {
- featuresService.installFeature("jclouds-api-openstack-keystone");
- }
-
- @Test
- public void testApiOpenstackNovaFeature() throws Exception {
- featuresService.installFeature("jclouds-api-openstack-nova");
- }
-
- @Test
- public void testApiOpenstackNovaEc2Feature() throws Exception {
- featuresService.installFeature("jclouds-api-openstack-nova-ec2");
- }
-
- @Test
- public void testApiOpenstackSwiftFeature() throws Exception {
- featuresService.installFeature("jclouds-api-openstack-swift");
- }
-
- @Test
- public void testApiOpenstackTroveFeature() throws Exception {
- featuresService.installFeature("jclouds-api-openstack-trove");
- }
-
- @Test
- public void testApiRackspaceCloudDnsFeature() throws Exception {
- featuresService.installFeature("jclouds-api-rackspace-clouddns");
- }
-
- @Test
- public void testApiRackspaceCloudFilesFeature() throws Exception {
- featuresService.installFeature("jclouds-api-rackspace-cloudfiles");
- }
-
- @Test
- public void testApiRackspaceCloudIdentityFeature() throws Exception {
- featuresService.installFeature("jclouds-api-rackspace-cloudidentity");
- }
-
- @Test
- public void testApiRackspaceCloudLoadbalancersFeature() throws Exception {
- featuresService.installFeature("jclouds-rackspace-cloudloadbalancers-us");
- }
-
- @Test
- public void testStsFeature() throws Exception {
- featuresService.installFeature("jclouds-api-sts");
- }
-
- // PROVIDERS
- @Test
- public void testAwsCloudwatchFeature() throws Exception {
- featuresService.installFeature("jclouds-aws-cloudwatch");
- }
-
- @Test
- public void testAwsEc2Feature() throws Exception {
- featuresService.installFeature("jclouds-aws-ec2");
- }
-
- @Test
- public void testAwsRoute53Feature() throws Exception {
- featuresService.installFeature("jclouds-aws-route53");
- }
-
- @Test
- public void testAwsS3Feature() throws Exception {
- featuresService.installFeature("jclouds-aws-s3");
- }
-
- @Test
- public void testAwsSqsFeature() throws Exception {
- featuresService.installFeature("jclouds-aws-sqs");
- }
-
- @Test
- public void testAwsStsFeature() throws Exception {
- featuresService.installFeature("jclouds-aws-sts");
- }
-
- @Test
- public void testAzureBlobFeature() throws Exception {
- featuresService.installFeature("jclouds-azureblob");
- }
-
- @Test
- public void testB2Feature() throws Exception {
- featuresService.installFeature("jclouds-b2");
- }
-
- @Test
- public void testDigitalOcean2Feature() throws Exception {
- featuresService.installFeature("jclouds-digitalocean2");
- }
-
- @Test
- public void testDynectFeature() throws Exception {
- featuresService.installFeature("jclouds-dynect");
- }
-
- @Test
- public void testElasticaHostsLonBFeature() throws Exception {
- featuresService.installFeature("jclouds-elastichosts-lon-b");
- }
-
- @Test
- public void testElasticaHostsLonPFeature() throws Exception {
- featuresService.installFeature("jclouds-elastichosts-lon-p");
- }
-
- @Test
- public void testElasticaHostsSatPtestStsFeature() throws Exception {
- featuresService.installFeature("jclouds-elastichosts-sat-p");
- }
-
- @Test
- public void testElasticaHostsLaxPFeature() throws Exception {
- featuresService.installFeature("jclouds-elastichosts-lax-p");
- }
-
- @Test
- public void testElasticaHostsTorPFeature() throws Exception {
- featuresService.installFeature("jclouds-elastichosts-tor-p");
- }
-
- @Test
- public void testGlesysFeature() throws Exception {
- featuresService.installFeature("jclouds-glesys");
- }
-
- @Test
- public void testGo2cloudJhb1Feature() throws Exception {
- featuresService.installFeature("jclouds-go2cloud-jhb1");
- }
-
- @Test
- public void testGogridFeature() throws Exception {
- featuresService.installFeature("jclouds-gogrid");
- }
-
- @Test
- public void testGoogleCloudStorageFeature() throws Exception {
- featuresService.installFeature("jclouds-google-cloud-storage");
- }
-
- @Test
- public void testGoogleComputeEngineFeature() throws Exception {
- featuresService.installFeature("jclouds-google-compute-engine");
- }
-
- @Test
- public void testOpenhostingEast1Feature() throws Exception {
- featuresService.installFeature("jclouds-openhosting-east1");
- }
-
- @Test
- public void testProfitbricksFeature() throws Exception {
- featuresService.installFeature("jclouds-profitbricks");
- }
-
- @Test
- public void testRackaspaceCloudstorageUkFeature() throws Exception {
- featuresService.installFeature("jclouds-rackspace-cloudblockstorage-uk");
- }
-
- @Test
- public void testRackaspaceCloudstorageUsFeature() throws Exception {
- featuresService.installFeature("jclouds-rackspace-cloudblockstorage-us");
- }
-
- @Test
- public void testRackaspaceCloudloadbalancerUsFeature() throws Exception {
- featuresService.installFeature("jclouds-rackspace-cloudloadbalancers-us");
- }
-
- @Test
- public void testRackaspaceCloudloadbalancerUkFeature() throws Exception {
- featuresService.installFeature("jclouds-rackspace-cloudloadbalancers-uk");
- }
-
- @Test
- public void testRackaspaceCloudserversUsFeature() throws Exception {
- featuresService.installFeature("jclouds-rackspace-cloudservers-us");
- }
-
- @Test
- public void testRackaspaceCloudserversUkFeature() throws Exception {
- featuresService.installFeature("jclouds-rackspace-cloudservers-uk");
- }
-
- @Test
- public void testRackaspaceCloudDnsUsFeature() throws Exception {
- featuresService.installFeature("jclouds-rackspace-clouddns-us");
- }
-
- @Test
- public void testRackaspaceCloudDnsUkFeature() throws Exception {
- featuresService.installFeature("jclouds-rackspace-clouddns-uk");
- }
-
- @Test
- public void testRackaspaceCloudfilesUkFeature() throws Exception {
- featuresService.installFeature("jclouds-rackspace-cloudfiles-uk");
- }
-
- @Test
- public void testRackaspaceCloudfilesUsFeature() throws Exception {
- featuresService.installFeature("jclouds-rackspace-cloudfiles-us");
- }
-
- @Test
- public void testServerloveZ1ManFeature() throws Exception {
- featuresService.installFeature("jclouds-serverlove-z1-man");
- }
-
- @Test
- public void testSkalicloudSdgMyFeature() throws Exception {
- featuresService.installFeature("jclouds-skalicloud-sdg-my");
- }
-
- @Test
- public void testSoftlayerFeature() throws Exception {
- featuresService.installFeature("jclouds-softlayer");
- }
-
-
- @Configuration
- public Option[] config() {
- MavenArtifactUrlReference karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf-minimal").versionAsInProject().type("tar.gz");
- return new Option[]{
- karafDistributionConfiguration().frameworkUrl(karafUrl).name("Apache Karaf").unpackDirectory(new File("target/exam")),
- configureSecurity().disableKarafMBeanServerBuilder(),
- keepRuntimeFolder(),
- editConfigurationFilePut("etc/system.properties", "features.xml", System.getProperty("features.xml")),
- editConfigurationFileExtend(
- "etc/org.ops4j.pax.url.mvn.cfg",
- "org.ops4j.pax.url.mvn.repositories",
- "file:" + System.getProperty("features-repo") + "@id=local@snapshots@releases"),
- logLevel(LogLevelOption.LogLevel.INFO),
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/18f0d03c/itests/src/test/java/org/jclouds/karaf/itests/FeatureLabsInstallationTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/FeatureLabsInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/FeatureLabsInstallationTest.java
deleted file mode 100644
index efe0c74..0000000
--- a/itests/src/test/java/org/jclouds/karaf/itests/FeatureLabsInstallationTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * 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.
- */
-package org.jclouds.karaf.itests;
-
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureSecurity;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFileExtend;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
-
-import java.io.File;
-
-import javax.inject.Inject;
-
-import org.apache.karaf.features.FeaturesService;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption;
-import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
-public class FeatureLabsInstallationTest extends BasePaxExamTest {
-
- @Inject
- FeaturesService featuresService;
-
- @Before
- public void setUp() throws Exception {
- featuresService.addRepository(getFeaturesFile("features-labs.xml").toURI());
- }
-
- @Test
- public void testLabsAzureComputeArmFeature() throws Exception {
- featuresService.installFeature("jclouds-azurecompute-arm");
- }
-
- @Test
- public void testLabsCloudsigma2HnlFeature() throws Exception {
- featuresService.installFeature("jclouds-cloudsigma2-hnl");
- }
-
- @Test
- public void testLabsCloudsigma2LvsFeature() throws Exception {
- featuresService.installFeature("jclouds-cloudsigma2-lvs");
- }
-
- @Test
- public void testLabsCloudsigma2SjcFeature() throws Exception {
- featuresService.installFeature("jclouds-cloudsigma2-sjc");
- }
-
- @Test
- public void testLabsCloudsigma2WdcFeature() throws Exception {
- featuresService.installFeature("jclouds-cloudsigma2-wdc");
- }
-
- @Test
- public void testLabsCloudsigma2ZrhFeature() throws Exception {
- featuresService.installFeature("jclouds-cloudsigma2-zrh");
- }
-
- @Test
- public void testLabsPacketFeature() throws Exception {
- featuresService.installFeature("jclouds-packet");
- }
-
- @Test
- public void testLabsVagrantFeature() throws Exception {
- featuresService.installFeature("jclouds-vagrant");
- }
-
-
- @Configuration
- public Option[] config() {
- MavenArtifactUrlReference karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf-minimal").versionAsInProject().type("tar.gz");
- return new Option[]{
- karafDistributionConfiguration().frameworkUrl(karafUrl).name("Apache Karaf").unpackDirectory(new File("target/exam")),
- configureSecurity().disableKarafMBeanServerBuilder(),
- keepRuntimeFolder(),
- editConfigurationFilePut("etc/system.properties", "features-labs.xml", System.getProperty("features-labs.xml")),
- editConfigurationFileExtend(
- "etc/org.ops4j.pax.url.mvn.cfg",
- "org.ops4j.pax.url.mvn.repositories",
- "file:" + System.getProperty("features-repo") + "@id=local@snapshots@releases"),
- logLevel(LogLevelOption.LogLevel.INFO),
- };
- }
-
-}
[4/4] jclouds-karaf git commit: Fix karaf commands
Posted by na...@apache.org.
Fix karaf commands
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/15d2f999
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/15d2f999
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/15d2f999
Branch: refs/heads/master
Commit: 15d2f9992a98d7712dc420825206bab01b55d20f
Parents: 18f0d03
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu May 11 13:08:00 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu May 11 13:08:00 2017 +0200
----------------------------------------------------------------------
.../OSGI-INF/blueprint/jclouds-commands.xml | 72 ++++++++++----------
1 file changed, 35 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/15d2f999/commands/src/main/resources/OSGI-INF/blueprint/jclouds-commands.xml
----------------------------------------------------------------------
diff --git a/commands/src/main/resources/OSGI-INF/blueprint/jclouds-commands.xml b/commands/src/main/resources/OSGI-INF/blueprint/jclouds-commands.xml
index 244cfff..225c892 100644
--- a/commands/src/main/resources/OSGI-INF/blueprint/jclouds-commands.xml
+++ b/commands/src/main/resources/OSGI-INF/blueprint/jclouds-commands.xml
@@ -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"/>