diff --git a/labs/cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/labs/cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 82996dbf10..0000000000 --- a/labs/cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.cloudidentity.v2_0.CloudIdentityApiMetadata diff --git a/labs/cloudservers-nova-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/labs/cloudservers-nova-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 720076428f..0000000000 --- a/labs/cloudservers-nova-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.cloudservers_nova.us.CloudServersUSProviderMetadata diff --git a/labs/pom.xml b/labs/pom.xml index fae08004c5..2c45d37396 100644 --- a/labs/pom.xml +++ b/labs/pom.xml @@ -47,7 +47,7 @@ openstack-glance joyent-sdc openstack-quantum - cloudidentity - cloudservers-nova-us + rackspace-cloudidentity + rackspace-cloudservers-us diff --git a/labs/cloudidentity/pom.xml b/labs/rackspace-cloudidentity/pom.xml similarity index 71% rename from labs/cloudidentity/pom.xml rename to labs/rackspace-cloudidentity/pom.xml index ec218143c2..bac165394f 100644 --- a/labs/cloudidentity/pom.xml +++ b/labs/rackspace-cloudidentity/pom.xml @@ -28,22 +28,22 @@ ../../project/pom.xml org.jclouds.labs - cloudidentity - jcloud cloudidentity api + rackspace-cloudidentity + jcloud rackspace cloudidentity api jclouds components to access an implementation of Rackspace Cloud Identity bundle - https://identity.api.rackspacecloud.com + https://identity.api.rackspacecloud.com - 2.0 - - 413274:${test.rackspace-us.identity} - ${test.rackspace-us.credential} + 2.0 + + 413274:${test.rackspace-us.identity} + ${test.rackspace-us.credential} RAX-KSKEY:apiKeyCredentials - org.jclouds.cloudidentity.v2_0*;version="${project.version}" + org.jclouds.rackspace.cloudidentity.v2_0*;version="${project.version}" org.jclouds.rest.internal;version="${project.version}", org.jclouds*;version="${project.version}", @@ -102,11 +102,11 @@ - ${test.cloudidentity.endpoint} - ${test.cloudidentity.api-version} - ${test.cloudidentity.build-version} - ${test.cloudidentity.identity} - ${test.cloudidentity.credential} + ${test.rackspace-cloudidentity.endpoint} + ${test.rackspace-cloudidentity.api-version} + ${test.rackspace-cloudidentity.build-version} + ${test.rackspace-cloudidentity.identity} + ${test.rackspace-cloudidentity.credential} ${test.jclouds.keystone.credential-type} diff --git a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/CloudIdentityApiMetadata.java b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java similarity index 92% rename from labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/CloudIdentityApiMetadata.java rename to labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java index 4a22b27a55..c0e5a32b9e 100644 --- a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/CloudIdentityApiMetadata.java +++ b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java @@ -1,4 +1,4 @@ -package org.jclouds.cloudidentity.v2_0; +package org.jclouds.rackspace.cloudidentity.v2_0; /** * Licensed to jclouds, Inc. (jclouds) under one or more * contributor license agreements. See the NOTICE file @@ -25,11 +25,11 @@ import java.net.URI; import java.util.Properties; import org.jclouds.apis.ApiMetadata; -import org.jclouds.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; -import org.jclouds.cloudidentity.v2_0.config.CloudIdentityRestClientModule; import org.jclouds.openstack.keystone.v2_0.KeystoneApiMetadata; import org.jclouds.openstack.keystone.v2_0.KeystoneAsyncClient; import org.jclouds.openstack.keystone.v2_0.KeystoneClient; +import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; +import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityRestClientModule; import org.jclouds.rest.RestContext; import com.google.common.collect.ImmutableSet; @@ -77,7 +77,7 @@ public class CloudIdentityApiMetadata extends KeystoneApiMetadata { public static class Builder extends KeystoneApiMetadata.Builder { protected Builder(){ super(KeystoneClient.class, KeystoneAsyncClient.class); - id("cloudidentity") + id("rackspace-cloudidentity") .name("Rackspace Cloud Identity Service") .defaultEndpoint("https://identity.api.rackspacecloud.com") .identityName("username") diff --git a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/CloudIdentityAuthenticationAsyncClient.java b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationAsyncClient.java similarity index 95% rename from labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/CloudIdentityAuthenticationAsyncClient.java rename to labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationAsyncClient.java index 4215daa977..9871911062 100644 --- a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/CloudIdentityAuthenticationAsyncClient.java +++ b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationAsyncClient.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudidentity.v2_0; +package org.jclouds.rackspace.cloudidentity.v2_0; import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.core.MediaType; -import org.jclouds.cloudidentity.v2_0.domain.ApiKeyCredentials; import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.keystone.v2_0.AuthenticationAsyncClient; import org.jclouds.openstack.keystone.v2_0.binders.BindAuthToJsonPayload; import org.jclouds.openstack.keystone.v2_0.domain.Access; +import org.jclouds.rackspace.cloudidentity.v2_0.domain.ApiKeyCredentials; import org.jclouds.rest.annotations.MapBinder; import org.jclouds.rest.annotations.PayloadParam; import org.jclouds.rest.annotations.SelectJson; diff --git a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/CloudIdentityAuthenticationClient.java b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationClient.java similarity index 93% rename from labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/CloudIdentityAuthenticationClient.java rename to labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationClient.java index c9533d86b8..476b5bdaf4 100644 --- a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/CloudIdentityAuthenticationClient.java +++ b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationClient.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudidentity.v2_0; +package org.jclouds.rackspace.cloudidentity.v2_0; import java.util.concurrent.TimeUnit; -import org.jclouds.cloudidentity.v2_0.domain.ApiKeyCredentials; import org.jclouds.concurrent.Timeout; import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.keystone.v2_0.AuthenticationAsyncClient; import org.jclouds.openstack.keystone.v2_0.AuthenticationClient; import org.jclouds.openstack.keystone.v2_0.domain.Access; +import org.jclouds.rackspace.cloudidentity.v2_0.domain.ApiKeyCredentials; /** * Provides synchronous access to the KeyStone Service API. diff --git a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/config/CloudIdentityAuthenticationModule.java b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/CloudIdentityAuthenticationModule.java similarity index 91% rename from labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/config/CloudIdentityAuthenticationModule.java rename to labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/CloudIdentityAuthenticationModule.java index a4fa64a0da..3e5ac02b68 100644 --- a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/config/CloudIdentityAuthenticationModule.java +++ b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/CloudIdentityAuthenticationModule.java @@ -16,15 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudidentity.v2_0.config; +package org.jclouds.rackspace.cloudidentity.v2_0.config; import static org.jclouds.rest.config.BinderUtils.bindClientAndAsyncClient; import java.util.Map; -import org.jclouds.cloudidentity.v2_0.CloudIdentityAuthenticationAsyncClient; -import org.jclouds.cloudidentity.v2_0.CloudIdentityAuthenticationClient; -import org.jclouds.cloudidentity.v2_0.functions.AuthenticateApiKeyCredentials; import org.jclouds.domain.Credentials; import org.jclouds.openstack.keystone.v2_0.AuthenticationAsyncClient; import org.jclouds.openstack.keystone.v2_0.AuthenticationClient; @@ -32,6 +29,9 @@ import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule; import org.jclouds.openstack.keystone.v2_0.domain.Access; import org.jclouds.openstack.keystone.v2_0.functions.AuthenticatePasswordCredentials; +import org.jclouds.rackspace.cloudidentity.v2_0.CloudIdentityAuthenticationAsyncClient; +import org.jclouds.rackspace.cloudidentity.v2_0.CloudIdentityAuthenticationClient; +import org.jclouds.rackspace.cloudidentity.v2_0.functions.AuthenticateApiKeyCredentials; import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; diff --git a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/config/CloudIdentityCredentialTypes.java b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/CloudIdentityCredentialTypes.java similarity index 94% rename from labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/config/CloudIdentityCredentialTypes.java rename to labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/CloudIdentityCredentialTypes.java index 84dcd7c49e..f255ad64bf 100644 --- a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/config/CloudIdentityCredentialTypes.java +++ b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/CloudIdentityCredentialTypes.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudidentity.v2_0.config; +package org.jclouds.rackspace.cloudidentity.v2_0.config; import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; diff --git a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/config/CloudIdentityRestClientModule.java b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/CloudIdentityRestClientModule.java similarity index 93% rename from labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/config/CloudIdentityRestClientModule.java rename to labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/CloudIdentityRestClientModule.java index 7f2065f91a..a881197cb4 100644 --- a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/config/CloudIdentityRestClientModule.java +++ b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/CloudIdentityRestClientModule.java @@ -1,4 +1,4 @@ -package org.jclouds.cloudidentity.v2_0.config; +package org.jclouds.rackspace.cloudidentity.v2_0.config; import org.jclouds.location.config.LocationModule; import org.jclouds.openstack.keystone.v2_0.KeystoneAsyncClient; diff --git a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/domain/ApiKeyCredentials.java b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/ApiKeyCredentials.java similarity index 96% rename from labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/domain/ApiKeyCredentials.java rename to labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/ApiKeyCredentials.java index b44ae50538..12c00599bf 100644 --- a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/domain/ApiKeyCredentials.java +++ b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/ApiKeyCredentials.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudidentity.v2_0.domain; +package org.jclouds.rackspace.cloudidentity.v2_0.domain; import static com.google.common.base.Objects.equal; import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; -import org.jclouds.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; import org.jclouds.openstack.keystone.v2_0.config.CredentialType; +import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; import com.google.common.base.Objects; diff --git a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java similarity index 88% rename from labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java rename to labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java index 58d8ec8867..99bf483584 100644 --- a/labs/cloudidentity/src/main/java/org/jclouds/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java +++ b/labs/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudidentity.v2_0.functions; +package org.jclouds.rackspace.cloudidentity.v2_0.functions; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.cloudidentity.v2_0.CloudIdentityAuthenticationClient; -import org.jclouds.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; -import org.jclouds.cloudidentity.v2_0.domain.ApiKeyCredentials; import org.jclouds.openstack.keystone.v2_0.config.CredentialType; import org.jclouds.openstack.keystone.v2_0.domain.Access; import org.jclouds.openstack.keystone.v2_0.functions.internal.BaseAuthenticator; +import org.jclouds.rackspace.cloudidentity.v2_0.CloudIdentityAuthenticationClient; +import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; +import org.jclouds.rackspace.cloudidentity.v2_0.domain.ApiKeyCredentials; /** * diff --git a/labs/rackspace-cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/labs/rackspace-cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata new file mode 100644 index 0000000000..37e56b6239 --- /dev/null +++ b/labs/rackspace-cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata @@ -0,0 +1 @@ +org.jclouds.rackspace.cloudidentity.v2_0.CloudIdentityApiMetadata diff --git a/labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/CloudIdentityApiMetadataTest.java b/labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadataTest.java similarity index 91% rename from labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/CloudIdentityApiMetadataTest.java rename to labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadataTest.java index b87885a2b3..a2cc0d73f6 100644 --- a/labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/CloudIdentityApiMetadataTest.java +++ b/labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadataTest.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudidentity.v2_0; +package org.jclouds.rackspace.cloudidentity.v2_0; import org.jclouds.View; +import org.jclouds.rackspace.cloudidentity.v2_0.CloudIdentityApiMetadata; import org.jclouds.rest.internal.BaseRestApiMetadataTest; import org.testng.annotations.Test; diff --git a/labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/CloudIdentityClientLiveTest.java b/labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityClientLiveTest.java similarity index 92% rename from labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/CloudIdentityClientLiveTest.java rename to labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityClientLiveTest.java index 7d4f69cd24..e185f6f8ac 100644 --- a/labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/CloudIdentityClientLiveTest.java +++ b/labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityClientLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudidentity.v2_0; +package org.jclouds.rackspace.cloudidentity.v2_0; import org.jclouds.openstack.keystone.v2_0.KeystoneClientLiveTest; import org.testng.annotations.Test; @@ -28,6 +28,6 @@ import org.testng.annotations.Test; @Test(groups = "live", testName = "CloudIdentityClientLiveTest", singleThreaded = true) public class CloudIdentityClientLiveTest extends KeystoneClientLiveTest { public CloudIdentityClientLiveTest() { - provider = "cloudidentity"; + provider = "rackspace-cloudidentity"; } } \ No newline at end of file diff --git a/labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityServiceClientLiveTest.java b/labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityServiceClientLiveTest.java similarity index 91% rename from labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityServiceClientLiveTest.java rename to labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityServiceClientLiveTest.java index 05e4cac34c..01520e39e6 100644 --- a/labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityServiceClientLiveTest.java +++ b/labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityServiceClientLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudidentity.v2_0.features; +package org.jclouds.rackspace.cloudidentity.v2_0.features; import org.jclouds.openstack.keystone.v2_0.features.ServiceClientLiveTest; import org.testng.annotations.Test; @@ -28,6 +28,6 @@ import org.testng.annotations.Test; @Test(groups = "live", testName = "CloudIdentityServiceClientLiveTest", singleThreaded = true) public class CloudIdentityServiceClientLiveTest extends ServiceClientLiveTest { public CloudIdentityServiceClientLiveTest() { - provider = "cloudidentity"; + provider = "rackspace-cloudidentity"; } } \ No newline at end of file diff --git a/labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityTenantClientLiveTest.java b/labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityTenantClientLiveTest.java similarity index 91% rename from labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityTenantClientLiveTest.java rename to labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityTenantClientLiveTest.java index 394eff99a6..4e5f7ef0a8 100644 --- a/labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityTenantClientLiveTest.java +++ b/labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityTenantClientLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudidentity.v2_0.features; +package org.jclouds.rackspace.cloudidentity.v2_0.features; import org.jclouds.openstack.keystone.v2_0.features.TenantClientLiveTest; import org.testng.annotations.Test; @@ -28,6 +28,6 @@ import org.testng.annotations.Test; @Test(groups = "live", testName = "CloudIdentityTenantClientLiveTest", singleThreaded = true) public class CloudIdentityTenantClientLiveTest extends TenantClientLiveTest { public CloudIdentityTenantClientLiveTest() { - provider = "cloudidentity"; + provider = "rackspace-cloudidentity"; } } \ No newline at end of file diff --git a/labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityTokenClientLiveTest.java b/labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityTokenClientLiveTest.java similarity index 91% rename from labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityTokenClientLiveTest.java rename to labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityTokenClientLiveTest.java index d219ddfe49..abf68edb7b 100644 --- a/labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityTokenClientLiveTest.java +++ b/labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityTokenClientLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudidentity.v2_0.features; +package org.jclouds.rackspace.cloudidentity.v2_0.features; import org.jclouds.openstack.keystone.v2_0.features.TokenClientLiveTest; import org.testng.annotations.Test; @@ -28,6 +28,6 @@ import org.testng.annotations.Test; @Test(groups = "live", testName = "CloudIdentityTokenClientLiveTest", singleThreaded = true) public class CloudIdentityTokenClientLiveTest extends TokenClientLiveTest { public CloudIdentityTokenClientLiveTest() { - provider = "cloudidentity"; + provider = "rackspace-cloudidentity"; } } \ No newline at end of file diff --git a/labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityUserClientLiveTest.java b/labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityUserClientLiveTest.java similarity index 91% rename from labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityUserClientLiveTest.java rename to labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityUserClientLiveTest.java index e2b477f12f..aa92bccc58 100644 --- a/labs/cloudidentity/src/test/java/org/jclouds/cloudidentity/v2_0/features/CloudIdentityUserClientLiveTest.java +++ b/labs/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityUserClientLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudidentity.v2_0.features; +package org.jclouds.rackspace.cloudidentity.v2_0.features; import org.jclouds.openstack.keystone.v2_0.features.UserClientLiveTest; import org.testng.annotations.Test; @@ -28,6 +28,6 @@ import org.testng.annotations.Test; @Test(groups = "live", testName = "CloudIdentityUserClientLiveTest", singleThreaded = true) public class CloudIdentityUserClientLiveTest extends UserClientLiveTest { public CloudIdentityUserClientLiveTest() { - provider = "cloudidentity"; + provider = "rackspace-cloudidentity"; } } \ No newline at end of file diff --git a/labs/cloudservers-nova-us/pom.xml b/labs/rackspace-cloudservers-us/pom.xml similarity index 63% rename from labs/cloudservers-nova-us/pom.xml rename to labs/rackspace-cloudservers-us/pom.xml index bc872a211e..f5cd0e5016 100644 --- a/labs/cloudservers-nova-us/pom.xml +++ b/labs/rackspace-cloudservers-us/pom.xml @@ -28,22 +28,22 @@ ../../project/pom.xml org.jclouds.labs - cloudservers-nova-us + rackspace-cloudservers-us jclouds Rackspace Next Generation Cloud Servers provider OpenStack Nova implementation targeted to Rackspace Next Generation Cloud Servers bundle - https://identity.api.rackspacecloud.com - 2 - - ${test.rackspace-us.identity} - ${test.rackspace-us.credential} - - - + https://identity.api.rackspacecloud.com + 2 + + ${test.rackspace-us.identity} + ${test.rackspace-us.credential} + + + - org.jclouds.cloudservers_nova.us*;version="${project.version}" + org.jclouds.rackspace.cloudservers.us*;version="${project.version}" org.jclouds.compute.internal;version="${project.version}", org.jclouds.rest.internal;version="${project.version}", @@ -55,7 +55,7 @@ org.jclouds.labs - cloudidentity + rackspace-cloudidentity ${project.version} @@ -79,7 +79,7 @@ org.jclouds.labs - cloudidentity + rackspace-cloudidentity ${project.version} test-jar test @@ -129,14 +129,14 @@ 1 - ${test.cloudservers-nova-us.endpoint} - ${test.cloudservers-nova-us.api-version} - ${test.cloudservers-nova-us.build-version} - ${test.cloudservers-nova-us.identity} - ${test.cloudservers-nova-us.credential} - ${test.cloudservers-nova-us.image-id} - ${test.cloudservers-nova-us.image.login-user} - ${test.cloudservers-nova-us.image.authenticate-sudo} + ${test.rackspace-cloudservers-us.endpoint} + ${test.rackspace-cloudservers-us.api-version} + ${test.rackspace-cloudservers-us.build-version} + ${test.rackspace-cloudservers-us.identity} + ${test.rackspace-cloudservers-us.credential} + ${test.rackspace-cloudservers-us.image-id} + ${test.rackspace-cloudservers-us.image.login-user} + ${test.rackspace-cloudservers-us.image.authenticate-sudo} diff --git a/labs/cloudservers-nova-us/src/main/java/org/jclouds/cloudservers_nova/us/CloudServersUSProviderMetadata.java b/labs/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java similarity index 90% rename from labs/cloudservers-nova-us/src/main/java/org/jclouds/cloudservers_nova/us/CloudServersUSProviderMetadata.java rename to labs/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java index f9a37b2cd1..0d872e43da 100644 --- a/labs/cloudservers-nova-us/src/main/java/org/jclouds/cloudservers_nova/us/CloudServersUSProviderMetadata.java +++ b/labs/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudservers_nova.us; +package org.jclouds.rackspace.cloudservers.us; import static org.jclouds.compute.config.ComputeServiceProperties.TEMPLATE; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; @@ -24,13 +24,13 @@ import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CRED import java.net.URI; import java.util.Properties; -import org.jclouds.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; -import org.jclouds.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule.CloudIdentityAuthenticationModuleForZones; import org.jclouds.openstack.nova.v2_0.NovaApiMetadata; import org.jclouds.openstack.nova.v2_0.compute.config.NovaComputeServiceContextModule; import org.jclouds.openstack.nova.v2_0.config.NovaRestClientModule; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; +import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; +import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule.CloudIdentityAuthenticationModuleForZones; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; @@ -73,7 +73,7 @@ public class CloudServersUSProviderMetadata extends BaseProviderMetadata { public static class Builder extends BaseProviderMetadata.Builder { protected Builder(){ - id("cloudservers-nova-us") + id("rackspace-cloudservers-us") .name("Rackspace Next Generation Cloud Servers") .apiMetadata(new NovaApiMetadata().toBuilder() .identityName("username") @@ -84,7 +84,7 @@ public class CloudServersUSProviderMetadata extends BaseProviderMetadata { .build()) .homepage(URI.create("http://www.rackspace.com/cloud/nextgen")) .console(URI.create("https://mycloud.rackspace.com")) - .linkedServices("cloudservers-nova-us", "cloudfiles-swift-us") + .linkedServices("rackspace-cloudservers-us", "cloudfiles-swift-us") .iso3166Codes("US-TX") .endpoint("https://identity.api.rackspacecloud.com") .defaultProperties(CloudServersUSProviderMetadata.defaultProperties()); diff --git a/labs/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/labs/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata new file mode 100644 index 0000000000..b941fc255b --- /dev/null +++ b/labs/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata @@ -0,0 +1 @@ +org.jclouds.rackspace.cloudservers.us.CloudServersUSProviderMetadata diff --git a/labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/CloudServersUSProviderTest.java b/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderTest.java similarity index 94% rename from labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/CloudServersUSProviderTest.java rename to labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderTest.java index f24a4c345e..8b885be8c3 100644 --- a/labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/CloudServersUSProviderTest.java +++ b/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderTest.java @@ -33,10 +33,11 @@ * limitations under the License. * ==================================================================== */ -package org.jclouds.cloudservers_nova.us; +package org.jclouds.rackspace.cloudservers.us; import org.jclouds.openstack.nova.v2_0.NovaApiMetadata; import org.jclouds.providers.internal.BaseProviderMetadataTest; +import org.jclouds.rackspace.cloudservers.us.CloudServersUSProviderMetadata; import org.testng.annotations.Test; /** diff --git a/labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/compute/CloudServersUSComputeServiceLiveTest.java b/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSComputeServiceLiveTest.java similarity index 92% rename from labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/compute/CloudServersUSComputeServiceLiveTest.java rename to labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSComputeServiceLiveTest.java index f17d7047bc..b5ef016e24 100644 --- a/labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/compute/CloudServersUSComputeServiceLiveTest.java +++ b/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSComputeServiceLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudservers_nova.us.compute; +package org.jclouds.rackspace.cloudservers.us.compute; import org.jclouds.openstack.nova.v2_0.compute.NovaComputeServiceLiveTest; import org.testng.annotations.Test; @@ -29,6 +29,6 @@ import org.testng.annotations.Test; public class CloudServersUSComputeServiceLiveTest extends NovaComputeServiceLiveTest { public CloudServersUSComputeServiceLiveTest() { - provider = "cloudservers-nova-us"; + provider = "rackspace-cloudservers-us"; } } diff --git a/labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/compute/CloudServersUSTemplateBuilderLiveTest.java b/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java similarity index 97% rename from labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/compute/CloudServersUSTemplateBuilderLiveTest.java rename to labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java index 1a1a4effaf..f60ce66323 100644 --- a/labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/compute/CloudServersUSTemplateBuilderLiveTest.java +++ b/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudservers_nova.us.compute; +package org.jclouds.rackspace.cloudservers.us.compute; import static org.jclouds.compute.util.ComputeServiceUtils.getCores; import static org.testng.Assert.assertEquals; @@ -42,7 +42,7 @@ import com.google.common.collect.ImmutableSet; public class CloudServersUSTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest { public CloudServersUSTemplateBuilderLiveTest() { - provider = "cloudservers-nova-us"; + provider = "rackspace-cloudservers-us"; } @Override diff --git a/labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/compute/extensions/CloudServersUSImageExtensionLivetest.java b/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/extensions/CloudServersUSImageExtensionLivetest.java similarity index 92% rename from labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/compute/extensions/CloudServersUSImageExtensionLivetest.java rename to labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/extensions/CloudServersUSImageExtensionLivetest.java index 0c4d3af76b..c3797228c3 100644 --- a/labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/compute/extensions/CloudServersUSImageExtensionLivetest.java +++ b/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/extensions/CloudServersUSImageExtensionLivetest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.cloudservers_nova.us.compute.extensions; +package org.jclouds.rackspace.cloudservers.us.compute.extensions; import org.jclouds.compute.extensions.internal.BaseImageExtensionLiveTest; import org.jclouds.sshj.config.SshjSshClientModule; @@ -34,7 +34,7 @@ import com.google.inject.Module; public class CloudServersUSImageExtensionLivetest extends BaseImageExtensionLiveTest { public CloudServersUSImageExtensionLivetest() { - provider = "cloudservers-nova-us"; + provider = "rackspace-cloudservers-us"; } @Override diff --git a/labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/features/CloudServersUSFlavorClientLiveTest.java b/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSFlavorClientLiveTest.java similarity index 91% rename from labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/features/CloudServersUSFlavorClientLiveTest.java rename to labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSFlavorClientLiveTest.java index b1e1838d89..75b8bafc2c 100644 --- a/labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/features/CloudServersUSFlavorClientLiveTest.java +++ b/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSFlavorClientLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudservers_nova.us.features; +package org.jclouds.rackspace.cloudservers.us.features; import org.jclouds.openstack.nova.v2_0.features.FlavorClientLiveTest; import org.testng.annotations.Test; @@ -28,7 +28,7 @@ import org.testng.annotations.Test; @Test(groups = "live", testName = "CloudServersUSFlavorClientLiveTest") public class CloudServersUSFlavorClientLiveTest extends FlavorClientLiveTest { public CloudServersUSFlavorClientLiveTest() { - provider = "cloudservers-nova-us"; + provider = "rackspace-cloudservers-us"; } } diff --git a/labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/features/CloudServersUSImageClientLiveTest.java b/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSImageClientLiveTest.java similarity index 91% rename from labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/features/CloudServersUSImageClientLiveTest.java rename to labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSImageClientLiveTest.java index 95a329f399..752ef95dd8 100644 --- a/labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/features/CloudServersUSImageClientLiveTest.java +++ b/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSImageClientLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudservers_nova.us.features; +package org.jclouds.rackspace.cloudservers.us.features; import org.jclouds.openstack.nova.v2_0.features.ImageClientLiveTest; import org.testng.annotations.Test; @@ -28,6 +28,6 @@ import org.testng.annotations.Test; @Test(groups = "live", testName = "CloudServersUSImageClientLiveTest") public class CloudServersUSImageClientLiveTest extends ImageClientLiveTest { public CloudServersUSImageClientLiveTest() { - provider = "cloudservers-nova-us"; + provider = "rackspace-cloudservers-us"; } } diff --git a/labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/features/CloudServersUSServerClientLiveTest.java b/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSServerClientLiveTest.java similarity index 91% rename from labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/features/CloudServersUSServerClientLiveTest.java rename to labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSServerClientLiveTest.java index a83f46fa9e..de256e4402 100644 --- a/labs/cloudservers-nova-us/src/test/java/org/jclouds/cloudservers_nova/us/features/CloudServersUSServerClientLiveTest.java +++ b/labs/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/features/CloudServersUSServerClientLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudservers_nova.us.features; +package org.jclouds.rackspace.cloudservers.us.features; import org.jclouds.openstack.nova.v2_0.features.ServerClientLiveTest; import org.testng.annotations.Test; @@ -28,7 +28,7 @@ import org.testng.annotations.Test; @Test(groups = "live", testName = "CloudServersUSServerClientLiveTest") public class CloudServersUSServerClientLiveTest extends ServerClientLiveTest { public CloudServersUSServerClientLiveTest() { - provider = "cloudservers-nova-us"; + provider = "rackspace-cloudservers-us"; } } diff --git a/labs/cloudservers-nova-us/src/test/resources/raxImages.json b/labs/rackspace-cloudservers-us/src/test/resources/raxImages.json similarity index 100% rename from labs/cloudservers-nova-us/src/test/resources/raxImages.json rename to labs/rackspace-cloudservers-us/src/test/resources/raxImages.json