diff --git a/README.txt b/README.txt index d8ec6951a4..2bb3cce533 100644 --- a/README.txt +++ b/README.txt @@ -7,8 +7,8 @@ two abstractions at the moment: compute and blobstore. compute helps you bootstrap machines in the cloud. blobstore helps you manage key-value data. -our current version is 1.4.0 -our next maintenance version is 1.4.1-SNAPSHOT +our current version is 1.4.2 +our next maintenance version is 1.4.2-SNAPSHOT our dev version is 1.5.0-SNAPSHOT check out our examples site! https://github.com/jclouds/jclouds-examples @@ -23,7 +23,8 @@ our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory), de openhosting-east1, serverlove-z1-man, skalicloud-sdg-my, greenhousedata-element-vcloud, softlayer, cloudsigma (generic), cloudstack (generic), ninefold-compute, openstack-nov (keystone), - hpcloud-compute, trystack-nova, openstack-nova-ec2 + hpcloud-compute, trystack-nova, openstack-nova-ec2, + rackspace-cloudservers-us (next gen) * note * the pom dependency org.jclouds/jclouds-allcompute gives you access to to all of these providers diff --git a/allcompute/pom.xml b/allcompute/pom.xml index 907098cd2c..c36fd74dbb 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -210,5 +210,10 @@ trystack-nova ${project.version} + + org.jclouds.provider + rackspace-cloudservers-us + ${project.version} + diff --git a/labs/pom.xml b/labs/pom.xml index 134e85e7b0..878c602acf 100644 --- a/labs/pom.xml +++ b/labs/pom.xml @@ -48,7 +48,6 @@ joyent-sdc joyentcloud openstack-quantum - rackspace-cloudservers-us greenqloud-compute greenqloud-storage iam diff --git a/providers/pom.xml b/providers/pom.xml index 88c4d0c8ab..85723f0952 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -71,5 +71,6 @@ hpcloud-compute hpcloud-objectstorage trystack-nova + rackspace-cloudservers-us diff --git a/labs/rackspace-cloudservers-us/pom.xml b/providers/rackspace-cloudservers-us/pom.xml similarity index 99% rename from labs/rackspace-cloudservers-us/pom.xml rename to providers/rackspace-cloudservers-us/pom.xml index 1ae8a88e07..d6fedebe19 100644 --- a/labs/rackspace-cloudservers-us/pom.xml +++ b/providers/rackspace-cloudservers-us/pom.xml @@ -27,7 +27,7 @@ 1.5.0-SNAPSHOT ../../project/pom.xml - org.jclouds.labs + org.jclouds.provider rackspace-cloudservers-us jclouds Rackspace Next Generation Cloud Servers provider OpenStack Nova implementation targeted to Rackspace Next Generation Cloud Servers diff --git a/labs/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java similarity index 100% rename from labs/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java rename to providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java diff --git a/labs/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/config/CloudServersUSComputeServiceContextModule.java b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/config/CloudServersUSComputeServiceContextModule.java similarity index 100% rename from labs/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/config/CloudServersUSComputeServiceContextModule.java rename to providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/config/CloudServersUSComputeServiceContextModule.java diff --git a/labs/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata similarity index 100% rename from labs/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata rename to providers/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata diff --git a/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderTest.java b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderTest.java similarity index 100% rename from labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderTest.java rename to providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderTest.java diff --git a/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSComputeServiceLiveTest.java b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSComputeServiceLiveTest.java similarity index 100% rename from labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSComputeServiceLiveTest.java rename to providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSComputeServiceLiveTest.java diff --git a/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java similarity index 100% rename from labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java rename to providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java diff --git a/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/extensions/CloudServersUSImageExtensionLivetest.java b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/extensions/CloudServersUSImageExtensionLivetest.java similarity index 100% rename from labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/extensions/CloudServersUSImageExtensionLivetest.java rename to providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/extensions/CloudServersUSImageExtensionLivetest.java diff --git a/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSFlavorClientLiveTest.java b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSFlavorClientLiveTest.java similarity index 100% rename from labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSFlavorClientLiveTest.java rename to providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSFlavorClientLiveTest.java diff --git a/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSImageClientLiveTest.java b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSImageClientLiveTest.java similarity index 100% rename from labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSImageClientLiveTest.java rename to providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSImageClientLiveTest.java diff --git a/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSServerClientLiveTest.java b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSServerClientLiveTest.java similarity index 100% rename from labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSServerClientLiveTest.java rename to providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSServerClientLiveTest.java diff --git a/labs/rackspace-cloudservers-us/src/test/resources/raxImages.json b/providers/rackspace-cloudservers-us/src/test/resources/raxImages.json similarity index 100% rename from labs/rackspace-cloudservers-us/src/test/resources/raxImages.json rename to providers/rackspace-cloudservers-us/src/test/resources/raxImages.json