diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java similarity index 82% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java index ba36b209cf..f60fa2b306 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers.v1; import java.util.Set; import javax.ws.rs.Path; @@ -25,24 +25,24 @@ import javax.ws.rs.PathParam; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Zone; import org.jclouds.location.functions.ZoneToEndpoint; -import org.jclouds.rackspace.cloudloadbalancers.features.AccessRuleApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ConnectionApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ContentCachingApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ErrorPageApi; -import org.jclouds.rackspace.cloudloadbalancers.features.HealthMonitorApi; -import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerApi; -import org.jclouds.rackspace.cloudloadbalancers.features.NodeApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ReportApi; -import org.jclouds.rackspace.cloudloadbalancers.features.SSLTerminationApi; -import org.jclouds.rackspace.cloudloadbalancers.features.SessionPersistenceApi; -import org.jclouds.rackspace.cloudloadbalancers.features.VirtualIPApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.AccessRuleApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ConnectionApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ContentCachingApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ErrorPageApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.HealthMonitorApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.NodeApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ReportApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.SSLTerminationApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.SessionPersistenceApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.VirtualIPApi; import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.EndpointParam; import com.google.inject.Provides; /** - * Provides synchronous access to CloudLoadBalancers. + * Provides synchronous access to Rackspace Cloud Load Balancers. *

* * @see CloudLoadBalancersAsyncApi diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadata.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java similarity index 93% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadata.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java index e1535f72c5..2a0a1b5e72 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadata.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers.v1; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; import static org.jclouds.reflect.Reflection2.typeToken; @@ -30,8 +30,8 @@ import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.Z 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.rackspace.cloudloadbalancers.v1.config.CloudLoadBalancersRestClientModule; +import org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule; import org.jclouds.rest.RestContext; import org.jclouds.rest.internal.BaseRestApiMetadata; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersAsyncApi.java similarity index 81% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersAsyncApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersAsyncApi.java index 46a9f58940..9ff160e8bd 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersAsyncApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers.v1; import java.util.Set; @@ -26,24 +26,24 @@ import javax.ws.rs.PathParam; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Zone; import org.jclouds.location.functions.ZoneToEndpoint; -import org.jclouds.rackspace.cloudloadbalancers.features.AccessRuleAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ConnectionAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ContentCachingAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ErrorPageAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.HealthMonitorAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.NodeAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ReportAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.SSLTerminationAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.SessionPersistenceAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.VirtualIPAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.AccessRuleAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ConnectionAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ContentCachingAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ErrorPageAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.HealthMonitorAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.NodeAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ReportAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.SSLTerminationAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.SessionPersistenceAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.VirtualIPAsyncApi; import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.EndpointParam; import com.google.inject.Provides; /** - * Provides asynchronous access to CloudLoadBalancers via their REST API. + * Provides asynchronous access to Rackspace Cloud Load Balancers. *

* * @see CloudLoadBalancersApi diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/binders/BindMetadataToJsonPayload.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/binders/BindMetadataToJsonPayload.java similarity index 97% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/binders/BindMetadataToJsonPayload.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/binders/BindMetadataToJsonPayload.java index bab05340f6..39d8a0c0f6 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/binders/BindMetadataToJsonPayload.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/binders/BindMetadataToJsonPayload.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.binders; +package org.jclouds.rackspace.cloudloadbalancers.v1.binders; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/config/CloudLoadBalancersRestClientModule.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/config/CloudLoadBalancersRestClientModule.java similarity index 60% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/config/CloudLoadBalancersRestClientModule.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/config/CloudLoadBalancersRestClientModule.java index 946f822689..921ba16442 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/config/CloudLoadBalancersRestClientModule.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/config/CloudLoadBalancersRestClientModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.config; +package org.jclouds.rackspace.cloudloadbalancers.v1.config; import java.util.Map; @@ -26,32 +26,32 @@ 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.AccessRuleApi; -import org.jclouds.rackspace.cloudloadbalancers.features.AccessRuleAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ConnectionApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ConnectionAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ContentCachingApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ContentCachingAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ErrorPageApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ErrorPageAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.HealthMonitorApi; -import org.jclouds.rackspace.cloudloadbalancers.features.HealthMonitorAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerApi; -import org.jclouds.rackspace.cloudloadbalancers.features.NodeAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.NodeApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ReportApi; -import org.jclouds.rackspace.cloudloadbalancers.features.ReportAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.SSLTerminationApi; -import org.jclouds.rackspace.cloudloadbalancers.features.SSLTerminationAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.SessionPersistenceApi; -import org.jclouds.rackspace.cloudloadbalancers.features.SessionPersistenceAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.features.VirtualIPApi; -import org.jclouds.rackspace.cloudloadbalancers.features.VirtualIPAsyncApi; -import org.jclouds.rackspace.cloudloadbalancers.functions.ConvertLB; -import org.jclouds.rackspace.cloudloadbalancers.handlers.ParseCloudLoadBalancersErrorFromHttpResponse; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.AccessRuleApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.AccessRuleAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ConnectionApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ConnectionAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ContentCachingApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ContentCachingAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ErrorPageApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ErrorPageAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.HealthMonitorApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.HealthMonitorAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.NodeApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.NodeAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ReportApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ReportAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.SSLTerminationApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.SSLTerminationAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.SessionPersistenceApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.SessionPersistenceAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.VirtualIPApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.VirtualIPAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ConvertLB; +import org.jclouds.rackspace.cloudloadbalancers.v1.handlers.ParseCloudLoadBalancersErrorFromHttpResponse; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.config.RestClientModule; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/AccessRule.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRule.java similarity index 98% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/AccessRule.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRule.java index 6148057b67..f734447099 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/AccessRule.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/AccessRuleWithId.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRuleWithId.java similarity index 96% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/AccessRuleWithId.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRuleWithId.java index 2801c6c1c9..95bcad2f5b 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/AccessRuleWithId.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRuleWithId.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/AccountUsage.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccountUsage.java similarity index 98% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/AccountUsage.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccountUsage.java index c3c3e9c754..2c65f2bdef 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/AccountUsage.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccountUsage.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/ConnectionThrottle.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/ConnectionThrottle.java similarity index 98% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/ConnectionThrottle.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/ConnectionThrottle.java index cd6c0cdd4a..a7ea316c83 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/ConnectionThrottle.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/ConnectionThrottle.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkArgument; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/HealthMonitor.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HealthMonitor.java similarity index 99% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/HealthMonitor.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HealthMonitor.java index 9c5960a3cc..bc99db2e96 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/HealthMonitor.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HealthMonitor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/HistoricalUsage.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HistoricalUsage.java similarity index 97% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/HistoricalUsage.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HistoricalUsage.java index ed3344ee74..92eaa9f85a 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/HistoricalUsage.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HistoricalUsage.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java similarity index 98% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancer.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java index 958d7239fe..4e5bc7ff72 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -26,8 +26,8 @@ import java.util.Map; import java.util.Set; import org.jclouds.javax.annotation.Nullable; -import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApi; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerAttributes.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerAttributes.java similarity index 94% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerAttributes.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerAttributes.java index 8d1d7fe2a1..e3500ffff3 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerAttributes.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerAttributes.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; -import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer.Algorithm; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer.Algorithm; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerInfo.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerInfo.java similarity index 97% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerInfo.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerInfo.java index 4235bebd8d..8016a5bbff 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerInfo.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerRequest.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerRequest.java similarity index 98% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerRequest.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerRequest.java index 3fb5506ca0..578423dab6 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerRequest.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerRequest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; import org.jclouds.javax.annotation.Nullable; -import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerStats.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerStats.java similarity index 98% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerStats.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerStats.java index d51d4bd445..645520679f 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerStats.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerStats.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import java.beans.ConstructorProperties; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerUsage.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUsage.java similarity index 97% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerUsage.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUsage.java index 91b1229fe8..8ea867992b 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerUsage.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUsage.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkNotNull; import java.beans.ConstructorProperties; import java.util.Date; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP.Type; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type; import com.google.common.base.Objects; import com.google.common.base.Optional; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/Metadata.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Metadata.java similarity index 96% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/Metadata.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Metadata.java index f4aad3976c..ce7acf3719 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/Metadata.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Metadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import java.util.Map; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/Node.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Node.java similarity index 98% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/Node.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Node.java index c705155def..ae2a7c4711 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/Node.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Node.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseNode; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/NodeAttributes.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeAttributes.java similarity index 90% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/NodeAttributes.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeAttributes.java index 33119f96ae..b5366114ee 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/NodeAttributes.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeAttributes.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; -import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseNode; -import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseNode.Condition; -import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseNode.Type; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode.Condition; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode.Type; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/NodeRequest.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeRequest.java similarity index 97% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/NodeRequest.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeRequest.java index 628665da1d..5142492ff5 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/NodeRequest.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeRequest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; -import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseNode; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/Protocol.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Protocol.java similarity index 96% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/Protocol.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Protocol.java index 38667ac411..ea216cafce 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/Protocol.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Protocol.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/SSLTermination.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java similarity index 99% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/SSLTermination.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java index 26f5474764..bcb493dc6b 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/SSLTermination.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import java.beans.ConstructorProperties; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/SessionPersistence.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SessionPersistence.java similarity index 94% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/SessionPersistence.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SessionPersistence.java index 287d8bb460..650e6cbcd2 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/SessionPersistence.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SessionPersistence.java @@ -1,4 +1,4 @@ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/SourceAddresses.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SourceAddresses.java similarity index 98% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/SourceAddresses.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SourceAddresses.java index be499796d2..a228641317 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/SourceAddresses.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SourceAddresses.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/VirtualIP.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIP.java similarity index 98% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/VirtualIP.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIP.java index bc01cb3302..8fa1fa9bd5 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/VirtualIP.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIP.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/VirtualIPWithId.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIPWithId.java similarity index 97% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/VirtualIPWithId.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIPWithId.java index 6b11ad1cbd..b003b75c30 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/VirtualIPWithId.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIPWithId.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/internal/BaseLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java similarity index 96% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/internal/BaseLoadBalancer.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java index 8d642dde94..cfad3a20cc 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/internal/BaseLoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain.internal; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal; import static com.google.common.base.Preconditions.checkNotNull; @@ -25,11 +25,11 @@ import java.util.Set; import java.util.SortedSet; import org.jclouds.javax.annotation.Nullable; -import org.jclouds.rackspace.cloudloadbalancers.domain.ConnectionThrottle; -import org.jclouds.rackspace.cloudloadbalancers.domain.HealthMonitor; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.domain.SessionPersistence; -import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.ConnectionThrottle; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HealthMonitor; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SessionPersistence; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApi; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/internal/BaseNode.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseNode.java similarity index 98% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/internal/BaseNode.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseNode.java index 9596bbc921..57fe4aa635 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/internal/BaseNode.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseNode.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.domain.internal; +package org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer.Algorithm; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer.Algorithm; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApi.java similarity index 91% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApi.java index 3515068c24..4d32b23fc2 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApi.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import org.jclouds.rackspace.cloudloadbalancers.domain.AccessRule; -import org.jclouds.rackspace.cloudloadbalancers.domain.AccessRuleWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRule; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRuleWithId; /** * The access list management feature allows fine-grained network access controls to be applied to the load balancer's diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleAsyncApi.java similarity index 93% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleAsyncApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleAsyncApi.java index 7983918f27..6a4c872809 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleAsyncApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; import javax.ws.rs.Consumes; @@ -32,8 +32,8 @@ import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; -import org.jclouds.rackspace.cloudloadbalancers.domain.AccessRule; -import org.jclouds.rackspace.cloudloadbalancers.domain.AccessRuleWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRule; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRuleWithId; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.SelectJson; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApi.java similarity index 92% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApi.java index 8c7186ac3c..1aa65603b3 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApi.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import org.jclouds.rackspace.cloudloadbalancers.domain.ConnectionThrottle; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.ConnectionThrottle; /** * Connection management features. diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionAsyncApi.java similarity index 94% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionAsyncApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionAsyncApi.java index aedc00baa7..e50fd71679 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionAsyncApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; import javax.ws.rs.Consumes; @@ -32,8 +32,8 @@ import org.jclouds.Fallbacks.FalseOnNotFoundOr422; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; -import org.jclouds.rackspace.cloudloadbalancers.domain.ConnectionThrottle; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseNestedBoolean; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.ConnectionThrottle; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseNestedBoolean; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.Payload; import org.jclouds.rest.annotations.RequestFilters; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApi.java similarity index 96% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApi.java index b7072b39c4..0f28ed363c 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; /** * When content caching is enabled, recently-accessed files are stored on the load balancer for easy retrieval by web diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingAsyncApi.java similarity index 94% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingAsyncApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingAsyncApi.java index d0693bb5ff..47ad77c44d 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingAsyncApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; import javax.ws.rs.Consumes; @@ -29,7 +29,7 @@ import javax.ws.rs.core.MediaType; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseNestedBoolean; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseNestedBoolean; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.Payload; import org.jclouds.rest.annotations.RequestFilters; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApi.java similarity index 96% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApi.java index b89b568d75..dbb9df1507 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; /** * An error page is the html file that is shown to an end user who is attempting to access a load balancer node that diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageAsyncApi.java similarity index 94% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageAsyncApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageAsyncApi.java index 1dc2a14253..2d94d7a121 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageAsyncApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; import javax.ws.rs.Consumes; @@ -30,7 +30,7 @@ import javax.ws.rs.core.MediaType; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseNestedString; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseNestedString; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.Payload; import org.jclouds.rest.annotations.PayloadParam; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApi.java similarity index 93% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApi.java index cb6eda24ef..72f6ff538e 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApi.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import org.jclouds.rackspace.cloudloadbalancers.domain.HealthMonitor; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HealthMonitor; /** * The load balancing service includes a health monitoring operation which periodically checks your back-end nodes to diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorAsyncApi.java similarity index 94% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorAsyncApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorAsyncApi.java index d9044a1dbb..f99cb587fa 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorAsyncApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; import javax.ws.rs.Consumes; @@ -30,7 +30,7 @@ import org.jclouds.Fallbacks.FalseOnNotFoundOr422; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; -import org.jclouds.rackspace.cloudloadbalancers.domain.HealthMonitor; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HealthMonitor; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.SelectJson; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java similarity index 91% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java index 7d281886e3..e8c8a420ba 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import java.util.Map; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.PagedIterable; import org.jclouds.openstack.v2_0.options.PaginationOptions; -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.Metadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerAttributes; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata; /** * Provides synchronous access to CloudLoadBalancers LoadBalancer features. diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerAsyncApi.java similarity index 90% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerAsyncApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerAsyncApi.java index c20352cbf2..9034ebef2f 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerAsyncApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import java.util.Map; @@ -42,14 +42,14 @@ import org.jclouds.collect.PagedIterable; import org.jclouds.openstack.keystone.v2_0.KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import org.jclouds.rackspace.cloudloadbalancers.binders.BindMetadataToJsonPayload; -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.Metadata; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseLoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseLoadBalancers; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseMetadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.binders.BindMetadataToJsonPayload; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerAttributes; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseLoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseLoadBalancers; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseMetadata; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.Payload; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java similarity index 90% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java index 1b96af7d50..d83808a7a1 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import java.util.Map; import java.util.Set; @@ -24,10 +24,10 @@ import java.util.Set; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.PagedIterable; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import org.jclouds.rackspace.cloudloadbalancers.domain.Metadata; -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.v1.domain.Metadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Node; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAttributes; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; /** * Provides synchronous access to CloudLoadBalancers Node features. diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeAsyncApi.java similarity index 89% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeAsyncApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeAsyncApi.java index d263e56681..30995b2656 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeAsyncApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import java.util.Map; import java.util.Set; @@ -43,15 +43,15 @@ import org.jclouds.collect.PagedIterable; import org.jclouds.openstack.keystone.v2_0.KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import org.jclouds.rackspace.cloudloadbalancers.binders.BindMetadataToJsonPayload; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.domain.Metadata; -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.functions.ParseMetadata; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseNode; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseNodes; +import org.jclouds.rackspace.cloudloadbalancers.v1.binders.BindMetadataToJsonPayload; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Node; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAttributes; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseMetadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseNode; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseNodes; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.Payload; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApi.java similarity index 87% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApi.java index 2c4e917981..fe1981c19d 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApi.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import java.util.Date; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.PagedIterable; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import org.jclouds.rackspace.cloudloadbalancers.domain.HistoricalUsage; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerStats; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerUsage; -import org.jclouds.rackspace.cloudloadbalancers.domain.Protocol; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HistoricalUsage; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerStats; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerUsage; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Protocol; /** * Reporting for load balancers. diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportAsyncApi.java similarity index 89% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportAsyncApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportAsyncApi.java index d823465cf4..b43662c141 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportAsyncApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import java.util.Date; @@ -34,15 +34,15 @@ import org.jclouds.collect.PagedIterable; import org.jclouds.openstack.keystone.v2_0.KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import org.jclouds.rackspace.cloudloadbalancers.domain.HistoricalUsage; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerStats; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerUsage; -import org.jclouds.rackspace.cloudloadbalancers.domain.Protocol; -import org.jclouds.rackspace.cloudloadbalancers.functions.DateParser; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseAlgorithms; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseLoadBalancerUsages; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseLoadBalancers; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HistoricalUsage; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerStats; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerUsage; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Protocol; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.DateParser; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseAlgorithms; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseLoadBalancerUsages; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseLoadBalancers; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.ParamParser; import org.jclouds.rest.annotations.RequestFilters; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApi.java similarity index 96% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApi.java index ed8258584f..54cdcb41a9 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApi.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import org.jclouds.rackspace.cloudloadbalancers.domain.SSLTermination; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SSLTermination; /** * The SSL Termination feature allows a load balancer user to terminate SSL traffic at the load balancer layer versus diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationAsyncApi.java similarity index 94% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationAsyncApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationAsyncApi.java index 0014240713..fc8d678f7b 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationAsyncApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; import javax.ws.rs.Consumes; @@ -30,7 +30,7 @@ import org.jclouds.Fallbacks.FalseOnNotFoundOr422; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; -import org.jclouds.rackspace.cloudloadbalancers.domain.SSLTermination; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SSLTermination; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.SelectJson; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApi.java similarity index 92% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApi.java index b6bcf52b36..1588c5a7a1 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApi.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import org.jclouds.rackspace.cloudloadbalancers.domain.SessionPersistence; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SessionPersistence; /** diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceAsyncApi.java similarity index 92% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceAsyncApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceAsyncApi.java index 1487a431a0..7ef1eb1f8e 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceAsyncApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; import javax.ws.rs.Consumes; @@ -30,8 +30,8 @@ import javax.ws.rs.core.MediaType; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; -import org.jclouds.rackspace.cloudloadbalancers.domain.SessionPersistence; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseSessionPersistence; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SessionPersistence; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseSessionPersistence; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.Payload; import org.jclouds.rest.annotations.PayloadParam; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApi.java similarity index 91% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApi.java index f63880fd01..e4d33fb9dd 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApi.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIPWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIPWithId; /** * A virtual IP makes a load balancer accessible by clients. The load balancing service supports either a public VIP, diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPAsyncApi.java similarity index 93% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPAsyncApi.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPAsyncApi.java index de0ceaa220..4653f2f00f 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPAsyncApi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import javax.inject.Named; import javax.ws.rs.Consumes; @@ -32,8 +32,8 @@ import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIPWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIPWithId; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.RequestFilters; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ConvertLB.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java similarity index 88% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ConvertLB.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java index 5e7bd2c810..49fa962a98 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ConvertLB.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ConvertLB.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import javax.annotation.Resource; import javax.inject.Inject; import org.jclouds.logging.Logger; -import org.jclouds.rackspace.cloudloadbalancers.domain.AccessRuleWithId; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Builder; -import org.jclouds.rackspace.cloudloadbalancers.domain.Metadata; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIPWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRuleWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIPWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer.Builder; import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/DateParser.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/DateParser.java similarity index 96% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/DateParser.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/DateParser.java index ba70c77ce8..ce50abf199 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/DateParser.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/DateParser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/LB.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/LB.java similarity index 74% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/LB.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/LB.java index 3e3c72849c..c1deab578e 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/LB.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/LB.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; -import org.jclouds.rackspace.cloudloadbalancers.domain.AccessRuleWithId; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status; -import org.jclouds.rackspace.cloudloadbalancers.domain.Node; -import org.jclouds.rackspace.cloudloadbalancers.domain.SSLTermination; -import org.jclouds.rackspace.cloudloadbalancers.domain.SourceAddresses; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIPWithId; -import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseMetadata.CLBMetadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRuleWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Node; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SSLTermination; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SourceAddresses; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIPWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer.Status; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseMetadata.CLBMetadata; import com.google.common.base.Objects; import com.google.common.collect.Maps; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseAlgorithms.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseAlgorithms.java similarity index 97% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseAlgorithms.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseAlgorithms.java index 9e3c6ea587..60104b84d2 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseAlgorithms.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseAlgorithms.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancer.java similarity index 91% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancer.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancer.java index cc64b5a415..838c581529 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; @@ -28,8 +28,8 @@ import javax.inject.Inject; 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.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ConvertLB.Factory; import org.jclouds.rest.InvocationContext; import com.google.common.base.Function; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancerUsages.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerUsages.java similarity index 88% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancerUsages.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerUsages.java index 05381b90df..e418b476e3 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancerUsages.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerUsages.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.openstack.v2_0.options.PaginationOptions.Builder.marker; @@ -32,10 +32,10 @@ import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; import org.jclouds.openstack.keystone.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.v2_0.domain.Link; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerUsage; -import org.jclouds.rackspace.cloudloadbalancers.features.ReportApi; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseLoadBalancerUsages.LoadBalancerUsages; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerUsage; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ReportApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseLoadBalancerUsages.LoadBalancerUsages; import com.google.common.base.Function; import com.google.inject.TypeLiteral; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancers.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java similarity index 91% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancers.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java index cb46bf940f..56ea07c536 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancers.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.openstack.v2_0.options.PaginationOptions.Builder.marker; @@ -33,10 +33,10 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; import org.jclouds.openstack.keystone.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.v2_0.domain.Link; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerApi; -import org.jclouds.rackspace.cloudloadbalancers.functions.ConvertLB.Factory; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ConvertLB.Factory; import org.jclouds.rest.InvocationContext; import com.google.common.base.Function; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseMetadata.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseMetadata.java similarity index 95% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseMetadata.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseMetadata.java index 2dab0f345a..732637f945 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseMetadata.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import static org.jclouds.http.HttpUtils.releasePayload; @@ -31,7 +31,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponseException; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; -import org.jclouds.rackspace.cloudloadbalancers.domain.Metadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata; import com.google.inject.TypeLiteral; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseNestedBoolean.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedBoolean.java similarity index 96% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseNestedBoolean.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedBoolean.java index 4712e272fa..d8c01546e7 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseNestedBoolean.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedBoolean.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseNestedString.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedString.java similarity index 96% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseNestedString.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedString.java index c19c90a75b..3896deb074 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseNestedString.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNestedString.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseNode.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNode.java similarity index 88% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseNode.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNode.java index 663fcb844a..a8b8e8f99d 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseNode.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import static com.google.common.base.Preconditions.checkNotNull; @@ -28,10 +28,10 @@ import javax.inject.Inject; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; -import org.jclouds.rackspace.cloudloadbalancers.domain.Node; -import org.jclouds.rackspace.cloudloadbalancers.domain.Node.Status; -import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseNode; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseMetadata.CLBMetadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Node; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Node.Status; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseMetadata.CLBMetadata; import org.jclouds.rest.InvocationContext; import com.google.common.base.Function; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseNodes.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java similarity index 90% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseNodes.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java index adf45caf96..e7745cef0d 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseNodes.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.openstack.v2_0.options.PaginationOptions.Builder.marker; @@ -33,10 +33,10 @@ import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; import org.jclouds.openstack.keystone.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.v2_0.domain.Link; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.domain.Node; -import org.jclouds.rackspace.cloudloadbalancers.features.NodeApi; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseNodes.Nodes; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Node; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.NodeApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseNodes.Nodes; import com.google.common.annotations.Beta; import com.google.common.base.Function; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseSessionPersistence.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseSessionPersistence.java similarity index 93% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseSessionPersistence.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseSessionPersistence.java index 059b54104d..5495726aed 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseSessionPersistence.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseSessionPersistence.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import static com.google.common.base.Preconditions.checkNotNull; @@ -28,7 +28,7 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponseException; import org.jclouds.http.functions.ParseJson; -import org.jclouds.rackspace.cloudloadbalancers.domain.SessionPersistence; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SessionPersistence; import org.jclouds.rest.InvocationContext; import com.google.common.base.Function; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java similarity index 98% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java index e8023971df..466670a15a 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.handlers; +package org.jclouds.rackspace.cloudloadbalancers.v1.handlers; import static org.jclouds.http.HttpUtils.releasePayload; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersBindLoadBalancerStrategiesByClass.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/config/CloudLoadBalancersBindLoadBalancerStrategiesByClass.java similarity index 78% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersBindLoadBalancerStrategiesByClass.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/config/CloudLoadBalancersBindLoadBalancerStrategiesByClass.java index 69fc74d02e..8f42772a1d 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersBindLoadBalancerStrategiesByClass.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/config/CloudLoadBalancersBindLoadBalancerStrategiesByClass.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.config; +package org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.config; import org.jclouds.loadbalancer.config.BindLoadBalancerStrategiesByClass; import org.jclouds.loadbalancer.strategy.DestroyLoadBalancerStrategy; import org.jclouds.loadbalancer.strategy.GetLoadBalancerMetadataStrategy; import org.jclouds.loadbalancer.strategy.ListLoadBalancersStrategy; import org.jclouds.loadbalancer.strategy.LoadBalanceNodesStrategy; -import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy.CloudLoadBalancersDestroyLoadBalancerStrategy; -import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy.CloudLoadBalancersGetLoadBalancerMetadataStrategy; -import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy.CloudLoadBalancersListLoadBalancersStrategy; -import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy.CloudLoadBalancersLoadBalanceNodesStrategy; +import org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.strategy.CloudLoadBalancersDestroyLoadBalancerStrategy; +import org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.strategy.CloudLoadBalancersGetLoadBalancerMetadataStrategy; +import org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.strategy.CloudLoadBalancersListLoadBalancersStrategy; +import org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.strategy.CloudLoadBalancersLoadBalanceNodesStrategy; /** * @author Adrian Cole diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerContextModule.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/config/CloudLoadBalancersLoadBalancerContextModule.java similarity index 94% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerContextModule.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/config/CloudLoadBalancersLoadBalancerContextModule.java index f5a4c982d3..59c669450d 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerContextModule.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/config/CloudLoadBalancersLoadBalancerContextModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.config; +package org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.config; import org.jclouds.loadbalancer.config.BaseLoadBalancerServiceContextModule; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerServiceDependenciesModule.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/config/CloudLoadBalancersLoadBalancerServiceDependenciesModule.java similarity index 83% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerServiceDependenciesModule.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/config/CloudLoadBalancersLoadBalancerServiceDependenciesModule.java index 864f7845d0..fc235b8278 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerServiceDependenciesModule.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/config/CloudLoadBalancersLoadBalancerServiceDependenciesModule.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.config; +package org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.config; import org.jclouds.loadbalancer.domain.LoadBalancerMetadata; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.functions.LoadBalancerToLoadBalancerMetadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.functions.LoadBalancerToLoadBalancerMetadata; import com.google.common.base.Function; import com.google.inject.AbstractModule; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java similarity index 92% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java index a3a38f49ca..9ae66f1945 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.functions; import java.util.Set; @@ -29,8 +29,8 @@ 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.VirtualIPWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIPWithId; import com.google.common.base.Function; import com.google.common.base.Supplier; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java similarity index 93% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java index a902329f79..066608e41e 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy; +package org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.strategy; import static com.google.common.base.Preconditions.checkNotNull; @@ -30,7 +30,7 @@ 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; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; /** * diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java similarity index 86% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java index 88d2f7e70e..7a0445a495 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy; +package org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.strategy; import static com.google.common.base.Preconditions.checkNotNull; @@ -25,8 +25,8 @@ import javax.inject.Singleton; 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 org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; import com.google.common.base.Function; @@ -37,7 +37,7 @@ import com.google.common.base.Function; @Singleton public class CloudLoadBalancersGetLoadBalancerMetadataStrategy implements GetLoadBalancerMetadataStrategy { - private final org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi client; + private final org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi client; private final Function converter; @Inject diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java similarity index 91% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java index 01b64d2127..30f06e9521 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy; +package org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.strategy; import static com.google.common.base.Preconditions.checkNotNull; @@ -28,8 +28,8 @@ import javax.inject.Singleton; import org.jclouds.loadbalancer.domain.LoadBalancerMetadata; import org.jclouds.loadbalancer.strategy.ListLoadBalancersStrategy; import org.jclouds.location.Zone; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; import com.google.common.base.Function; import com.google.common.base.Supplier; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java similarity index 88% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java index ac3eb5fd33..8fc07ed84f 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy; +package org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.strategy; import static com.google.common.base.Preconditions.checkNotNull; @@ -32,11 +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 org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type; import com.google.common.base.Function; import com.google.common.collect.Iterables; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/options/ListOptions.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/options/ListOptions.java similarity index 97% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/options/ListOptions.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/options/ListOptions.java index 90f53702c3..c8bb8e41a5 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/options/ListOptions.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/options/ListOptions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.options; +package org.jclouds.rackspace.cloudloadbalancers.v1.options; import static com.google.common.base.Preconditions.checkArgument; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/predicates/LoadBalancerPredicates.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/predicates/LoadBalancerPredicates.java similarity index 96% rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/predicates/LoadBalancerPredicates.java rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/predicates/LoadBalancerPredicates.java index 9283235c09..a87fe699db 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/predicates/LoadBalancerPredicates.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/predicates/LoadBalancerPredicates.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.predicates; +package org.jclouds.rackspace.cloudloadbalancers.v1.predicates; import static com.google.common.base.Preconditions.checkNotNull; import static java.util.concurrent.TimeUnit.SECONDS; import static org.jclouds.util.Predicates2.retry; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApi; import com.google.common.base.Predicate; 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 index 1ca06c4162..4364b84d36 100644 --- 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 @@ -1 +1 @@ -org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata \ No newline at end of file +org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata \ No newline at end of file diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadataTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadataTest.java similarity index 90% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadataTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadataTest.java index 38f2be6597..139731dd48 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadataTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadataTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers; +package org.jclouds.rackspace.cloudloadbalancers.v1; import org.jclouds.loadbalancer.internal.BaseLoadBalancerServiceApiMetadataTest; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata; import org.testng.annotations.Test; /** diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiExpectTest.java similarity index 91% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApiExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiExpectTest.java index f89ca7ce44..5c87813b61 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -27,10 +27,11 @@ import java.util.List; import javax.ws.rs.core.MediaType; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.domain.AccessRule; -import org.jclouds.rackspace.cloudloadbalancers.domain.AccessRuleWithId; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancerApiExpectTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRule; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRuleWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.AccessRuleApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancerApiExpectTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java similarity index 88% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApiLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java index 2c49cc8e1e..e5b086cba9 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitAvailable; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitDeleted; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitAvailable; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitDeleted; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -27,13 +27,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jclouds.rackspace.cloudloadbalancers.domain.AccessRule; -import org.jclouds.rackspace.cloudloadbalancers.domain.AccessRuleWithId; -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 org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRule; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRuleWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest; import org.testng.annotations.AfterGroups; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiExpectTest.java similarity index 94% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApiExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiExpectTest.java index 669c18ff81..4abbb4c305 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -27,9 +27,10 @@ import java.net.URI; import javax.ws.rs.core.MediaType; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.domain.ConnectionThrottle; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancerApiExpectTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.ConnectionThrottle; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ConnectionApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancerApiExpectTest; import org.testng.annotations.Test; /** diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiLiveTest.java similarity index 85% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApiLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiLiveTest.java index 26cf862ebc..75acc292bb 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiLiveTest.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitAvailable; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitDeleted; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitAvailable; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitDeleted; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import org.jclouds.rackspace.cloudloadbalancers.domain.ConnectionThrottle; -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 org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.ConnectionThrottle; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest; import org.testng.annotations.AfterGroups; import org.testng.annotations.Test; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiExpectTest.java similarity index 90% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingApiExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiExpectTest.java index 8e380ac239..b95f5867b9 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiExpectTest.java @@ -16,15 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static org.testng.Assert.assertTrue; import java.net.URI; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancerApiExpectTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ContentCachingApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancerApiExpectTest; import org.testng.annotations.Test; /** diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiLiveTest.java similarity index 82% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingApiLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiLiveTest.java index fb93f47d50..cc94b9797e 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiLiveTest.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitAvailable; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitDeleted; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitAvailable; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitDeleted; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -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 org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest; import org.testng.annotations.AfterGroups; import org.testng.annotations.Test; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiExpectTest.java similarity index 93% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApiExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiExpectTest.java index b5c77cf423..72b9d9c1c1 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -27,8 +27,9 @@ import java.net.URI; import javax.ws.rs.core.MediaType; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancerApiExpectTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ErrorPageApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancerApiExpectTest; import org.jclouds.util.Strings2; import org.testng.annotations.Test; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiLiveTest.java similarity index 83% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApiLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiLiveTest.java index 12b54e8919..cd2529d077 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiLiveTest.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitAvailable; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitDeleted; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitAvailable; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitDeleted; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -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 org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest; import org.testng.annotations.AfterGroups; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiExpectTest.java similarity index 94% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorApiExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiExpectTest.java index bea9231509..4ac0a988a9 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -27,9 +27,10 @@ import java.net.URI; import javax.ws.rs.core.MediaType; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.domain.HealthMonitor; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancerApiExpectTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HealthMonitor; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.HealthMonitorApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancerApiExpectTest; import org.testng.annotations.Test; /** diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiLiveTest.java similarity index 81% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorApiLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiLiveTest.java index 17c46a582f..f30bb433c7 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiLiveTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitAvailable; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitDeleted; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitAvailable; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitDeleted; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import org.jclouds.rackspace.cloudloadbalancers.domain.HealthMonitor; -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 org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HealthMonitor; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest; import org.testng.annotations.AfterGroups; import org.testng.annotations.Test; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java similarity index 90% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApiExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java index f6fa685d78..2094b48f3d 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -27,16 +27,17 @@ import java.util.Set; import javax.ws.rs.core.MediaType; 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.Metadata; -import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseLoadBalancerTest; -import org.jclouds.rackspace.cloudloadbalancers.functions.ParseLoadBalancersTest; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancerApiExpectTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerAttributes; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseLoadBalancerTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseLoadBalancersTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancerApiExpectTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiLiveTest.java similarity index 91% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApiLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiLiveTest.java index e433ceba87..fcf5a1ceb4 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiLiveTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitAvailable; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitDeleted; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitAvailable; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitDeleted; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; @@ -29,13 +29,13 @@ import java.util.Map; import java.util.Set; import java.util.logging.Logger; -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.Metadata; -import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP.Type; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerAttributes; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest; import org.testng.annotations.AfterGroups; import org.testng.annotations.Test; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java similarity index 94% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java index 0dbf99c597..8ad1848c79 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -27,12 +27,13 @@ import java.util.Set; import javax.ws.rs.core.MediaType; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.domain.Metadata; -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.internal.BaseCloudLoadBalancerApiExpectTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Node; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAttributes; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.NodeApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancerApiExpectTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiLiveTest.java similarity index 89% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiLiveTest.java index 3366675d44..0df9d707a2 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiLiveTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitAvailable; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitDeleted; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitAvailable; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitDeleted; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; @@ -36,16 +36,16 @@ import com.google.common.collect.ImmutableMap; 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.Metadata; -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.LoadBalancerApi; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Node; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAttributes; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer.Status; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest; import org.testng.annotations.AfterGroups; import org.testng.annotations.Test; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApiExpectTest.java similarity index 91% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportApiExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApiExpectTest.java index b3b4868e09..7af7d0fc2e 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApiExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static org.testng.Assert.assertEquals; @@ -25,14 +25,15 @@ import java.util.Calendar; import java.util.Date; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.domain.HistoricalUsage; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerStats; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerUsage; -import org.jclouds.rackspace.cloudloadbalancers.domain.Protocol; -import org.jclouds.rackspace.cloudloadbalancers.functions.DateParser; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancerApiExpectTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HistoricalUsage; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerStats; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerUsage; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Protocol; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ReportApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.DateParser; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancerApiExpectTest; import org.testng.annotations.Test; import com.google.common.collect.FluentIterable; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApiLiveTest.java similarity index 80% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportApiLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApiLiveTest.java index c288756547..f72f28e042 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApiLiveTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitAvailable; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitDeleted; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitAvailable; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitDeleted; import static org.testng.Assert.assertNotEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; @@ -28,15 +28,15 @@ import java.util.Calendar; import java.util.Date; import org.jclouds.http.HttpResponseException; -import org.jclouds.rackspace.cloudloadbalancers.domain.HistoricalUsage; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerRequest; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerStats; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerUsage; -import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest; -import org.jclouds.rackspace.cloudloadbalancers.domain.Protocol; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP.Type; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HistoricalUsage; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerStats; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerUsage; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Protocol; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest; import org.testng.annotations.AfterGroups; import org.testng.annotations.Test; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApiExpectTest.java similarity index 92% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApiExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApiExpectTest.java index 5d2c65d465..681c66a346 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApiExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -28,9 +28,10 @@ import java.net.URI; import javax.ws.rs.core.MediaType; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.domain.SSLTermination; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancerApiExpectTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SSLTermination; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.SSLTerminationApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancerApiExpectTest; import org.jclouds.util.Strings2; import org.testng.annotations.Test; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApiLiveTest.java similarity index 81% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApiLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApiLiveTest.java index d503250e99..1ad43b9c9d 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApiLiveTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitAvailable; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitDeleted; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitAvailable; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitDeleted; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import org.jclouds.rackspace.cloudloadbalancers.domain.SSLTermination; -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 org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SSLTermination; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest; import org.testng.annotations.AfterGroups; import org.testng.annotations.Test; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApiExpectTest.java similarity index 90% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApiExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApiExpectTest.java index 56214cad9e..e872e00a72 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApiExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; @@ -24,9 +24,10 @@ import static org.testng.Assert.assertNull; import java.net.URI; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.domain.SessionPersistence; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancerApiExpectTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SessionPersistence; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.SessionPersistenceApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancerApiExpectTest; import org.testng.annotations.Test; /** diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApiLiveTest.java similarity index 81% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApiLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApiLiveTest.java index 25e20ef061..bedd2fae01 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApiLiveTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitAvailable; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitDeleted; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitAvailable; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitDeleted; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -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.SessionPersistence; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP.Type; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SessionPersistence; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest; import org.testng.annotations.AfterGroups; import org.testng.annotations.Test; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApiExpectTest.java similarity index 90% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApiExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApiExpectTest.java index 1aa590cf70..8b8a116dc2 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApiExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; import static org.testng.Assert.assertEquals; @@ -26,10 +26,11 @@ import java.util.List; import javax.ws.rs.core.MediaType; import org.jclouds.http.HttpResponse; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIPWithId; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancerApiExpectTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIPWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.VirtualIPApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancerApiExpectTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApiLiveTest.java similarity index 85% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApiLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApiLiveTest.java index 1a53863cf8..cee12ae83b 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApiLiveTest.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.features; +package org.jclouds.rackspace.cloudloadbalancers.v1.features; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitAvailable; -import static org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerPredicates.awaitDeleted; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitAvailable; +import static org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates.awaitDeleted; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import java.util.List; -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; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP.Type; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIPWithId; -import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIPWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type; +import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest; import org.testng.annotations.AfterGroups; import org.testng.annotations.Test; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancerTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerTest.java similarity index 76% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancerTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerTest.java index 125786510e..f687226eac 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancerTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerTest.java @@ -16,26 +16,28 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.http.HttpResponse; import org.jclouds.json.BaseItemParserTest; -import org.jclouds.rackspace.cloudloadbalancers.domain.AccessRule; -import org.jclouds.rackspace.cloudloadbalancers.domain.AccessRuleWithId; -import org.jclouds.rackspace.cloudloadbalancers.domain.ConnectionThrottle; -import org.jclouds.rackspace.cloudloadbalancers.domain.HealthMonitor; -import org.jclouds.rackspace.cloudloadbalancers.domain.HealthMonitor.Type; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status; -import org.jclouds.rackspace.cloudloadbalancers.domain.Metadata; -import org.jclouds.rackspace.cloudloadbalancers.domain.Node; -import org.jclouds.rackspace.cloudloadbalancers.domain.SSLTermination; -import org.jclouds.rackspace.cloudloadbalancers.domain.SessionPersistence; -import org.jclouds.rackspace.cloudloadbalancers.domain.SourceAddresses; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIPWithId; -import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer.Algorithm; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRule; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRuleWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.ConnectionThrottle; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HealthMonitor; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Node; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SSLTermination; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SessionPersistence; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SourceAddresses; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIPWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HealthMonitor.Type; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer.Status; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer.Algorithm; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ConvertLB; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseLoadBalancer; import org.testng.annotations.Test; import com.google.common.base.Function; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancerWhenDeletedTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerWhenDeletedTest.java similarity index 86% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancerWhenDeletedTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerWhenDeletedTest.java index c197f83f0d..32f72a7e4b 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancerWhenDeletedTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancerWhenDeletedTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; 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.ParseLoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer.Status; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ConvertLB; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseLoadBalancer; import org.testng.annotations.Test; import com.google.common.base.Function; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancersTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancersTest.java similarity index 86% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancersTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancersTest.java index aeb00e5195..ab41cb7122 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/ParseLoadBalancersTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancersTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.functions; +package org.jclouds.rackspace.cloudloadbalancers.v1.functions; import java.util.Set; @@ -25,11 +25,13 @@ import org.jclouds.collect.IterableWithMarkers; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.http.HttpResponse; import org.jclouds.json.BaseIterableWithMarkerParserTest; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer; -import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIPWithId; -import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer.Algorithm; -import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIPWithId; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer.Status; +import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer.Algorithm; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ConvertLB; +import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseLoadBalancers; import org.testng.annotations.Test; import com.google.common.base.Function; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java similarity index 91% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java index 93dd780a25..4d0fbd1281 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.handlers; +package org.jclouds.rackspace.cloudloadbalancers.v1.handlers; import java.net.URI; import org.jclouds.http.handlers.BaseHttpErrorHandlerTest; -import org.jclouds.rackspace.cloudloadbalancers.handlers.ParseCloudLoadBalancersErrorFromHttpResponse; +import org.jclouds.rackspace.cloudloadbalancers.v1.handlers.ParseCloudLoadBalancersErrorFromHttpResponse; import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancerApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/internal/BaseCloudLoadBalancerApiExpectTest.java similarity index 97% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancerApiExpectTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/internal/BaseCloudLoadBalancerApiExpectTest.java index dd7ce6ffad..fee0b1af40 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancerApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/internal/BaseCloudLoadBalancerApiExpectTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.internal; +package org.jclouds.rackspace.cloudloadbalancers.v1.internal; import javax.ws.rs.core.MediaType; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancersApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/internal/BaseCloudLoadBalancersApiLiveTest.java similarity index 87% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancersApiLiveTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/internal/BaseCloudLoadBalancersApiLiveTest.java index efb1c6430a..0534ce3426 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancersApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/internal/BaseCloudLoadBalancersApiLiveTest.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.internal; +package org.jclouds.rackspace.cloudloadbalancers.v1.internal; import java.util.Properties; import java.util.logging.Logger; import org.jclouds.apis.BaseContextLiveTest; import org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersAsyncApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersAsyncApi; import org.jclouds.rest.RestContext; import org.testng.annotations.BeforeGroups; diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/options/ListOptionsTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/options/ListOptionsTest.java similarity index 84% rename from apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/options/ListOptionsTest.java rename to apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/options/ListOptionsTest.java index 8e237d49e7..26cf331cf2 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/options/ListOptionsTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/options/ListOptionsTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.rackspace.cloudloadbalancers.options; +package org.jclouds.rackspace.cloudloadbalancers.v1.options; -import static org.jclouds.rackspace.cloudloadbalancers.options.ListOptions.Builder.limit; -import static org.jclouds.rackspace.cloudloadbalancers.options.ListOptions.Builder.marker; +import static org.jclouds.rackspace.cloudloadbalancers.v1.options.ListOptions.Builder.limit; +import static org.jclouds.rackspace.cloudloadbalancers.v1.options.ListOptions.Builder.marker; import static org.testng.Assert.assertEquals; -import org.jclouds.rackspace.cloudloadbalancers.options.ListOptions; +import org.jclouds.rackspace.cloudloadbalancers.v1.options.ListOptions; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; diff --git a/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java b/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java index ffb8a91d40..addb24e4d1 100644 --- a/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java +++ b/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java @@ -29,9 +29,9 @@ import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.Z 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 org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.config.CloudLoadBalancersRestClientModule; +import org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; diff --git a/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKLoadBalancerClientLiveTest.java b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKLoadBalancerClientLiveTest.java index 07e67e0bd2..e16eb50ab3 100644 --- a/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKLoadBalancerClientLiveTest.java +++ b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKLoadBalancerClientLiveTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.rackspace.cloudloadbalancers.uk; -import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApiLiveTest; import org.testng.annotations.Test; /** diff --git a/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKNodeClientLiveTest.java b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKNodeClientLiveTest.java index 787ca01cc9..c5b29b6271 100644 --- a/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKNodeClientLiveTest.java +++ b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKNodeClientLiveTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.rackspace.cloudloadbalancers.uk; -import org.jclouds.rackspace.cloudloadbalancers.features.NodeApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.NodeApiLiveTest; import org.testng.annotations.Test; /** diff --git a/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderTest.java b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderTest.java index 73444c71ae..8f6e1436e4 100644 --- a/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderTest.java +++ b/providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderTest.java @@ -19,8 +19,8 @@ package org.jclouds.rackspace.cloudloadbalancers.uk; import org.jclouds.providers.internal.BaseProviderMetadataTest; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata; import org.jclouds.rackspace.cloudloadbalancers.uk.CloudLoadBalancersUKProviderMetadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata; import org.testng.annotations.Test; /** diff --git a/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java b/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java index 85c2388d5a..2dd9f626ab 100644 --- a/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java +++ b/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java @@ -29,9 +29,9 @@ import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.Z 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 org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.config.CloudLoadBalancersRestClientModule; +import org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; diff --git a/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSLoadBalancerClientLiveTest.java b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSLoadBalancerClientLiveTest.java index 9b0f46e5d3..48a3bfb15b 100644 --- a/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSLoadBalancerClientLiveTest.java +++ b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSLoadBalancerClientLiveTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.rackspace.cloudloadbalancers.us; -import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApiLiveTest; import org.testng.annotations.Test; /** diff --git a/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSNodeClientLiveTest.java b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSNodeClientLiveTest.java index ff8a3c017b..00138c5f56 100644 --- a/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSNodeClientLiveTest.java +++ b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSNodeClientLiveTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.rackspace.cloudloadbalancers.us; -import org.jclouds.rackspace.cloudloadbalancers.features.NodeApiLiveTest; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.NodeApiLiveTest; import org.testng.annotations.Test; /** diff --git a/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderTest.java b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderTest.java index 9ccf5086f4..c53cda5859 100644 --- a/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderTest.java +++ b/providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderTest.java @@ -19,8 +19,8 @@ package org.jclouds.rackspace.cloudloadbalancers.us; import org.jclouds.providers.internal.BaseProviderMetadataTest; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata; import org.jclouds.rackspace.cloudloadbalancers.us.CloudLoadBalancersUSProviderMetadata; +import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata; import org.testng.annotations.Test; /**