Catching up with provider removal in jclouds core * bluelock-vcloud-zone01 (7e04f62) * greenhousedata-element-vcloud (0acc61b) * JCLOUDS-735: ninefold-storage (1d95d29) and ninefold-compute (1d95d29)
Also adding cloudstack as a feature explicitly since it's no longer transitively included via ninefold-compute Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/75040ea6 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/75040ea6 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/75040ea6 Branch: refs/heads/rem-cloudsigma Commit: 75040ea6eadd73010960614ca3c6c82bbadc2dc7 Parents: c8e5a38 Author: Andrew Phillips <[email protected]> Authored: Fri Oct 10 14:53:28 2014 -0400 Committer: Andrew Phillips <[email protected]> Committed: Sun Oct 12 14:48:55 2014 -0400 ---------------------------------------------------------------------- feature/pom.xml | 13 ++++------ feature/src/main/resources/feature.xml | 26 -------------------- .../itests/MiscFeaturesInstallationTest.java | 16 ------------ 3 files changed, 5 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/75040ea6/feature/pom.xml ---------------------------------------------------------------------- diff --git a/feature/pom.xml b/feature/pom.xml index 87fc443..f61eb66 100644 --- a/feature/pom.xml +++ b/feature/pom.xml @@ -109,14 +109,15 @@ limitations under the License. <feature>jclouds-blobstore</feature> <feature>jclouds-compute</feature> <feature>jclouds-management</feature> - <feature>jclouds-api-filesystem</feature> - <feature>jclouds-api-elasticstack</feature> - <feature>jclouds-api-vcloud</feature> <feature>jclouds-api-byon</feature> - <feature>jclouds-api-swift</feature> + <feature>jclouds-api-cloudstack</feature> + <feature>jclouds-api-elasticstack</feature> + <feature>jclouds-api-filesystem</feature> <feature>jclouds-api-openstack-nova</feature> <feature>jclouds-api-openstack-keystone</feature> <feature>jclouds-api-openstack-cinder</feature> + <feature>jclouds-api-swift</feature> + <feature>jclouds-api-vcloud</feature> <feature>jclouds-aws-cloudwatch</feature> <feature>jclouds-aws-ec2</feature> <feature>jclouds-aws-route53</feature> @@ -124,7 +125,6 @@ limitations under the License. <feature>jclouds-aws-sqs</feature> <feature>jclouds-aws-sts</feature> <feature>jclouds-azureblob</feature> - <feature>jclouds-bluelock-vcloud-zone01</feature> <feature>jclouds-cloudfiles-uk</feature> <feature>jclouds-cloudfiles-us</feature> <feature>jclouds-dynect</feature> @@ -145,12 +145,9 @@ limitations under the License. <feature>jclouds-elastichosts-tor-p</feature> <feature>jclouds-gogrid</feature> <feature>jclouds-go2cloud-jhb1</feature> - <feature>jclouds-greenhousedata-element-vcloud</feature> <feature>jclouds-glesys</feature> <feature>jclouds-hpcloud-objectstorage</feature> <feature>jclouds-hpcloud-compute</feature> - <feature>jclouds-ninefold-storage</feature> - <feature>jclouds-ninefold-compute</feature> <feature>jclouds-openhosting-east1</feature> <feature>jclouds-serverlove-z1-man</feature> <feature>jclouds-skalicloud-sdg-my</feature> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/75040ea6/feature/src/main/resources/feature.xml ---------------------------------------------------------------------- diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml index 53581f4..b2aa58b 100644 --- a/feature/src/main/resources/feature.xml +++ b/feature/src/main/resources/feature.xml @@ -202,14 +202,6 @@ limitations under the License. <bundle>mvn:org.apache.jclouds.provider/azureblob/${jclouds.version}</bundle> </feature> - <feature name='jclouds-bluelock-vcloud-zone01' description='vCloud implementation targeted to Bluelock vCloud Zone01' version='${project.version}' resolver='(obr)'> - <feature version='${project.version}'>jclouds-api-vcloud</feature> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-xmlbuilder/${java-xmlbuilder.bundle.version}</bundle> - <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-compute/${jclouds.version}</bundle> - <bundle dependency='true'>mvn:org.apache.jclouds/jclouds-scriptbuilder/${jclouds.version}</bundle> - <bundle>mvn:org.apache.jclouds.provider/bluelock-vcloud-zone01/${jclouds.version}</bundle> - </feature> - <feature name='jclouds-cloudfiles-uk' description='Cloudfiles UK' version='${project.version}' resolver='(obr)'> <feature version='${project.version}'>jclouds-api-swift</feature> <bundle dependency='true'>mvn:org.apache.jclouds.api/cloudfiles/${jclouds.version}</bundle> @@ -346,12 +338,6 @@ limitations under the License. <bundle>mvn:org.apache.jclouds.provider/go2cloud-jhb1/${jclouds.version}</bundle> </feature> - <feature name='jclouds-greenhousedata-element-vcloud' description='Green House Data Element vCloud' version='${project.version}' resolver='(obr)'> - <feature version='${project.version}'>jclouds-api-vcloud</feature> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-xmlbuilder/${java-xmlbuilder.bundle.version}</bundle> - <bundle>mvn:org.apache.jclouds.provider/greenhousedata-element-vcloud/${jclouds.version}</bundle> - </feature> - <feature name='jclouds-glesys' description='GleSYS' version='${project.version}' resolver='(obr)'> <feature version='${project.version}'>jclouds-compute</feature> <bundle>mvn:org.apache.jclouds.provider/glesys/${jclouds.version}</bundle> @@ -367,18 +353,6 @@ limitations under the License. <bundle>mvn:org.apache.jclouds.provider/hpcloud-compute/${jclouds.version}</bundle> </feature> - <feature name='jclouds-ninefold-storage' description='Ninefold Storage' version='${project.version}' resolver='(obr)'> - <feature version='${project.version}'>jclouds-blobstore</feature> - <bundle dependency='true'>mvn:org.apache.jclouds.api/atmos/${jclouds.version}</bundle> - <bundle>mvn:org.apache.jclouds.provider/ninefold-storage/${jclouds.version}</bundle> - </feature> - - <feature name='jclouds-ninefold-compute' description='Ninefold Compute' version='${project.version}' resolver='(obr)'> - <feature version='${project.version}'>jclouds-compute</feature> - <bundle dependency='true'>mvn:org.apache.jclouds.api/cloudstack/${jclouds.version}</bundle> - <bundle>mvn:org.apache.jclouds.provider/ninefold-compute/${jclouds.version}</bundle> - </feature> - <feature name='jclouds-openhosting-east1' description='Open Hosting for East1' version='${project.version}' resolver='(obr)'> <feature version='${project.version}'>jclouds-compute</feature> <bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/75040ea6/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java index 6e6f53a..711d61e 100644 --- a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java +++ b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java @@ -50,11 +50,6 @@ public class MiscFeaturesInstallationTest extends JcloudsFeaturesTestSupport { } @Test - public void testBlueLockFeature() throws Exception { - installAndCheckFeature("jclouds-bluelock-vcloud-zone01"); - } - - @Test public void testGoGridFeature() throws Exception { installAndCheckFeature("jclouds-gogrid"); } @@ -64,17 +59,6 @@ public class MiscFeaturesInstallationTest extends JcloudsFeaturesTestSupport { installAndCheckFeature("jclouds-go2cloud-jhb1"); } - - @Test - public void testGreenHouseDataFeature() throws Exception { - installAndCheckFeature("jclouds-greenhousedata-element-vcloud"); - } - - @Test - public void testNineFoldStorageFeature() throws Exception { - installAndCheckFeature("jclouds-ninefold-storage"); - } - @Test public void testOpenHostingEast1Feature() throws Exception { installAndCheckFeature("jclouds-openhosting-east1");
