diff --git a/allloadbalancer/pom.xml b/allloadbalancer/pom.xml index fa95b5c769..f34067cad3 100644 --- a/allloadbalancer/pom.xml +++ b/allloadbalancer/pom.xml @@ -32,12 +32,12 @@ org.jclouds.provider - cloudloadbalancers-uk + rackspace-cloudloadbalancers-uk ${project.version} org.jclouds.provider - cloudloadbalancers-us + rackspace-cloudloadbalancers-us ${project.version} diff --git a/apis/cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata deleted file mode 100644 index 26850b8960..0000000000 --- a/apis/cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.cloudloadbalancers.CloudLoadBalancersApiMetadata \ No newline at end of file diff --git a/apis/pom.xml b/apis/pom.xml index 17ea9c4be1..8324500993 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -32,29 +32,29 @@ pom jclouds apis project + cloudwatch + cloudsigma + cloudstack filesystem byon s3 ec2 + sqs deltacloud walrus eucalyptus - swift - cloudfiles - cloudservers - cloudloadbalancers vcloud elasticstack atmos nova + swift openstack-keystone openstack-cinder openstack-nova openstack-nova-ec2 - cloudwatch - cloudsigma - cloudstack + cloudfiles + cloudservers rackspace-cloudidentity - sqs + rackspace-cloudloadbalancers diff --git a/apis/cloudloadbalancers/pom.xml b/apis/rackspace-cloudloadbalancers/pom.xml similarity index 70% rename from apis/cloudloadbalancers/pom.xml rename to apis/rackspace-cloudloadbalancers/pom.xml index 24d608e73d..3b2436b8c1 100644 --- a/apis/cloudloadbalancers/pom.xml +++ b/apis/rackspace-cloudloadbalancers/pom.xml @@ -28,19 +28,19 @@ ../../project/pom.xml org.jclouds.api - cloudloadbalancers - jclouds cloudloadbalancers api - jclouds components to access a rackspace implementation of LoadBalancer + rackspace-cloudloadbalancers + jclouds Rackspace Cloud Load Balancers API + Cloud Load Balancers API for Rackspace bundle - https://identity.api.rackspacecloud.com/v2.0/ - 1 - - ${test.rackspace.identity} - ${test.rackspace.credential} + https://identity.api.rackspacecloud.com/v2.0/ + 1 + + ${test.rackspace.identity} + ${test.rackspace.credential} - org.jclouds.cloudloadbalancers*;version="${project.version}" + org.jclouds.rackspace.cloudloadbalancers*;version="${project.version}" org.jclouds*;version="${project.version}",* @@ -117,11 +117,11 @@ - ${test.cloudloadbalancers.endpoint} - ${test.cloudloadbalancers.api-version} - ${test.cloudloadbalancers.build-version} - ${test.cloudloadbalancers.identity} - ${test.cloudloadbalancers.credential} + ${test.rackspace-cloudloadbalancers.endpoint} + ${test.rackspace-cloudloadbalancers.api-version} + ${test.rackspace-cloudloadbalancers.build-version} + ${test.rackspace-cloudloadbalancers.identity} + ${test.rackspace-cloudloadbalancers.credential} ${test.jclouds.keystone.credential-type} diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersClient.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApi.java similarity index 87% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersClient.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApi.java index c8f9f339f5..d34a5d1d85 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersClient.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApi.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.cloudloadbalancers.features.LoadBalancerClient; -import org.jclouds.cloudloadbalancers.features.NodeClient; import org.jclouds.concurrent.Timeout; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Zone; import org.jclouds.location.functions.ZoneToEndpoint; +import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerClient; +import org.jclouds.rackspace.cloudloadbalancers.features.NodeClient; import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.EndpointParam; @@ -36,11 +36,11 @@ import com.google.inject.Provides; * Provides synchronous access to CloudLoadBalancers. *

* - * @see CloudLoadBalancersAsyncClient + * @see CloudLoadBalancersAsyncApi * @author Adrian Cole */ @Timeout(duration = 60, timeUnit = TimeUnit.SECONDS) -public interface CloudLoadBalancersClient { +public interface CloudLoadBalancersApi { /** * @return the Zone codes configured */ diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersApiMetadata.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadata.java similarity index 87% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersApiMetadata.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadata.java index 35a109f0f1..f1734f8315 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersApiMetadata.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; @@ -25,13 +25,13 @@ import java.net.URI; import java.util.Properties; import org.jclouds.apis.ApiMetadata; -import org.jclouds.cloudloadbalancers.config.CloudLoadBalancersRestClientModule; -import org.jclouds.cloudloadbalancers.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule; import org.jclouds.loadbalancer.LoadBalancerServiceContext; import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule; import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; +import org.jclouds.rackspace.cloudloadbalancers.config.CloudLoadBalancersRestClientModule; +import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule; import org.jclouds.rest.RestContext; import org.jclouds.rest.internal.BaseRestApiMetadata; @@ -46,8 +46,8 @@ import com.google.inject.Module; */ public class CloudLoadBalancersApiMetadata extends BaseRestApiMetadata { - public static final TypeToken> CONTEXT_TOKEN = - new TypeToken>() {}; + public static final TypeToken> CONTEXT_TOKEN = + new TypeToken>() {}; @Override @@ -75,7 +75,7 @@ public class CloudLoadBalancersApiMetadata extends BaseRestApiMetadata { public static class Builder extends BaseRestApiMetadata.Builder { protected Builder() { - super(CloudLoadBalancersClient.class, CloudLoadBalancersAsyncClient.class); + super(CloudLoadBalancersApi.class, CloudLoadBalancersAsyncApi.class); id("cloudloadbalancers") .name("Rackspace Cloud Load Balancers API") .identityName("Username") diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersAsyncClient.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersAsyncApi.java similarity index 86% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersAsyncClient.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersAsyncApi.java index ee14b99377..3dbf012e34 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersAsyncClient.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersAsyncApi.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers; import java.util.Set; -import org.jclouds.cloudloadbalancers.features.LoadBalancerAsyncClient; -import org.jclouds.cloudloadbalancers.features.NodeAsyncClient; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Zone; import org.jclouds.location.functions.ZoneToEndpoint; +import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerAsyncClient; +import org.jclouds.rackspace.cloudloadbalancers.features.NodeAsyncClient; import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.EndpointParam; @@ -34,10 +34,10 @@ import com.google.inject.Provides; * Provides asynchronous access to CloudLoadBalancers via their REST API. *

* - * @see CloudLoadBalancersClient + * @see CloudLoadBalancersApi * @author Adrian Cole */ -public interface CloudLoadBalancersAsyncClient { +public interface CloudLoadBalancersAsyncApi { /** * @return the Zone codes configured */ diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/LoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/LoadBalancer.java similarity index 96% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/LoadBalancer.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/LoadBalancer.java index d289127be6..87c477ad0c 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/LoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/LoadBalancer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -36,4 +36,4 @@ import javax.inject.Qualifier; @Qualifier public @interface LoadBalancer { -} \ No newline at end of file +} diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/Node.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/Node.java similarity index 95% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/Node.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/Node.java index 4b477b5b5b..2c061db9fd 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/Node.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/Node.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -36,4 +36,4 @@ import javax.inject.Qualifier; @Qualifier public @interface Node { -} \ No newline at end of file +} diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/config/CloudLoadBalancersRestClientModule.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/config/CloudLoadBalancersRestClientModule.java similarity index 77% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/config/CloudLoadBalancersRestClientModule.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/config/CloudLoadBalancersRestClientModule.java index 37d83f7592..f8fd9e1c17 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/config/CloudLoadBalancersRestClientModule.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/config/CloudLoadBalancersRestClientModule.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.config; +package org.jclouds.rackspace.cloudloadbalancers.config; import java.util.Map; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersAsyncClient; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient; -import org.jclouds.cloudloadbalancers.features.LoadBalancerAsyncClient; -import org.jclouds.cloudloadbalancers.features.LoadBalancerClient; -import org.jclouds.cloudloadbalancers.features.NodeAsyncClient; -import org.jclouds.cloudloadbalancers.features.NodeClient; -import org.jclouds.cloudloadbalancers.functions.ConvertLB; -import org.jclouds.cloudloadbalancers.handlers.ParseCloudLoadBalancersErrorFromHttpResponse; import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.annotation.ClientError; import org.jclouds.http.annotation.Redirection; import org.jclouds.http.annotation.ServerError; import org.jclouds.json.config.GsonModule.DateAdapter; import org.jclouds.json.config.GsonModule.Iso8601DateAdapter; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerAsyncClient; +import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerClient; +import org.jclouds.rackspace.cloudloadbalancers.features.NodeAsyncClient; +import org.jclouds.rackspace.cloudloadbalancers.features.NodeClient; +import org.jclouds.rackspace.cloudloadbalancers.functions.ConvertLB; +import org.jclouds.rackspace.cloudloadbalancers.handlers.ParseCloudLoadBalancersErrorFromHttpResponse; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.config.RestClientModule; @@ -47,7 +47,7 @@ import com.google.inject.assistedinject.FactoryModuleBuilder; */ @ConfiguresRestClient public class CloudLoadBalancersRestClientModule extends - RestClientModule { + RestClientModule { public static final Map, Class> DELEGATE_MAP = ImmutableMap., Class> builder() .put(LoadBalancerClient.class, LoadBalancerAsyncClient.class) diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancer.java similarity index 98% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancer.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancer.java index bf320f6658..00d9db31c8 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.domain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -24,9 +24,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; import java.util.Set; -import org.jclouds.cloudloadbalancers.domain.internal.BaseLoadBalancer; -import org.jclouds.cloudloadbalancers.features.LoadBalancerClient; import org.jclouds.javax.annotation.Nullable; +import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerClient; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancerAttributes.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerAttributes.java similarity index 96% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancerAttributes.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerAttributes.java index c72dd772b3..a39329a722 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancerAttributes.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerAttributes.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.domain; -import org.jclouds.cloudloadbalancers.domain.internal.BaseLoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer; /** * diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancerRequest.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerRequest.java similarity index 97% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancerRequest.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerRequest.java index 239de1a7d3..5ec798e846 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancerRequest.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerRequest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.domain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -24,7 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; import java.util.Map; -import org.jclouds.cloudloadbalancers.domain.internal.BaseLoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/Node.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/Node.java similarity index 97% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/Node.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/Node.java index 34abfddefc..48c4d95316 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/Node.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/Node.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.domain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import org.jclouds.cloudloadbalancers.domain.internal.BaseNode; +import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseNode; /** * The nodes defined by the load balancer are responsible for servicing the requests received diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/NodeAttributes.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/NodeAttributes.java similarity index 92% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/NodeAttributes.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/NodeAttributes.java index 5b6ad863b7..b393457100 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/NodeAttributes.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/NodeAttributes.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.domain; -import org.jclouds.cloudloadbalancers.domain.internal.BaseNode; -import org.jclouds.cloudloadbalancers.domain.internal.BaseNode.Condition; +import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseNode; +import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseNode.Condition; /** * diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/NodeRequest.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/NodeRequest.java similarity index 96% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/NodeRequest.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/NodeRequest.java index a1f01f6879..51b0c6c9a8 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/NodeRequest.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/NodeRequest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.domain; -import org.jclouds.cloudloadbalancers.domain.internal.BaseNode; +import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseNode; /** * The nodes defined by the load balancer are responsible for servicing the requests received diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/VirtualIP.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/VirtualIP.java similarity index 98% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/VirtualIP.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/VirtualIP.java index 3f2f4262d4..287b4a5772 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/VirtualIP.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/VirtualIP.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.domain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/internal/BaseLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/internal/BaseLoadBalancer.java similarity index 98% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/internal/BaseLoadBalancer.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/internal/BaseLoadBalancer.java index 11cc075118..dabcc5253c 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/internal/BaseLoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/internal/BaseLoadBalancer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.domain.internal; +package org.jclouds.rackspace.cloudloadbalancers.domain.internal; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/internal/BaseNode.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/internal/BaseNode.java similarity index 99% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/internal/BaseNode.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/internal/BaseNode.java index 7693d5645b..dab3119e99 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/domain/internal/BaseNode.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/internal/BaseNode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.domain.internal; +package org.jclouds.rackspace.cloudloadbalancers.domain.internal; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/features/LoadBalancerAsyncClient.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerAsyncClient.java similarity index 89% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/features/LoadBalancerAsyncClient.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerAsyncClient.java index ffa08918ce..ffad710fe1 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/features/LoadBalancerAsyncClient.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerAsyncClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.features; import java.util.Set; @@ -29,12 +29,12 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.core.MediaType; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.domain.LoadBalancerAttributes; -import org.jclouds.cloudloadbalancers.domain.LoadBalancerRequest; -import org.jclouds.cloudloadbalancers.functions.UnwrapLoadBalancer; -import org.jclouds.cloudloadbalancers.functions.UnwrapLoadBalancers; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerAttributes; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.functions.UnwrapLoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.functions.UnwrapLoadBalancers; import org.jclouds.rest.annotations.ExceptionParser; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.ResponseParser; diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/features/LoadBalancerClient.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerClient.java similarity index 92% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/features/LoadBalancerClient.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerClient.java index 669c161832..b4f1cf31ad 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/features/LoadBalancerClient.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerClient.java @@ -16,16 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.features; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.domain.LoadBalancerAttributes; -import org.jclouds.cloudloadbalancers.domain.LoadBalancerRequest; import org.jclouds.concurrent.Timeout; -import org.jclouds.http.HttpResponseException; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerAttributes; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerRequest; /** * Provides synchronous access to CloudLoadBalancers LoadBalancer features. diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/features/NodeAsyncClient.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeAsyncClient.java similarity index 93% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/features/NodeAsyncClient.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeAsyncClient.java index 5d66bde859..dcf5b0507e 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/features/NodeAsyncClient.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeAsyncClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.features; import java.util.Set; @@ -30,10 +30,10 @@ import javax.ws.rs.PathParam; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; -import org.jclouds.cloudloadbalancers.domain.Node; -import org.jclouds.cloudloadbalancers.domain.NodeAttributes; -import org.jclouds.cloudloadbalancers.domain.NodeRequest; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; +import org.jclouds.rackspace.cloudloadbalancers.domain.Node; +import org.jclouds.rackspace.cloudloadbalancers.domain.NodeAttributes; +import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest; import org.jclouds.rest.annotations.ExceptionParser; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.SelectJson; diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/features/NodeClient.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeClient.java similarity index 92% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/features/NodeClient.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeClient.java index 118553130a..736194df8a 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/features/NodeClient.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeClient.java @@ -16,17 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.features; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.cloudloadbalancers.domain.LoadBalancerAttributes; -import org.jclouds.cloudloadbalancers.domain.Node; -import org.jclouds.cloudloadbalancers.domain.NodeAttributes; -import org.jclouds.cloudloadbalancers.domain.NodeRequest; import org.jclouds.concurrent.Timeout; -import org.jclouds.http.HttpResponseException; +import org.jclouds.rackspace.cloudloadbalancers.domain.Node; +import org.jclouds.rackspace.cloudloadbalancers.domain.NodeAttributes; +import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest; /** * Provides synchronous access to CloudLoadBalancers Node features. diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/AppendAccountIdToURI.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/AppendAccountIdToURI.java similarity index 92% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/AppendAccountIdToURI.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/AppendAccountIdToURI.java index 40f1a931c0..443b3f4512 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/AppendAccountIdToURI.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/AppendAccountIdToURI.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.functions; import java.net.URI; @@ -25,7 +25,7 @@ import javax.inject.Named; import javax.inject.Singleton; import javax.ws.rs.core.UriBuilder; -import org.jclouds.cloudloadbalancers.reference.RackspaceConstants; +import org.jclouds.rackspace.cloudloadbalancers.reference.RackspaceConstants; import com.google.common.base.Function; import com.google.common.base.Supplier; @@ -59,4 +59,4 @@ public final class AppendAccountIdToURI implements Function, Suppl }; } -} \ No newline at end of file +} diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/ConvertLB.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ConvertLB.java similarity index 92% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/ConvertLB.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ConvertLB.java index dcb79040eb..4cf66416c3 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/ConvertLB.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ConvertLB.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.functions; import javax.annotation.Resource; import javax.inject.Inject; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Builder; import org.jclouds.logging.Logger; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Builder; import com.google.common.base.Function; import com.google.common.collect.Iterables; diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/LB.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/LB.java similarity index 84% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/LB.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/LB.java index ef4d17e947..5d92219ee8 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/LB.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/LB.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.functions; import java.util.Date; import java.util.Map; import java.util.Set; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status; -import org.jclouds.cloudloadbalancers.domain.Node; -import org.jclouds.cloudloadbalancers.domain.VirtualIP; -import org.jclouds.cloudloadbalancers.domain.internal.BaseLoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.Node; +import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status; +import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer; import com.google.common.base.Objects; import com.google.common.collect.Maps; diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancer.java similarity index 91% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancer.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancer.java index 52b66c1cca..713d87ae86 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.functions; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; @@ -25,11 +25,11 @@ import java.util.Map; import javax.inject.Inject; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.functions.ConvertLB.Factory; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.functions.ConvertLB.Factory; import org.jclouds.rest.InvocationContext; import com.google.common.base.Function; @@ -71,4 +71,4 @@ public class UnwrapLoadBalancer implements Function, return this; } -} \ No newline at end of file +} diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancers.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancers.java similarity index 91% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancers.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancers.java index 39c83f7029..53ab73637c 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancers.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancers.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.functions; import static com.google.common.base.Preconditions.checkNotNull; @@ -25,11 +25,11 @@ import java.util.Set; import javax.inject.Inject; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.functions.ConvertLB.Factory; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.functions.ConvertLB.Factory; import org.jclouds.rest.InvocationContext; import com.google.common.base.Function; @@ -72,4 +72,4 @@ public class UnwrapLoadBalancers implements Function defineListLoadBalancersStrategy() { return CloudLoadBalancersListLoadBalancersStrategy.class; } -} \ No newline at end of file +} diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerContextModule.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerContextModule.java similarity index 94% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerContextModule.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerContextModule.java index 0c2a3864b5..f5a4c982d3 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerContextModule.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerContextModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.loadbalancer.config; +package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.config; import org.jclouds.loadbalancer.config.BaseLoadBalancerServiceContextModule; diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerServiceDependenciesModule.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerServiceDependenciesModule.java similarity index 84% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerServiceDependenciesModule.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerServiceDependenciesModule.java index dd118ebdb4..864f7845d0 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerServiceDependenciesModule.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerServiceDependenciesModule.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.loadbalancer.config; +package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.config; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.loadbalancer.functions.LoadBalancerToLoadBalancerMetadata; import org.jclouds.loadbalancer.domain.LoadBalancerMetadata; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.functions.LoadBalancerToLoadBalancerMetadata; import com.google.common.base.Function; import com.google.inject.AbstractModule; diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java similarity index 92% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java index 7576516519..8d039b7453 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.loadbalancer.functions; +package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.functions; import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.domain.VirtualIP; import org.jclouds.collect.Memoized; import org.jclouds.domain.Location; import org.jclouds.loadbalancer.domain.LoadBalancerMetadata; import org.jclouds.loadbalancer.domain.LoadBalancerType; import org.jclouds.loadbalancer.domain.internal.LoadBalancerMetadataImpl; import org.jclouds.location.predicates.LocationPredicates; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP; import com.google.common.base.Function; import com.google.common.base.Supplier; diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java similarity index 91% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java index d81902255b..10d22535a3 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.loadbalancer.strategy; +package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy; import static com.google.common.base.Preconditions.checkNotNull; @@ -25,12 +25,12 @@ import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient; import org.jclouds.loadbalancer.domain.LoadBalancerMetadata; import org.jclouds.loadbalancer.reference.LoadBalancerConstants; import org.jclouds.loadbalancer.strategy.DestroyLoadBalancerStrategy; import org.jclouds.loadbalancer.strategy.GetLoadBalancerMetadataStrategy; import org.jclouds.logging.Logger; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; /** * @@ -42,11 +42,11 @@ public class CloudLoadBalancersDestroyLoadBalancerStrategy implements DestroyLoa @Named(LoadBalancerConstants.LOADBALANCER_LOGGER) protected Logger logger = Logger.NULL; - private final CloudLoadBalancersClient client; + private final CloudLoadBalancersApi client; private final GetLoadBalancerMetadataStrategy getLoadBalancer; @Inject - protected CloudLoadBalancersDestroyLoadBalancerStrategy(CloudLoadBalancersClient client, + protected CloudLoadBalancersDestroyLoadBalancerStrategy(CloudLoadBalancersApi client, GetLoadBalancerMetadataStrategy getLoadBalancer) { this.client = checkNotNull(client, "client"); this.getLoadBalancer = checkNotNull(getLoadBalancer, "getLoadBalancer"); diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java similarity index 85% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java index 527124db83..a546d810ca 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.loadbalancer.strategy; +package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy; import static com.google.common.base.Preconditions.checkNotNull; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; import org.jclouds.loadbalancer.domain.LoadBalancerMetadata; import org.jclouds.loadbalancer.strategy.GetLoadBalancerMetadataStrategy; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; import com.google.common.base.Function; @@ -37,11 +37,11 @@ import com.google.common.base.Function; @Singleton public class CloudLoadBalancersGetLoadBalancerMetadataStrategy implements GetLoadBalancerMetadataStrategy { - private final org.jclouds.cloudloadbalancers.CloudLoadBalancersClient client; + private final org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi client; private final Function converter; @Inject - protected CloudLoadBalancersGetLoadBalancerMetadataStrategy(CloudLoadBalancersClient client, + protected CloudLoadBalancersGetLoadBalancerMetadataStrategy(CloudLoadBalancersApi client, Function converter) { this.client = checkNotNull(client, "client"); this.converter = checkNotNull(converter, "converter"); @@ -55,4 +55,4 @@ public class CloudLoadBalancersGetLoadBalancerMetadataStrategy implements GetLoa return converter.apply(client.getLoadBalancerClient(region).getLoadBalancer(lbId)); } -} \ No newline at end of file +} diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java similarity index 91% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java index 4c3288d02b..d47fbf16d2 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.loadbalancer.strategy; +package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.concat; @@ -33,13 +33,13 @@ import javax.inject.Named; import javax.inject.Singleton; import org.jclouds.Constants; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersAsyncClient; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; import org.jclouds.loadbalancer.domain.LoadBalancerMetadata; import org.jclouds.loadbalancer.reference.LoadBalancerConstants; import org.jclouds.loadbalancer.strategy.ListLoadBalancersStrategy; import org.jclouds.location.Zone; import org.jclouds.logging.Logger; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; import com.google.common.base.Function; import com.google.common.base.Supplier; @@ -55,13 +55,13 @@ public class CloudLoadBalancersListLoadBalancersStrategy implements ListLoadBala @Named(LoadBalancerConstants.LOADBALANCER_LOGGER) protected Logger logger = Logger.NULL; - private final CloudLoadBalancersAsyncClient aclient; + private final CloudLoadBalancersAsyncApi aclient; private final Function converter; private final ExecutorService executor; private final Supplier> zones; @Inject - protected CloudLoadBalancersListLoadBalancersStrategy(CloudLoadBalancersAsyncClient aclient, + protected CloudLoadBalancersListLoadBalancersStrategy(CloudLoadBalancersAsyncApi aclient, Function converter, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor, @Zone Supplier> zones) { this.aclient = checkNotNull(aclient, "aclient"); diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java similarity index 86% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java index 4f2696c6e3..9b35b0b067 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.loadbalancer.strategy; +package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy; import static com.google.common.base.Preconditions.checkNotNull; @@ -25,11 +25,6 @@ import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.domain.LoadBalancerRequest; -import org.jclouds.cloudloadbalancers.domain.NodeRequest; -import org.jclouds.cloudloadbalancers.domain.VirtualIP.Type; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.domain.Location; import org.jclouds.loadbalancer.domain.LoadBalancerMetadata; @@ -37,6 +32,11 @@ import org.jclouds.loadbalancer.reference.LoadBalancerConstants; import org.jclouds.loadbalancer.strategy.GetLoadBalancerMetadataStrategy; import org.jclouds.loadbalancer.strategy.LoadBalanceNodesStrategy; import org.jclouds.logging.Logger; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP.Type; import com.google.common.base.Function; import com.google.common.collect.Iterables; @@ -50,11 +50,11 @@ public class CloudLoadBalancersLoadBalanceNodesStrategy implements LoadBalanceNo @Resource @Named(LoadBalancerConstants.LOADBALANCER_LOGGER) protected Logger logger = Logger.NULL; - protected final CloudLoadBalancersClient client; + protected final CloudLoadBalancersApi client; protected final GetLoadBalancerMetadataStrategy getLB; @Inject - protected CloudLoadBalancersLoadBalanceNodesStrategy(CloudLoadBalancersClient client, + protected CloudLoadBalancersLoadBalanceNodesStrategy(CloudLoadBalancersApi client, GetLoadBalancerMetadataStrategy getLB) { this.client = checkNotNull(client, "client"); this.getLB = checkNotNull(getLB, "getLB"); diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/location/RegionUrisFromPropertiesAndAccountIDPathSuffix.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/location/RegionUrisFromPropertiesAndAccountIDPathSuffix.java similarity index 92% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/location/RegionUrisFromPropertiesAndAccountIDPathSuffix.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/location/RegionUrisFromPropertiesAndAccountIDPathSuffix.java index 020b65acfc..6c54c33049 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/location/RegionUrisFromPropertiesAndAccountIDPathSuffix.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/location/RegionUrisFromPropertiesAndAccountIDPathSuffix.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.location; +package org.jclouds.rackspace.cloudloadbalancers.location; import java.net.URI; import java.util.Map; @@ -25,11 +25,11 @@ import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.cloudloadbalancers.functions.AppendAccountIdToURI; import org.jclouds.config.ValueOfConfigurationKeyOrNull; import org.jclouds.location.Provider; import org.jclouds.location.Region; import org.jclouds.location.suppliers.fromconfig.RegionIdToURIFromConfigurationOrDefaultToProvider; +import org.jclouds.rackspace.cloudloadbalancers.functions.AppendAccountIdToURI; import com.google.common.base.Supplier; import com.google.common.collect.Maps; @@ -50,4 +50,4 @@ public class RegionUrisFromPropertiesAndAccountIDPathSuffix extends RegionIdToUR public Map> get() { return Maps.transformValues(super.get(), filter); } -} \ No newline at end of file +} diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/options/ListOptions.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/options/ListOptions.java similarity index 97% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/options/ListOptions.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/options/ListOptions.java index ba7a03b84e..90f53702c3 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/options/ListOptions.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/options/ListOptions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.options; +package org.jclouds.rackspace.cloudloadbalancers.options; import static com.google.common.base.Preconditions.checkArgument; diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/predicates/LoadBalancerActive.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/predicates/LoadBalancerActive.java similarity index 84% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/predicates/LoadBalancerActive.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/predicates/LoadBalancerActive.java index dc62b2970e..8381615698 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/predicates/LoadBalancerActive.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/predicates/LoadBalancerActive.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.predicates; +package org.jclouds.rackspace.cloudloadbalancers.predicates; import static com.google.common.base.Preconditions.checkNotNull; import javax.annotation.Resource; import javax.inject.Singleton; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status; import org.jclouds.logging.Logger; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status; import com.google.common.base.Predicate; import com.google.inject.Inject; @@ -40,13 +40,13 @@ import com.google.inject.Inject; @Singleton public class LoadBalancerActive implements Predicate { - private final CloudLoadBalancersClient client; + private final CloudLoadBalancersApi client; @Resource protected Logger logger = Logger.NULL; @Inject - public LoadBalancerActive(CloudLoadBalancersClient client) { + public LoadBalancerActive(CloudLoadBalancersApi client) { this.client = client; } diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/predicates/LoadBalancerDeleted.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/predicates/LoadBalancerDeleted.java similarity index 83% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/predicates/LoadBalancerDeleted.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/predicates/LoadBalancerDeleted.java index cc776ac49c..6ef84ce02a 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/predicates/LoadBalancerDeleted.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/predicates/LoadBalancerDeleted.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.predicates; +package org.jclouds.rackspace.cloudloadbalancers.predicates; import static com.google.common.base.Preconditions.checkNotNull; import javax.annotation.Resource; import javax.inject.Singleton; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status; import org.jclouds.logging.Logger; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status; import com.google.common.base.Predicate; import com.google.inject.Inject; @@ -40,13 +40,13 @@ import com.google.inject.Inject; @Singleton public class LoadBalancerDeleted implements Predicate { - private final CloudLoadBalancersClient client; + private final CloudLoadBalancersApi client; @Resource protected Logger logger = Logger.NULL; @Inject - public LoadBalancerDeleted(CloudLoadBalancersClient client) { + public LoadBalancerDeleted(CloudLoadBalancersApi client) { this.client = client; } diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/reference/RackspaceConstants.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/reference/RackspaceConstants.java similarity index 94% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/reference/RackspaceConstants.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/reference/RackspaceConstants.java index 08c428de6a..9570dd3ffc 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/reference/RackspaceConstants.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/reference/RackspaceConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.reference; +package org.jclouds.rackspace.cloudloadbalancers.reference; /** * Configuration properties and constants used in rackspace connections. diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/reference/Region.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/reference/Region.java similarity index 97% rename from apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/reference/Region.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/reference/Region.java index b0d40cae6f..ac8f9c5a9d 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/reference/Region.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/reference/Region.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.reference; +package org.jclouds.rackspace.cloudloadbalancers.reference; diff --git a/apis/rackspace-cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/rackspace-cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata new file mode 100644 index 0000000000..1ca06c4162 --- /dev/null +++ b/apis/rackspace-cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata @@ -0,0 +1 @@ +org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata \ No newline at end of file diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersApiMetadataTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadataTest.java similarity index 90% rename from apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersApiMetadataTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadataTest.java index a31007e3d9..38f2be6597 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersApiMetadataTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadataTest.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers; import org.jclouds.loadbalancer.internal.BaseLoadBalancerServiceApiMetadataTest; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata; import org.testng.annotations.Test; /** diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/LoadBalancerClientLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerClientLiveTest.java similarity index 92% rename from apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/LoadBalancerClientLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerClientLiveTest.java index 397195613c..aafe00bfb3 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/LoadBalancerClientLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerClientLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.features; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -25,12 +25,12 @@ import static org.testng.Assert.assertTrue; import java.util.Set; import java.util.logging.Logger; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.domain.LoadBalancerAttributes; -import org.jclouds.cloudloadbalancers.domain.LoadBalancerRequest; -import org.jclouds.cloudloadbalancers.domain.NodeRequest; -import org.jclouds.cloudloadbalancers.domain.VirtualIP.Type; -import org.jclouds.cloudloadbalancers.internal.BaseCloudLoadBalancersClientLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerAttributes; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP.Type; +import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersClientLiveTest; import org.testng.annotations.AfterGroups; import org.testng.annotations.Test; diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/LoadBalancerExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerExpectTest.java similarity index 86% rename from apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/LoadBalancerExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerExpectTest.java index fe24a31381..2bfed4cdc6 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/LoadBalancerExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.features; import static org.testng.Assert.assertEquals; @@ -25,16 +25,17 @@ import java.util.Set; import javax.ws.rs.core.MediaType; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.domain.LoadBalancerAttributes; -import org.jclouds.cloudloadbalancers.domain.LoadBalancerRequest; -import org.jclouds.cloudloadbalancers.domain.NodeRequest; -import org.jclouds.cloudloadbalancers.domain.VirtualIP; -import org.jclouds.cloudloadbalancers.functions.UnwrapLoadBalancerTest; -import org.jclouds.cloudloadbalancers.functions.UnwrapLoadBalancersTest; -import org.jclouds.cloudloadbalancers.internal.BaseCloudLoadBalancerExpectTest; import org.jclouds.http.HttpResponse; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerAttributes; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP; +import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerClient; +import org.jclouds.rackspace.cloudloadbalancers.functions.UnwrapLoadBalancerTest; +import org.jclouds.rackspace.cloudloadbalancers.functions.UnwrapLoadBalancersTest; +import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancerExpectTest; import org.testng.annotations.Test; import com.google.common.collect.Sets; @@ -43,7 +44,7 @@ import com.google.common.collect.Sets; * @author Everett Toews */ @Test(groups = "unit") -public class LoadBalancerExpectTest extends BaseCloudLoadBalancerExpectTest { +public class LoadBalancerExpectTest extends BaseCloudLoadBalancerExpectTest { public void testListLoadBalancers() { URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers"); diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/NodeClientLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeClientLiveTest.java similarity index 85% rename from apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/NodeClientLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeClientLiveTest.java index 75c86d8dd4..1d86d654f6 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/NodeClientLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeClientLiveTest.java @@ -16,28 +16,30 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.features; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.Map.Entry; import java.util.logging.Logger; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.domain.LoadBalancerRequest; -import org.jclouds.cloudloadbalancers.domain.Node; -import org.jclouds.cloudloadbalancers.domain.NodeAttributes; -import org.jclouds.cloudloadbalancers.domain.NodeRequest; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status; -import org.jclouds.cloudloadbalancers.domain.VirtualIP.Type; -import org.jclouds.cloudloadbalancers.internal.BaseCloudLoadBalancersClientLiveTest; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Maps; + +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.domain.Node; +import org.jclouds.rackspace.cloudloadbalancers.domain.NodeAttributes; +import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status; +import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP.Type; +import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerClient; +import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersClientLiveTest; import org.testng.annotations.AfterGroups; import org.testng.annotations.Test; @@ -48,7 +50,7 @@ import org.testng.annotations.Test; */ @Test(groups = "live", singleThreaded = true, testName = "NodeClientLiveTest") public class NodeClientLiveTest extends BaseCloudLoadBalancersClientLiveTest { - private Map> nodes = new HashMap>(); + private Map> nodes = Maps.newHashMap(); public void testCreateLoadBalancers() { assertTrue(client.getConfiguredZones().size() > 0, "Need to have some zones!"); @@ -70,7 +72,7 @@ public class NodeClientLiveTest extends BaseCloudLoadBalancersClientLiveTest { String region = lb.getRegion(); Logger.getAnonymousLogger().info("starting node on loadbalancer " + lb.getId() + " in region " + region); Set newNodes = client.getNodeClient(region).createNodesInLoadBalancer( - Collections. singleton(NodeRequest.builder().address("192.168.1.2").port(8080).build()), + ImmutableSet. of(NodeRequest.builder().address("192.168.1.2").port(8080).build()), lb.getId()); for (Node n : newNodes) { diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/NodeExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeExpectTest.java similarity index 93% rename from apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/NodeExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeExpectTest.java index aa9d080cfe..e2947f8504 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/NodeExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.features; import static org.testng.Assert.assertEquals; @@ -25,12 +25,13 @@ import java.util.Set; import javax.ws.rs.core.MediaType; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient; -import org.jclouds.cloudloadbalancers.domain.Node; -import org.jclouds.cloudloadbalancers.domain.NodeAttributes; -import org.jclouds.cloudloadbalancers.domain.NodeRequest; -import org.jclouds.cloudloadbalancers.internal.BaseCloudLoadBalancerExpectTest; import org.jclouds.http.HttpResponse; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.domain.Node; +import org.jclouds.rackspace.cloudloadbalancers.domain.NodeAttributes; +import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.features.NodeClient; +import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancerExpectTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; @@ -40,7 +41,7 @@ import com.google.common.collect.ImmutableSortedSet; * @author Everett Toews */ @Test(groups = "unit") -public class NodeExpectTest extends BaseCloudLoadBalancerExpectTest { +public class NodeExpectTest extends BaseCloudLoadBalancerExpectTest { public void testListNodes() { URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/nodes"); diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java similarity index 85% rename from apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java index 86c4f531ed..0b4a19a8f1 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java @@ -16,16 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.functions; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.domain.Node; -import org.jclouds.cloudloadbalancers.domain.VirtualIP; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status; -import org.jclouds.cloudloadbalancers.domain.VirtualIP.IPVersion; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.http.HttpResponse; import org.jclouds.json.BaseItemParserTest; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.Node; +import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status; +import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP.IPVersion; +import org.jclouds.rackspace.cloudloadbalancers.functions.ConvertLB; +import org.jclouds.rackspace.cloudloadbalancers.functions.UnwrapLoadBalancer; import org.testng.annotations.Test; import com.google.common.base.Function; diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancerWhenDeletedTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancerWhenDeletedTest.java similarity index 86% rename from apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancerWhenDeletedTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancerWhenDeletedTest.java index fd7e7a74fc..5056667794 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancerWhenDeletedTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancerWhenDeletedTest.java @@ -16,13 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.functions; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.http.HttpResponse; import org.jclouds.json.BaseItemParserTest; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status; +import org.jclouds.rackspace.cloudloadbalancers.functions.ConvertLB; +import org.jclouds.rackspace.cloudloadbalancers.functions.UnwrapLoadBalancer; import org.testng.annotations.Test; import com.google.common.base.Function; diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java similarity index 89% rename from apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java index 346731e94c..f238fb25d0 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java @@ -16,16 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.functions; import java.util.Set; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.domain.VirtualIP; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.http.HttpResponse; import org.jclouds.json.BaseSetParserTest; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status; +import org.jclouds.rackspace.cloudloadbalancers.functions.ConvertLB; +import org.jclouds.rackspace.cloudloadbalancers.functions.UnwrapLoadBalancers; import org.testng.annotations.Test; import com.google.common.base.Function; diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java similarity index 91% rename from apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java index e3c4e32e1b..93dd780a25 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java @@ -16,11 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.handlers; +package org.jclouds.rackspace.cloudloadbalancers.handlers; import java.net.URI; import org.jclouds.http.handlers.BaseHttpErrorHandlerTest; +import org.jclouds.rackspace.cloudloadbalancers.handlers.ParseCloudLoadBalancersErrorFromHttpResponse; import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/internal/BaseCloudLoadBalancerExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancerExpectTest.java similarity index 97% rename from apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/internal/BaseCloudLoadBalancerExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancerExpectTest.java index e674e446a7..a74e4b16f8 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/internal/BaseCloudLoadBalancerExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancerExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.internal; +package org.jclouds.rackspace.cloudloadbalancers.internal; import javax.ws.rs.core.MediaType; diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/internal/BaseCloudLoadBalancersClientLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancersClientLiveTest.java similarity index 79% rename from apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/internal/BaseCloudLoadBalancersClientLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancersClientLiveTest.java index f76a40b562..449b3b8459 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/internal/BaseCloudLoadBalancersClientLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancersClientLiveTest.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.internal; +package org.jclouds.rackspace.cloudloadbalancers.internal; import java.util.Properties; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.jclouds.apis.BaseContextLiveTest; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersApiMetadata; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersAsyncClient; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient; -import org.jclouds.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.cloudloadbalancers.predicates.LoadBalancerActive; -import org.jclouds.cloudloadbalancers.predicates.LoadBalancerDeleted; import org.jclouds.logging.slf4j.config.SLF4JLoggingModule; import org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties; import org.jclouds.predicates.RetryablePredicate; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerActive; +import org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerDeleted; import org.jclouds.rest.RestContext; import org.testng.annotations.BeforeGroups; @@ -45,13 +45,13 @@ import com.google.inject.Injector; * * @author Adrian Cole */ -public class BaseCloudLoadBalancersClientLiveTest extends BaseContextLiveTest> { +public class BaseCloudLoadBalancersClientLiveTest extends BaseContextLiveTest> { public BaseCloudLoadBalancersClientLiveTest() { provider = "cloudloadbalancers"; } - protected CloudLoadBalancersClient client; + protected CloudLoadBalancersApi client; protected Predicate socketTester; protected RetryablePredicate loadBalancerActive; protected RetryablePredicate loadBalancerDeleted; @@ -85,7 +85,7 @@ public class BaseCloudLoadBalancersClientLiveTest extends BaseContextLiveTest> contextType() { + protected TypeToken> contextType() { return CloudLoadBalancersApiMetadata.CONTEXT_TOKEN; } } diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/options/ListOptionsTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/options/ListOptionsTest.java similarity index 85% rename from apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/options/ListOptionsTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/options/ListOptionsTest.java index bd91e252b1..8e237d49e7 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/options/ListOptionsTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/options/ListOptionsTest.java @@ -16,12 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.cloudloadbalancers.options; +package org.jclouds.rackspace.cloudloadbalancers.options; -import static org.jclouds.cloudloadbalancers.options.ListOptions.Builder.limit; -import static org.jclouds.cloudloadbalancers.options.ListOptions.Builder.marker; +import static org.jclouds.rackspace.cloudloadbalancers.options.ListOptions.Builder.limit; +import static org.jclouds.rackspace.cloudloadbalancers.options.ListOptions.Builder.marker; import static org.testng.Assert.assertEquals; +import org.jclouds.rackspace.cloudloadbalancers.options.ListOptions; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; diff --git a/apis/cloudloadbalancers/src/test/resources/loadbalancer-create.json b/apis/rackspace-cloudloadbalancers/src/test/resources/loadbalancer-create.json similarity index 100% rename from apis/cloudloadbalancers/src/test/resources/loadbalancer-create.json rename to apis/rackspace-cloudloadbalancers/src/test/resources/loadbalancer-create.json diff --git a/apis/cloudloadbalancers/src/test/resources/loadbalancer-get-deleted.json b/apis/rackspace-cloudloadbalancers/src/test/resources/loadbalancer-get-deleted.json similarity index 100% rename from apis/cloudloadbalancers/src/test/resources/loadbalancer-get-deleted.json rename to apis/rackspace-cloudloadbalancers/src/test/resources/loadbalancer-get-deleted.json diff --git a/apis/cloudloadbalancers/src/test/resources/loadbalancer-get.json b/apis/rackspace-cloudloadbalancers/src/test/resources/loadbalancer-get.json similarity index 100% rename from apis/cloudloadbalancers/src/test/resources/loadbalancer-get.json rename to apis/rackspace-cloudloadbalancers/src/test/resources/loadbalancer-get.json diff --git a/apis/cloudloadbalancers/src/test/resources/loadbalancer-update.json b/apis/rackspace-cloudloadbalancers/src/test/resources/loadbalancer-update.json similarity index 100% rename from apis/cloudloadbalancers/src/test/resources/loadbalancer-update.json rename to apis/rackspace-cloudloadbalancers/src/test/resources/loadbalancer-update.json diff --git a/apis/cloudloadbalancers/src/test/resources/loadbalancers-list.json b/apis/rackspace-cloudloadbalancers/src/test/resources/loadbalancers-list.json similarity index 100% rename from apis/cloudloadbalancers/src/test/resources/loadbalancers-list.json rename to apis/rackspace-cloudloadbalancers/src/test/resources/loadbalancers-list.json diff --git a/apis/cloudloadbalancers/src/test/resources/node-get.json b/apis/rackspace-cloudloadbalancers/src/test/resources/node-get.json similarity index 100% rename from apis/cloudloadbalancers/src/test/resources/node-get.json rename to apis/rackspace-cloudloadbalancers/src/test/resources/node-get.json diff --git a/apis/cloudloadbalancers/src/test/resources/node-update.json b/apis/rackspace-cloudloadbalancers/src/test/resources/node-update.json similarity index 100% rename from apis/cloudloadbalancers/src/test/resources/node-update.json rename to apis/rackspace-cloudloadbalancers/src/test/resources/node-update.json diff --git a/apis/cloudloadbalancers/src/test/resources/nodes-add.json b/apis/rackspace-cloudloadbalancers/src/test/resources/nodes-add.json similarity index 100% rename from apis/cloudloadbalancers/src/test/resources/nodes-add.json rename to apis/rackspace-cloudloadbalancers/src/test/resources/nodes-add.json diff --git a/apis/cloudloadbalancers/src/test/resources/nodes-list.json b/apis/rackspace-cloudloadbalancers/src/test/resources/nodes-list.json similarity index 100% rename from apis/cloudloadbalancers/src/test/resources/nodes-list.json rename to apis/rackspace-cloudloadbalancers/src/test/resources/nodes-list.json diff --git a/providers/cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 1b6ed19515..0000000000 --- a/providers/cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersUKProviderMetadata diff --git a/providers/cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 99b72e7792..0000000000 --- a/providers/cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersUSProviderMetadata diff --git a/providers/pom.xml b/providers/pom.xml index 2eb792d7e0..ff6f876f16 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -39,17 +39,13 @@ azureblob aws-s3 aws-ec2 + aws-sqs + aws-cloudwatch synaptic-storage ninefold-storage cloudonestorage eucalyptus-partnercloud-s3 eucalyptus-partnercloud-ec2 - cloudservers-us - cloudservers-uk - cloudfiles-us - cloudfiles-uk - cloudloadbalancers-us - cloudloadbalancers-uk bluelock-vcloud-zone01 stratogen-vcloud-mycloud trmk-ecloud @@ -64,18 +60,22 @@ serverlove-z1-man skalicloud-sdg-my greenhousedata-element-vcloud - aws-cloudwatch go2cloud-jhb1 softlayer ninefold-compute hpcloud-compute hpcloud-objectstorage trystack-nova + cloudservers-us + cloudservers-uk + cloudfiles-us + cloudfiles-uk + rackspace-cloudloadbalancers-us + rackspace-cloudloadbalancers-uk rackspace-cloudservers-us rackspace-cloudservers-uk rackspace-cloudblockstorage-us rackspace-cloudblockstorage-uk - aws-sqs glesys diff --git a/providers/cloudloadbalancers-uk/pom.xml b/providers/rackspace-cloudloadbalancers-uk/pom.xml similarity index 71% rename from providers/cloudloadbalancers-uk/pom.xml rename to providers/rackspace-cloudloadbalancers-uk/pom.xml index a2723f4269..b09b170485 100644 --- a/providers/cloudloadbalancers-uk/pom.xml +++ b/providers/rackspace-cloudloadbalancers-uk/pom.xml @@ -28,19 +28,19 @@ ../../project/pom.xml org.jclouds.provider - cloudloadbalancers-uk - jclouds CloudLoadBalancers UK provider - LoadBalancer implementation targeted to Rackspace UK + rackspace-cloudloadbalancers-uk + jclouds Rackspace Cloud Load Balancers UK provider + Cloud Load Balancers implementation targeted to Rackspace UK bundle - https://lon.identity.api.rackspacecloud.com/v2.0/ - 1 - - ${test.rackspace-uk.identity} - ${test.rackspace-uk.credential} + https://lon.identity.api.rackspacecloud.com/v2.0/ + 1 + + ${test.rackspace-uk.identity} + ${test.rackspace-uk.credential} - org.jclouds.rackspace.cloudloadbalancers*;version="${project.version}" + org.jclouds.rackspace.cloudloadbalancers.uk*;version="${project.version}" org.jclouds*;version="${project.version}",* @@ -52,7 +52,7 @@ org.jclouds.api - cloudloadbalancers + rackspace-cloudloadbalancers ${project.version} @@ -81,7 +81,7 @@ org.jclouds.api - cloudloadbalancers + rackspace-cloudloadbalancers ${project.version} test-jar test @@ -123,11 +123,11 @@ - ${test.cloudloadbalancers-uk.endpoint} - ${test.cloudloadbalancers-uk.api-version} - ${test.cloudloadbalancers-uk.build-version} - ${test.cloudloadbalancers-uk.identity} - ${test.cloudloadbalancers-uk.credential} + ${test.rackspace-cloudloadbalancers-uk.endpoint} + ${test.rackspace-cloudloadbalancers-uk.api-version} + ${test.rackspace-cloudloadbalancers-uk.build-version} + ${test.rackspace-cloudloadbalancers-uk.identity} + ${test.rackspace-cloudloadbalancers-uk.credential} ${test.jclouds.keystone.credential-type} diff --git a/providers/cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKProviderMetadata.java b/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java similarity index 91% rename from providers/cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKProviderMetadata.java rename to providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java index 3f0757ccb7..d633e11d14 100644 --- a/providers/cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKProviderMetadata.java +++ b/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers.uk; -import static org.jclouds.cloudloadbalancers.reference.Region.LON; import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE; import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES; +import static org.jclouds.rackspace.cloudloadbalancers.reference.Region.LON; import java.net.URI; import java.util.Properties; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersApiMetadata; -import org.jclouds.cloudloadbalancers.config.CloudLoadBalancersRestClientModule; -import org.jclouds.cloudloadbalancers.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule; import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata; +import org.jclouds.rackspace.cloudloadbalancers.config.CloudLoadBalancersRestClientModule; +import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; diff --git a/providers/rackspace-cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata new file mode 100644 index 0000000000..49592e1b95 --- /dev/null +++ b/providers/rackspace-cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata @@ -0,0 +1 @@ +org.jclouds.rackspace.cloudloadbalancers.uk.CloudLoadBalancersUKProviderMetadata diff --git a/providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKLoadBalancerClientLiveTest.java b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKLoadBalancerClientLiveTest.java similarity index 89% rename from providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKLoadBalancerClientLiveTest.java rename to providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKLoadBalancerClientLiveTest.java index ce9cdd6742..3ada4ca63d 100644 --- a/providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKLoadBalancerClientLiveTest.java +++ b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKLoadBalancerClientLiveTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers.uk; -import org.jclouds.cloudloadbalancers.features.LoadBalancerClientLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerClientLiveTest; import org.testng.annotations.Test; /** diff --git a/providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKNodeClientLiveTest.java b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKNodeClientLiveTest.java similarity index 89% rename from providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKNodeClientLiveTest.java rename to providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKNodeClientLiveTest.java index 7f17b39bf6..d58f90306d 100644 --- a/providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKNodeClientLiveTest.java +++ b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKNodeClientLiveTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers.uk; -import org.jclouds.cloudloadbalancers.features.NodeClientLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.features.NodeClientLiveTest; import org.testng.annotations.Test; /** diff --git a/providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKProviderTest.java b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderTest.java similarity index 84% rename from providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKProviderTest.java rename to providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderTest.java index 74a50dd55f..73444c71ae 100644 --- a/providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKProviderTest.java +++ b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderTest.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers.uk; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersApiMetadata; import org.jclouds.providers.internal.BaseProviderMetadataTest; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata; +import org.jclouds.rackspace.cloudloadbalancers.uk.CloudLoadBalancersUKProviderMetadata; import org.testng.annotations.Test; /** @@ -32,4 +33,4 @@ public class CloudLoadBalancersUKProviderTest extends BaseProviderMetadataTest { public CloudLoadBalancersUKProviderTest() { super(new CloudLoadBalancersUKProviderMetadata(), new CloudLoadBalancersApiMetadata()); } -} \ No newline at end of file +} diff --git a/providers/cloudloadbalancers-us/pom.xml b/providers/rackspace-cloudloadbalancers-us/pom.xml similarity index 71% rename from providers/cloudloadbalancers-us/pom.xml rename to providers/rackspace-cloudloadbalancers-us/pom.xml index f35e51e0cc..7dbc5866f2 100644 --- a/providers/cloudloadbalancers-us/pom.xml +++ b/providers/rackspace-cloudloadbalancers-us/pom.xml @@ -28,19 +28,19 @@ ../../project/pom.xml org.jclouds.provider - cloudloadbalancers-us - jclouds CloudLoadBalancers US provider - LoadBalancer implementation targeted to Rackspace US + rackspace-cloudloadbalancers-us + jclouds Rackspace Cloud Load Balancers US provider + Cloud Load Balancers implementation targeted to Rackspace US bundle - https://identity.api.rackspacecloud.com/v2.0/ - 1 - - ${test.rackspace-us.identity} - ${test.rackspace-us.credential} + https://identity.api.rackspacecloud.com/v2.0/ + 1 + + ${test.rackspace-us.identity} + ${test.rackspace-us.credential} - org.jclouds.rackspace.cloudloadbalancers*;version="${project.version}" + org.jclouds.rackspace.cloudloadbalancers.us*;version="${project.version}" org.jclouds*;version="${project.version}",* @@ -52,7 +52,7 @@ org.jclouds.api - cloudloadbalancers + rackspace-cloudloadbalancers ${project.version} @@ -81,7 +81,7 @@ org.jclouds.api - cloudloadbalancers + rackspace-cloudloadbalancers ${project.version} test-jar test @@ -123,11 +123,11 @@ - ${test.cloudloadbalancers-us.endpoint} - ${test.cloudloadbalancers-us.api-version} - ${test.cloudloadbalancers-us.build-version} - ${test.cloudloadbalancers-us.identity} - ${test.cloudloadbalancers-us.credential} + ${test.rackspace-cloudloadbalancers-us.endpoint} + ${test.rackspace-cloudloadbalancers-us.api-version} + ${test.rackspace-cloudloadbalancers-us.build-version} + ${test.rackspace-cloudloadbalancers-us.identity} + ${test.rackspace-cloudloadbalancers-us.credential} ${test.jclouds.keystone.credential-type} diff --git a/providers/cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSProviderMetadata.java b/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java similarity index 92% rename from providers/cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSProviderMetadata.java rename to providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java index 9f1de88406..402a2f1495 100644 --- a/providers/cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSProviderMetadata.java +++ b/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers.us; import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE; @@ -25,13 +25,13 @@ import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES; import java.net.URI; import java.util.Properties; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersApiMetadata; -import org.jclouds.cloudloadbalancers.config.CloudLoadBalancersRestClientModule; -import org.jclouds.cloudloadbalancers.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule; import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata; +import org.jclouds.rackspace.cloudloadbalancers.config.CloudLoadBalancersRestClientModule; +import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; diff --git a/providers/rackspace-cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata new file mode 100644 index 0000000000..ae58e28099 --- /dev/null +++ b/providers/rackspace-cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata @@ -0,0 +1 @@ +org.jclouds.rackspace.cloudloadbalancers.us.CloudLoadBalancersUSProviderMetadata diff --git a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSLoadBalancerClientLiveTest.java b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSLoadBalancerClientLiveTest.java similarity index 89% rename from providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSLoadBalancerClientLiveTest.java rename to providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSLoadBalancerClientLiveTest.java index 9b85f31804..5fd790f617 100644 --- a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSLoadBalancerClientLiveTest.java +++ b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSLoadBalancerClientLiveTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers.us; -import org.jclouds.cloudloadbalancers.features.LoadBalancerClientLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerClientLiveTest; import org.testng.annotations.Test; /** diff --git a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSNodeClientLiveTest.java b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSNodeClientLiveTest.java similarity index 89% rename from providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSNodeClientLiveTest.java rename to providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSNodeClientLiveTest.java index f56a941a58..0eeefb2971 100644 --- a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSNodeClientLiveTest.java +++ b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSNodeClientLiveTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers.us; -import org.jclouds.cloudloadbalancers.features.NodeClientLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.features.NodeClientLiveTest; import org.testng.annotations.Test; /** diff --git a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSProviderTest.java b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderTest.java similarity index 84% rename from providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSProviderTest.java rename to providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderTest.java index 544d8ca23e..9ccf5086f4 100644 --- a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSProviderTest.java +++ b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderTest.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers.us; -import org.jclouds.cloudloadbalancers.CloudLoadBalancersApiMetadata; import org.jclouds.providers.internal.BaseProviderMetadataTest; +import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata; +import org.jclouds.rackspace.cloudloadbalancers.us.CloudLoadBalancersUSProviderMetadata; import org.testng.annotations.Test; /** @@ -32,4 +33,4 @@ public class CloudLoadBalancersUSProviderTest extends BaseProviderMetadataTest { public CloudLoadBalancersUSProviderTest() { super(new CloudLoadBalancersUSProviderMetadata(), new CloudLoadBalancersApiMetadata()); } -} \ No newline at end of file +}