diff --git a/README.txt b/README.txt index ea7040f85b..70ddd37aae 100644 --- a/README.txt +++ b/README.txt @@ -28,7 +28,7 @@ our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory), de to all of these providers our blobstore api supports: aws-s3, cloudfiles-us, cloudfiles-uk, filesystem, - azureblob, atmos (generic), synaptic-storage, + azureblob, atmos (generic), synaptic-storage, hpcloud-objectstorage-las, cloudonestorage, walrus(generic), ninefold-storage, eucalyptus-partnercloud-s3, swift (generic), transient (in-mem) diff --git a/allblobstore/pom.xml b/allblobstore/pom.xml index 42308dd280..e8208dd5a5 100644 --- a/allblobstore/pom.xml +++ b/allblobstore/pom.xml @@ -102,7 +102,7 @@ org.jclouds.provider - hpcloud-object-storage + hpcloud-objectstorage-lvs ${project.version} diff --git a/core/src/main/resources/rest.properties b/core/src/main/resources/rest.properties index 1ab0d14345..3ff7c3d7cd 100644 --- a/core/src/main/resources/rest.properties +++ b/core/src/main/resources/rest.properties @@ -232,8 +232,5 @@ virtualbox.propertiesbuilder=org.jclouds.virtualbox.VirtualBoxPropertiesBuilder filesystem.contextbuilder=org.jclouds.filesystem.FilesystemBlobStoreContextBuilder filesystem.propertiesbuilder=org.jclouds.filesystem.FilesystemBlobStorePropertiesBuilder -hpcloud-compute.contextbuilder=org.jclouds.hpcloud.compute.HPCloudComputeContextBuilder -hpcloud-compute.propertiesbuilder=org.jclouds.hpcloud.compute.HPCloudComputePropertiesBuilder - -hpcloud-object-storage.contextbuilder=org.jclouds.hpcloud.object.storage.HPCloudObjectStorageContextBuilder -hpcloud-object-storage.propertiesbuilder=org.jclouds.hpcloud.object.storage.HPCloudObjectStoragePropertiesBuilder +hpcloud-objectstorage-lvs.contextbuilder=org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasContextBuilder +hpcloud-objectstorage-lvs.propertiesbuilder=org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasPropertiesBuilder diff --git a/providers/hpcloud-object-storage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/hpcloud-object-storage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 1869899e4a..0000000000 --- a/providers/hpcloud-object-storage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.hpcloud.object.storage.HPCloudObjectStorageProviderMetadata diff --git a/providers/hpcloud-object-storage/README.txt b/providers/hpcloud-objectstorage-lvs/README.txt similarity index 100% rename from providers/hpcloud-object-storage/README.txt rename to providers/hpcloud-objectstorage-lvs/README.txt diff --git a/providers/hpcloud-object-storage/pom.xml b/providers/hpcloud-objectstorage-lvs/pom.xml similarity index 85% rename from providers/hpcloud-object-storage/pom.xml rename to providers/hpcloud-objectstorage-lvs/pom.xml index 6e9ca7c888..be4778e4ee 100644 --- a/providers/hpcloud-object-storage/pom.xml +++ b/providers/hpcloud-objectstorage-lvs/pom.xml @@ -28,17 +28,17 @@ ../../project/pom.xml org.jclouds.provider - hpcloud-object-storage - jclouds HP Cloud Object Storage - jclouds components to access HP Cloud Services Object Storage + hpcloud-objectstorage-lvs + jclouds HP Cloud Object Storage in Las Vegas (SuperNAP) + jclouds components to access HP Cloud Services Object Storage in Las Vegas (SuperNAP) bundle - org.jclouds.hpcloud.object.storage.blobstore.integration.HPCloudObjectStorageTestInitializer - https://region-a.geo-1.objects.hpcloudsvc.com/auth - 1.0 - FIXME_IDENTITY - FIXME_CREDENTIAL + org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration.HPCloudObjectStorageLasVegasTestInitializer + https://region-a.geo-1.objects.hpcloudsvc.com/auth + 1.0 + FIXME_IDENTITY + FIXME_CREDENTIAL @@ -107,20 +107,20 @@ - test.hpcloud-object-storage.endpoint - ${test.hpcloud-object-storage.endpoint} + test.hpcloud-objectstorage-lvs.endpoint + ${test.hpcloud-objectstorage-lvs.endpoint} - test.hpcloud-object-storage.apiversion - ${test.hpcloud-object-storage.apiversion} + test.hpcloud-objectstorage-lvs.apiversion + ${test.hpcloud-objectstorage-lvs.apiversion} - test.hpcloud-object-storage.identity - ${test.hpcloud-object-storage.identity} + test.hpcloud-objectstorage-lvs.identity + ${test.hpcloud-objectstorage-lvs.identity} - test.hpcloud-object-storage.credential - ${test.hpcloud-object-storage.credential} + test.hpcloud-objectstorage-lvs.credential + ${test.hpcloud-objectstorage-lvs.credential} test.initializer @@ -152,7 +152,7 @@ ${project.artifactId} - org.jclouds.hpcloud.object.storage.*;version="${project.version}" + org.jclouds.hpcloud.objectstorage.lvs.*;version="${project.version}" org.jclouds.*;version="${project.version}",* diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageAsyncClient.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasAsyncClient.java similarity index 79% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageAsyncClient.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasAsyncClient.java index db330167c3..a31addcc3d 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageAsyncClient.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasAsyncClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage; +package org.jclouds.hpcloud.objectstorage.lvs; import java.util.concurrent.ExecutionException; @@ -26,8 +26,8 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import org.jclouds.blobstore.functions.ReturnNullOnContainerNotFound; -import org.jclouds.hpcloud.object.storage.functions.ParseContainerMetadataFromHeaders; -import org.jclouds.hpcloud.object.storage.options.CreateContainerOptions; +import org.jclouds.hpcloud.objectstorage.lvs.functions.ParseContainerMetadataFromHeaders; +import org.jclouds.hpcloud.objectstorage.lvs.options.CreateContainerOptions; import org.jclouds.openstack.filters.AuthenticateRequest; import org.jclouds.openstack.swift.CommonSwiftAsyncClient; import org.jclouds.openstack.swift.Storage; @@ -42,23 +42,23 @@ import com.google.common.annotations.Beta; import com.google.common.util.concurrent.ListenableFuture; /** - * Provides asynchronous access to HP Cloud Object Storage via the REST API. + * Provides asynchronous access to HP Cloud Object StorageLasVegas via the REST API. * *

All commands return a ListenableFuture of the result. Any exceptions incurred * during processing will be wrapped in an {@link ExecutionException} as documented in * {@link ListenableFuture#get()}. * - * @see HPCloudObjectStorageClient - * @see HP Cloud Object Storage API + * @see HPCloudObjectStorageLasVegasClient + * @see HP Cloud Object StorageLasVegas API * @author Jeremy Daggett */ @SkipEncoding('/') @RequestFilters(AuthenticateRequest.class) @Endpoint(Storage.class) -public interface HPCloudObjectStorageAsyncClient extends CommonSwiftAsyncClient { +public interface HPCloudObjectStorageLasVegasAsyncClient extends CommonSwiftAsyncClient { /** - * @see HPCloudObjectStorageClient#getCDNMetadata(String) + * @see HPCloudObjectStorageLasVegasClient#getCDNMetadata(String) */ @Beta @HEAD @@ -68,7 +68,7 @@ public interface HPCloudObjectStorageAsyncClient extends CommonSwiftAsyncClient ListenableFuture getContainerMetadata(@PathParam("container") String container); /** - * @see HPCloudObjectStorageClient#createContainer + * @see HPCloudObjectStorageLasVegasClient#createContainer */ @PUT @Path("/{container}") diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageClient.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasClient.java similarity index 80% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageClient.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasClient.java index a6778827e0..a9305e9797 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageClient.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasClient.java @@ -16,32 +16,32 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage; +package org.jclouds.hpcloud.objectstorage.lvs; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; -import org.jclouds.hpcloud.object.storage.options.CreateContainerOptions; +import org.jclouds.hpcloud.objectstorage.lvs.options.CreateContainerOptions; import org.jclouds.openstack.swift.CommonSwiftClient; import org.jclouds.openstack.swift.domain.ContainerMetadata; import com.google.common.util.concurrent.ListenableFuture; /** - * Provides synchronous access to HP Cloud Object Storage via the REST API. + * Provides synchronous access to HP Cloud Object StorageLasVegas via the REST API. * *

* All commands return a ListenableFuture of the result. Any exceptions incurred during processing * will be wrapped in an {@link ExecutionException} as documented in {@link ListenableFuture#get()}. * - * @see HPCloudObjectStorageClient - * @see HP Cloud Object - * Storage API + * @see HPCloudObjectStorageLasVegasClient + * @see HP Cloud Object + * StorageLasVegas API * @author Jeremy Daggett */ @Timeout(duration = 120, timeUnit = TimeUnit.SECONDS) -public interface HPCloudObjectStorageClient extends CommonSwiftClient { +public interface HPCloudObjectStorageLasVegasClient extends CommonSwiftClient { boolean createContainer(String container, CreateContainerOptions... options); diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageContextBuilder.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasContextBuilder.java similarity index 64% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageContextBuilder.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasContextBuilder.java index 36ea793ddf..2862411956 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageContextBuilder.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasContextBuilder.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage; +package org.jclouds.hpcloud.objectstorage.lvs; import java.util.List; import java.util.Properties; import org.jclouds.blobstore.BlobStoreContextBuilder; -import org.jclouds.hpcloud.object.storage.blobstore.config.HPCloudObjectStorageBlobStoreContextModule; -import org.jclouds.hpcloud.object.storage.config.HPCloudObjectStorageRestClientModule; +import org.jclouds.hpcloud.objectstorage.lvs.blobstore.config.HPCloudObjectStorageLasVegasBlobStoreContextModule; +import org.jclouds.hpcloud.objectstorage.lvs.config.HPCloudObjectStorageLasVegasRestClientModule; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.logging.jdk.config.JDKLoggingModule; @@ -31,7 +31,7 @@ import com.google.inject.Injector; import com.google.inject.Module; /** - * Creates {@link HPCloudObjectStorageBlobStore} or {@link Injector} instances based on the most + * Creates {@link HPCloudObjectStorageLasVegasBlobStore} or {@link Injector} instances based on the most * commonly requested arguments. *

* Note that Threadsafe objects will be bound as singletons to the Injector or Context provided. @@ -41,21 +41,21 @@ import com.google.inject.Module; * {@link JavaUrlHttpCommandExecutorServiceModule http transports} will be installed. * * @author Adrian Cole, Andrew Newdigate - * @see HPCloudObjectStorageBlobStore + * @see HPCloudObjectStorageLasVegasBlobStore */ -public class HPCloudObjectStorageContextBuilder extends BlobStoreContextBuilder { +public class HPCloudObjectStorageLasVegasContextBuilder extends BlobStoreContextBuilder { - public HPCloudObjectStorageContextBuilder(Properties props) { - super(HPCloudObjectStorageClient.class, HPCloudObjectStorageAsyncClient.class, props); + public HPCloudObjectStorageLasVegasContextBuilder(Properties props) { + super(HPCloudObjectStorageLasVegasClient.class, HPCloudObjectStorageLasVegasAsyncClient.class, props); } @Override protected void addContextModule(List modules) { - modules.add(new HPCloudObjectStorageBlobStoreContextModule()); + modules.add(new HPCloudObjectStorageLasVegasBlobStoreContextModule()); } @Override protected void addClientModule(List modules) { - modules.add(new HPCloudObjectStorageRestClientModule()); + modules.add(new HPCloudObjectStorageLasVegasRestClientModule()); } } diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStoragePropertiesBuilder.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasPropertiesBuilder.java similarity index 87% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStoragePropertiesBuilder.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasPropertiesBuilder.java index 58e928f1a5..931f59fb9c 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStoragePropertiesBuilder.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasPropertiesBuilder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage; +package org.jclouds.hpcloud.objectstorage.lvs; import static org.jclouds.Constants.PROPERTY_API_VERSION; import static org.jclouds.Constants.PROPERTY_ENDPOINT; @@ -30,9 +30,9 @@ import org.jclouds.openstack.swift.SwiftPropertiesBuilder; /** * @author Jeremy Daggett */ -public class HPCloudObjectStoragePropertiesBuilder extends SwiftPropertiesBuilder { +public class HPCloudObjectStorageLasVegasPropertiesBuilder extends SwiftPropertiesBuilder { - public HPCloudObjectStoragePropertiesBuilder(Properties properties) { + public HPCloudObjectStorageLasVegasPropertiesBuilder(Properties properties) { super(properties); } diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageProviderMetadata.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasProviderMetadata.java similarity index 85% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageProviderMetadata.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasProviderMetadata.java index b967a1ed8b..dbc69ec9cd 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageProviderMetadata.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasProviderMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage; +package org.jclouds.hpcloud.objectstorage.lvs; import com.google.common.collect.ImmutableSet; @@ -27,18 +27,18 @@ import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; /** - * Implementation of {@link org.jclouds.providers.ProviderMetadata} for HP Cloud Services Object Storage + * Implementation of {@link org.jclouds.providers.ProviderMetadata} for HP Cloud Services Object StorageLasVegas * * @author Jeremy Daggett */ -public class HPCloudObjectStorageProviderMetadata extends BaseProviderMetadata { +public class HPCloudObjectStorageLasVegasProviderMetadata extends BaseProviderMetadata { /** * {@inheritDoc} */ @Override public String getId() { - return "hpcloud-object-storage"; + return "hpcloud-objectstorage-lvs"; } /** @@ -54,7 +54,7 @@ public class HPCloudObjectStorageProviderMetadata extends BaseProviderMetadata { */ @Override public String getName() { - return "HP Cloud Services Object Storage"; + return "HP Cloud Services Object StorageLasVegas"; } /** @@ -94,7 +94,7 @@ public class HPCloudObjectStorageProviderMetadata extends BaseProviderMetadata { */ @Override public URI getApiDocumentation() { - return URI.create("https://manage.hpcloud.com/pages/build/docs/object-storage/api"); + return URI.create("https://manage.hpcloud.com/pages/build/docs/objectstorage-lvs/api"); } /** @@ -102,7 +102,7 @@ public class HPCloudObjectStorageProviderMetadata extends BaseProviderMetadata { */ @Override public Set getLinkedServices() { - return ImmutableSet.of("hpcloud-object-storage"); + return ImmutableSet.of("hpcloud-objectstorage-lvs"); } /** diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/HPCloudObjectStorageAsyncBlobStore.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/HPCloudObjectStorageLasVegasAsyncBlobStore.java similarity index 84% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/HPCloudObjectStorageAsyncBlobStore.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/HPCloudObjectStorageLasVegasAsyncBlobStore.java index 3ebb663d36..8701e815b0 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/HPCloudObjectStorageAsyncBlobStore.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/HPCloudObjectStorageLasVegasAsyncBlobStore.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.blobstore; +package org.jclouds.hpcloud.objectstorage.lvs.blobstore; import java.util.Set; import java.util.concurrent.ExecutorService; @@ -33,8 +33,8 @@ import org.jclouds.blobstore.strategy.internal.FetchBlobMetadata; import org.jclouds.blobstore.util.BlobUtils; import org.jclouds.collect.Memoized; import org.jclouds.domain.Location; -import org.jclouds.hpcloud.object.storage.HPCloudObjectStorageAsyncClient; -import org.jclouds.hpcloud.object.storage.HPCloudObjectStorageClient; +import org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasAsyncClient; +import org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasClient; import org.jclouds.openstack.swift.blobstore.SwiftAsyncBlobStore; import org.jclouds.openstack.swift.blobstore.functions.BlobStoreListContainerOptionsToListContainerOptions; import org.jclouds.openstack.swift.blobstore.functions.BlobToObject; @@ -50,12 +50,12 @@ import com.google.common.base.Supplier; * @author Adrian Cole */ @Singleton -public class HPCloudObjectStorageAsyncBlobStore extends SwiftAsyncBlobStore { +public class HPCloudObjectStorageLasVegasAsyncBlobStore extends SwiftAsyncBlobStore { @Inject - protected HPCloudObjectStorageAsyncBlobStore(BlobStoreContext context, BlobUtils blobUtils, + protected HPCloudObjectStorageLasVegasAsyncBlobStore(BlobStoreContext context, BlobUtils blobUtils, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService service, Supplier defaultLocation, - @Memoized Supplier> locations, HPCloudObjectStorageClient sync, HPCloudObjectStorageAsyncClient async, + @Memoized Supplier> locations, HPCloudObjectStorageLasVegasClient sync, HPCloudObjectStorageLasVegasAsyncClient async, ContainerToResourceMetadata container2ResourceMd, BlobStoreListContainerOptionsToListContainerOptions container2ContainerListOptions, ContainerToResourceList container2ResourceList, ObjectToBlob object2Blob, BlobToObject blob2Object, @@ -66,4 +66,4 @@ public class HPCloudObjectStorageAsyncBlobStore extends SwiftAsyncBlobStore { blob2ObjectGetOptions, fetchBlobMetadataProvider); } -} \ No newline at end of file +} diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/HPCloudObjectStorageBlobStore.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/HPCloudObjectStorageLasVegasBlobStore.java similarity index 92% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/HPCloudObjectStorageBlobStore.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/HPCloudObjectStorageLasVegasBlobStore.java index 78092e314a..b9f5c0c35a 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/HPCloudObjectStorageBlobStore.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/HPCloudObjectStorageLasVegasBlobStore.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.blobstore; +package org.jclouds.hpcloud.objectstorage.lvs.blobstore; import java.util.Set; @@ -46,10 +46,10 @@ import com.google.common.base.Supplier; * @author Adrian Cole */ @Singleton -public class HPCloudObjectStorageBlobStore extends SwiftBlobStore { +public class HPCloudObjectStorageLasVegasBlobStore extends SwiftBlobStore { @Inject - protected HPCloudObjectStorageBlobStore(BlobStoreContext context, BlobUtils blobUtils, + protected HPCloudObjectStorageLasVegasBlobStore(BlobStoreContext context, BlobUtils blobUtils, Supplier defaultLocation, @Memoized Supplier> locations, CommonSwiftClient sync, ContainerToResourceMetadata container2ResourceMd, BlobStoreListContainerOptionsToListContainerOptions container2ContainerListOptions, diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/config/HPCloudObjectStorageBlobStoreContextModule.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/config/HPCloudObjectStorageLasVegasBlobStoreContextModule.java similarity index 61% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/config/HPCloudObjectStorageBlobStoreContextModule.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/config/HPCloudObjectStorageLasVegasBlobStoreContextModule.java index 5bdead7a85..53037d96ab 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/config/HPCloudObjectStorageBlobStoreContextModule.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/config/HPCloudObjectStorageLasVegasBlobStoreContextModule.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.blobstore.config; +package org.jclouds.hpcloud.objectstorage.lvs.blobstore.config; -import org.jclouds.hpcloud.object.storage.blobstore.HPCloudObjectStorageAsyncBlobStore; -import org.jclouds.hpcloud.object.storage.blobstore.HPCloudObjectStorageBlobStore; -import org.jclouds.hpcloud.object.storage.blobstore.functions.HPCloudObjectStorageObjectToBlobMetadata; +import org.jclouds.hpcloud.objectstorage.lvs.blobstore.HPCloudObjectStorageLasVegasAsyncBlobStore; +import org.jclouds.hpcloud.objectstorage.lvs.blobstore.HPCloudObjectStorageLasVegasBlobStore; +import org.jclouds.hpcloud.objectstorage.lvs.blobstore.functions.HPCloudObjectStorageLasVegasObjectToBlobMetadata; import org.jclouds.openstack.swift.blobstore.SwiftAsyncBlobStore; import org.jclouds.openstack.swift.blobstore.SwiftBlobStore; import org.jclouds.openstack.swift.blobstore.config.SwiftBlobStoreContextModule; @@ -30,13 +30,13 @@ import org.jclouds.openstack.swift.blobstore.functions.ObjectToBlobMetadata; * * @author Adrian Cole */ -public class HPCloudObjectStorageBlobStoreContextModule extends SwiftBlobStoreContextModule { +public class HPCloudObjectStorageLasVegasBlobStoreContextModule extends SwiftBlobStoreContextModule { @Override protected void configure() { super.configure(); - bind(SwiftBlobStore.class).to(HPCloudObjectStorageBlobStore.class); - bind(SwiftAsyncBlobStore.class).to(HPCloudObjectStorageAsyncBlobStore.class); - bind(ObjectToBlobMetadata.class).to(HPCloudObjectStorageObjectToBlobMetadata.class); + bind(SwiftBlobStore.class).to(HPCloudObjectStorageLasVegasBlobStore.class); + bind(SwiftAsyncBlobStore.class).to(HPCloudObjectStorageLasVegasAsyncBlobStore.class); + bind(ObjectToBlobMetadata.class).to(HPCloudObjectStorageLasVegasObjectToBlobMetadata.class); } } diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/functions/HPCloudObjectStorageObjectToBlobMetadata.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/functions/HPCloudObjectStorageLasVegasObjectToBlobMetadata.java similarity index 83% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/functions/HPCloudObjectStorageObjectToBlobMetadata.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/functions/HPCloudObjectStorageLasVegasObjectToBlobMetadata.java index 62d457fcab..e645191dd8 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/functions/HPCloudObjectStorageObjectToBlobMetadata.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/functions/HPCloudObjectStorageLasVegasObjectToBlobMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.blobstore.functions; +package org.jclouds.hpcloud.objectstorage.lvs.blobstore.functions; import javax.inject.Inject; import javax.inject.Singleton; @@ -30,10 +30,10 @@ import org.jclouds.openstack.swift.domain.ObjectInfo; * @author Adrian Cole */ @Singleton -public class HPCloudObjectStorageObjectToBlobMetadata extends ObjectToBlobMetadata { +public class HPCloudObjectStorageLasVegasObjectToBlobMetadata extends ObjectToBlobMetadata { @Inject - public HPCloudObjectStorageObjectToBlobMetadata(IfDirectoryReturnNameStrategy ifDirectoryReturnName) { + public HPCloudObjectStorageLasVegasObjectToBlobMetadata(IfDirectoryReturnNameStrategy ifDirectoryReturnName) { super(ifDirectoryReturnName); } diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/config/HPCloudObjectStorageRestClientModule.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/config/HPCloudObjectStorageLasVegasRestClientModule.java similarity index 69% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/config/HPCloudObjectStorageRestClientModule.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/config/HPCloudObjectStorageLasVegasRestClientModule.java index 3487cef763..bf39983442 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/config/HPCloudObjectStorageRestClientModule.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/config/HPCloudObjectStorageLasVegasRestClientModule.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.config; +package org.jclouds.hpcloud.objectstorage.lvs.config; import javax.inject.Singleton; -import org.jclouds.hpcloud.object.storage.HPCloudObjectStorageAsyncClient; -import org.jclouds.hpcloud.object.storage.HPCloudObjectStorageClient; +import org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasAsyncClient; +import org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasClient; import org.jclouds.http.RequiresHttp; import org.jclouds.openstack.swift.CommonSwiftAsyncClient; import org.jclouds.openstack.swift.CommonSwiftClient; @@ -36,22 +36,22 @@ import com.google.inject.Provides; */ @ConfiguresRestClient @RequiresHttp -public class HPCloudObjectStorageRestClientModule extends - BaseSwiftRestClientModule { +public class HPCloudObjectStorageLasVegasRestClientModule extends + BaseSwiftRestClientModule { - public HPCloudObjectStorageRestClientModule() { - super(HPCloudObjectStorageClient.class, HPCloudObjectStorageAsyncClient.class); + public HPCloudObjectStorageLasVegasRestClientModule() { + super(HPCloudObjectStorageLasVegasClient.class, HPCloudObjectStorageLasVegasAsyncClient.class); } @Provides @Singleton - CommonSwiftClient provideCommonSwiftClient(HPCloudObjectStorageClient in) { + CommonSwiftClient provideCommonSwiftClient(HPCloudObjectStorageLasVegasClient in) { return in; } @Provides @Singleton - CommonSwiftAsyncClient provideCommonSwiftClient(HPCloudObjectStorageAsyncClient in) { + CommonSwiftAsyncClient provideCommonSwiftClient(HPCloudObjectStorageLasVegasAsyncClient in) { return in; } diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/domain/ContainerCDNMetadata.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/domain/ContainerCDNMetadata.java similarity index 98% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/domain/ContainerCDNMetadata.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/domain/ContainerCDNMetadata.java index 203bd6679c..64acd6148c 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/domain/ContainerCDNMetadata.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/domain/ContainerCDNMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.domain; +package org.jclouds.hpcloud.objectstorage.lvs.domain; import java.net.URI; diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/functions/ParseContainerMetadataFromHeaders.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/functions/ParseContainerMetadataFromHeaders.java similarity index 94% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/functions/ParseContainerMetadataFromHeaders.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/functions/ParseContainerMetadataFromHeaders.java index b54db37cca..ed24e0eb9d 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/functions/ParseContainerMetadataFromHeaders.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/functions/ParseContainerMetadataFromHeaders.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.functions; +package org.jclouds.hpcloud.objectstorage.lvs.functions; import static com.google.common.base.Preconditions.checkArgument; @@ -33,7 +33,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; /** - * This parses @{link {@link org.jclouds.hpcloud.object.storage.domain.ContainerMetadata} from + * This parses @{link {@link org.jclouds.hpcloud.objectstorage.lvs.domain.ContainerMetadata} from * HTTP headers. * * @author Jeremy Daggett diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/options/CreateContainerOptions.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/options/CreateContainerOptions.java similarity index 98% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/options/CreateContainerOptions.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/options/CreateContainerOptions.java index 5d82695a72..cf5a703aff 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/options/CreateContainerOptions.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/options/CreateContainerOptions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.options; +package org.jclouds.hpcloud.objectstorage.lvs.options; import java.util.Map; import java.util.Map.Entry; diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/options/ListCDNContainerOptions.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/options/ListCDNContainerOptions.java similarity index 98% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/options/ListCDNContainerOptions.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/options/ListCDNContainerOptions.java index 5c45f5e73e..0252e1cf2e 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/options/ListCDNContainerOptions.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/options/ListCDNContainerOptions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.options; +package org.jclouds.hpcloud.objectstorage.lvs.options; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/package-info.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/package-info.java similarity index 80% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/package-info.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/package-info.java index 12f8f21b7d..d1b1523289 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/package-info.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/package-info.java @@ -18,10 +18,10 @@ */ /** - * This package contains an HP Cloud Object Storage client implemented by {@link org.jclouds.http.HttpCommandExecutorService} commands. + * This package contains an HP Cloud Object StorageLasVegas client implemented by {@link org.jclouds.http.HttpCommandExecutorService} commands. * - * @see + * @see * * @author Jeremy Daggett */ -package org.jclouds.hpcloud.object.storage; +package org.jclouds.hpcloud.objectstorage.lvs; diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/reference/HPCloudObjectStorageConstants.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/reference/HPCloudObjectStorageLasVegasConstants.java similarity index 87% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/reference/HPCloudObjectStorageConstants.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/reference/HPCloudObjectStorageLasVegasConstants.java index 280a13319b..70ef5f5ba0 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/reference/HPCloudObjectStorageConstants.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/reference/HPCloudObjectStorageLasVegasConstants.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.reference; +package org.jclouds.hpcloud.objectstorage.lvs.reference; /** - * Configuration properties and constants used by HP Cloud Object Storage. + * Configuration properties and constants used by HP Cloud Object StorageLasVegas. * * @author Jeremy Daggett */ -public interface HPCloudObjectStorageConstants { +public interface HPCloudObjectStorageLasVegasConstants { } diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/reference/HPCloudObjectStorageHeaders.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/reference/HPCloudObjectStorageLasVegasHeaders.java similarity index 80% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/reference/HPCloudObjectStorageHeaders.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/reference/HPCloudObjectStorageLasVegasHeaders.java index f80beeaf02..2e805b13f6 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/reference/HPCloudObjectStorageHeaders.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/reference/HPCloudObjectStorageLasVegasHeaders.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.reference; +package org.jclouds.hpcloud.objectstorage.lvs.reference; import org.jclouds.openstack.swift.reference.SwiftHeaders; /** - * Additional headers specified by HP Cloud Object Storage REST API. + * Additional headers specified by HP Cloud Object StorageLasVegas REST API. * - * @see + * @see * @author Jeremy Daggett * */ -public interface HPCloudObjectStorageHeaders extends SwiftHeaders { +public interface HPCloudObjectStorageLasVegasHeaders extends SwiftHeaders { } diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/reference/package-info.java b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/reference/package-info.java similarity index 90% rename from providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/reference/package-info.java rename to providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/reference/package-info.java index 3d650cf66b..a4f9b1f491 100644 --- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/reference/package-info.java +++ b/providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/reference/package-info.java @@ -18,8 +18,8 @@ */ /** - * This package contains properties and reference data used in HP Cloud Object Storage. + * This package contains properties and reference data used in HP Cloud Object StorageLasVegas. * * @author Jeremy Daggett */ -package org.jclouds.hpcloud.object.storage.reference; +package org.jclouds.hpcloud.objectstorage.lvs.reference; diff --git a/providers/hpcloud-objectstorage-lvs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/hpcloud-objectstorage-lvs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata new file mode 100644 index 0000000000..1f4052b13e --- /dev/null +++ b/providers/hpcloud-objectstorage-lvs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata @@ -0,0 +1 @@ +org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasProviderMetadata diff --git a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageClientLiveTest.java b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasClientLiveTest.java similarity index 75% rename from providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageClientLiveTest.java rename to providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasClientLiveTest.java index 2cec991940..3f598ace2a 100644 --- a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageClientLiveTest.java +++ b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasClientLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage; +package org.jclouds.hpcloud.objectstorage.lvs; import static org.testng.Assert.assertEquals; @@ -28,12 +28,12 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = "live", testName = "HPCloudObjectStorageClientLiveTest") -public class HPCloudObjectStorageClientLiveTest extends CommonSwiftClientLiveTest { +@Test(groups = "live", testName = "HPCloudObjectStorageLasVegasClientLiveTest") +public class HPCloudObjectStorageLasVegasClientLiveTest extends CommonSwiftClientLiveTest { @Override - public HPCloudObjectStorageClient getApi() { - return (HPCloudObjectStorageClient) context.getProviderSpecificContext().getApi(); + public HPCloudObjectStorageLasVegasClient getApi() { + return (HPCloudObjectStorageLasVegasClient) context.getProviderSpecificContext().getApi(); } @Override diff --git a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageProviderTest.java b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasProviderTest.java similarity index 65% rename from providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageProviderTest.java rename to providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasProviderTest.java index 8c1608b9df..c068997061 100644 --- a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageProviderTest.java +++ b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasProviderTest.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage; +package org.jclouds.hpcloud.objectstorage.lvs; import org.jclouds.providers.BaseProviderMetadataTest; import org.jclouds.providers.ProviderMetadata; import org.testng.annotations.Test; /** - * The HPCloudObjectStorageProviderTest tests the {@link org.jclouds.hpcloud.object.storage.HPCloudObjectStorageProviderMetadata} class. + * The HPCloudObjectStorageLasVegasProviderTest tests the {@link org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasProviderMetadata} class. * * @author Jeremy Daggett */ -@Test(groups = "unit", testName = "HPCloudObjectStorageProviderTest") -public class HPCloudObjectStorageProviderTest extends BaseProviderMetadataTest { +@Test(groups = "unit", testName = "HPCloudObjectStorageLasVegasProviderTest") +public class HPCloudObjectStorageLasVegasProviderTest extends BaseProviderMetadataTest { - public HPCloudObjectStorageProviderTest() { - super(new HPCloudObjectStorageProviderMetadata(), ProviderMetadata.BLOBSTORE_TYPE); + public HPCloudObjectStorageLasVegasProviderTest() { + super(new HPCloudObjectStorageLasVegasProviderMetadata(), ProviderMetadata.BLOBSTORE_TYPE); } -} \ No newline at end of file +} diff --git a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobIntegrationLiveTest.java b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobIntegrationLiveTest.java similarity index 89% rename from providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobIntegrationLiveTest.java rename to providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobIntegrationLiveTest.java index 151ad03407..8778fda3b1 100644 --- a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobIntegrationLiveTest.java +++ b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobIntegrationLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.blobstore.integration; +package org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration; import org.jclouds.blobstore.domain.Blob; import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobIntegrationLiveTest; @@ -26,7 +26,7 @@ import org.testng.annotations.Test; * @author Jeremy Daggett */ @Test(groups = "live") -public class HPCloudObjectStorageBlobIntegrationLiveTest extends SwiftBlobIntegrationLiveTest { +public class HPCloudObjectStorageLasVegasBlobIntegrationLiveTest extends SwiftBlobIntegrationLiveTest { @Override protected void checkContentDisposition(Blob blob, String contentDisposition) { assert blob.getPayload().getContentMetadata().getContentDisposition().startsWith(contentDisposition) : blob diff --git a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobLiveTest.java b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobLiveTest.java similarity index 86% rename from providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobLiveTest.java rename to providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobLiveTest.java index 7d6fbe68c3..4be59d2247 100644 --- a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobLiveTest.java +++ b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.blobstore.integration; +package org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration; import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobLiveTest; import org.testng.annotations.Test; @@ -25,6 +25,6 @@ import org.testng.annotations.Test; * @author Jeremy Daggett */ @Test(groups = { "live" }) -public class HPCloudObjectStorageBlobLiveTest extends SwiftBlobLiveTest { +public class HPCloudObjectStorageLasVegasBlobLiveTest extends SwiftBlobLiveTest { } diff --git a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobMapIntegrationLiveTest.java b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobMapIntegrationLiveTest.java similarity index 84% rename from providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobMapIntegrationLiveTest.java rename to providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobMapIntegrationLiveTest.java index 241b758035..ef113697ed 100644 --- a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobMapIntegrationLiveTest.java +++ b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobMapIntegrationLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.blobstore.integration; +package org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration; import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobMapIntegrationLiveTest; import org.testng.annotations.Test; @@ -25,6 +25,6 @@ import org.testng.annotations.Test; * @author Jeremy Daggett */ @Test(groups = "live") -public class HPCloudObjectStorageBlobMapIntegrationLiveTest extends SwiftBlobMapIntegrationLiveTest { +public class HPCloudObjectStorageLasVegasBlobMapIntegrationLiveTest extends SwiftBlobMapIntegrationLiveTest { } diff --git a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobSignerLiveTest.java b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobSignerLiveTest.java similarity index 85% rename from providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobSignerLiveTest.java rename to providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobSignerLiveTest.java index 6eb63b4622..f4c40f806b 100644 --- a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobSignerLiveTest.java +++ b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobSignerLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.blobstore.integration; +package org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration; import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobSignerLiveTest; import org.testng.annotations.Test; @@ -25,6 +25,6 @@ import org.testng.annotations.Test; * @author Jeremy Daggett */ @Test(groups = { "live" }) -public class HPCloudObjectStorageBlobSignerLiveTest extends SwiftBlobSignerLiveTest { +public class HPCloudObjectStorageLasVegasBlobSignerLiveTest extends SwiftBlobSignerLiveTest { } diff --git a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageContainerIntegrationLiveTest.java b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasContainerIntegrationLiveTest.java similarity index 84% rename from providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageContainerIntegrationLiveTest.java rename to providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasContainerIntegrationLiveTest.java index a251c48a60..8917ef071a 100644 --- a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageContainerIntegrationLiveTest.java +++ b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasContainerIntegrationLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.blobstore.integration; +package org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration; import org.jclouds.openstack.swift.blobstore.integration.SwiftContainerIntegrationLiveTest; import org.testng.annotations.Test; @@ -25,6 +25,6 @@ import org.testng.annotations.Test; * @author Jeremy Daggett */ @Test(groups = "live") -public class HPCloudObjectStorageContainerIntegrationLiveTest extends SwiftContainerIntegrationLiveTest { +public class HPCloudObjectStorageLasVegasContainerIntegrationLiveTest extends SwiftContainerIntegrationLiveTest { } diff --git a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageContainerLiveTest.java b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasContainerLiveTest.java similarity index 88% rename from providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageContainerLiveTest.java rename to providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasContainerLiveTest.java index 8cf28bb971..84583af635 100644 --- a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageContainerLiveTest.java +++ b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasContainerLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.blobstore.integration; +package org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration; import java.io.IOException; import java.net.MalformedURLException; @@ -28,7 +28,7 @@ import org.testng.annotations.Test; * @author Jeremy Daggett */ @Test(groups = { "live" }) -public class HPCloudObjectStorageContainerLiveTest extends BaseContainerLiveTest { +public class HPCloudObjectStorageLasVegasContainerLiveTest extends BaseContainerLiveTest { @Test(expectedExceptions=UnsupportedOperationException.class) public void testPublicAccess() throws MalformedURLException, InterruptedException, IOException { diff --git a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageInputStreamMapIntegrationLiveTest.java b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasInputStreamMapIntegrationLiveTest.java similarity index 83% rename from providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageInputStreamMapIntegrationLiveTest.java rename to providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasInputStreamMapIntegrationLiveTest.java index 049cb3f145..415f58aa32 100644 --- a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageInputStreamMapIntegrationLiveTest.java +++ b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasInputStreamMapIntegrationLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.blobstore.integration; +package org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration; import org.jclouds.openstack.swift.blobstore.integration.SwiftInputStreamMapIntegrationLiveTest; import org.testng.annotations.Test; @@ -25,6 +25,6 @@ import org.testng.annotations.Test; * @author Jeremy Daggett */ @Test(groups = "live") -public class HPCloudObjectStorageInputStreamMapIntegrationLiveTest extends SwiftInputStreamMapIntegrationLiveTest { +public class HPCloudObjectStorageLasVegasInputStreamMapIntegrationLiveTest extends SwiftInputStreamMapIntegrationLiveTest { } diff --git a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageServiceIntegrationLiveTest.java b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasServiceIntegrationLiveTest.java similarity index 86% rename from providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageServiceIntegrationLiveTest.java rename to providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasServiceIntegrationLiveTest.java index 6bfe683cce..50cfade7eb 100644 --- a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageServiceIntegrationLiveTest.java +++ b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasServiceIntegrationLiveTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.blobstore.integration; +package org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration; import java.util.Set; @@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableSet; * @author Jeremy Daggett */ @Test(groups = "live") -public class HPCloudObjectStorageServiceIntegrationLiveTest extends SwiftServiceIntegrationLiveTest { +public class HPCloudObjectStorageLasVegasServiceIntegrationLiveTest extends SwiftServiceIntegrationLiveTest { @Override protected Set getIso3166Codes() { return ImmutableSet. of("US-NV"); diff --git a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageTestInitializer.java b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasTestInitializer.java similarity index 77% rename from providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageTestInitializer.java rename to providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasTestInitializer.java index 4fb4fc3675..5e4407d44a 100644 --- a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageTestInitializer.java +++ b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasTestInitializer.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.blobstore.integration; +package org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration; import org.jclouds.openstack.swift.blobstore.integration.SwiftTestInitializer; /** * @author Jeremy Daggett */ -public class HPCloudObjectStorageTestInitializer extends SwiftTestInitializer { +public class HPCloudObjectStorageLasVegasTestInitializer extends SwiftTestInitializer { - public HPCloudObjectStorageTestInitializer() { - provider = "hpcloud-object-storage"; + public HPCloudObjectStorageLasVegasTestInitializer() { + provider = "hpcloud-objectstorage-lvs"; } } diff --git a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java similarity index 95% rename from providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java rename to providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java index 40aa7b2ed5..87719f7964 100644 --- a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java +++ b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.functions; +package org.jclouds.hpcloud.objectstorage.lvs.functions; import static org.testng.Assert.assertEquals; @@ -25,7 +25,7 @@ import java.net.URI; import java.util.Set; import java.util.SortedSet; -import org.jclouds.hpcloud.object.storage.domain.ContainerCDNMetadata; +import org.jclouds.hpcloud.objectstorage.lvs.domain.ContainerCDNMetadata; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; import org.jclouds.io.Payloads; diff --git a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/options/CreateContainerOptionsTest.java b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/options/CreateContainerOptionsTest.java similarity index 98% rename from providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/options/CreateContainerOptionsTest.java rename to providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/options/CreateContainerOptionsTest.java index 2f5904f9ed..4548eaaeaa 100644 --- a/providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/options/CreateContainerOptionsTest.java +++ b/providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/options/CreateContainerOptionsTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.hpcloud.object.storage.options; +package org.jclouds.hpcloud.objectstorage.lvs.options; import static org.testng.Assert.assertEquals; diff --git a/providers/hpcloud-object-storage/src/test/resources/log4j.xml b/providers/hpcloud-objectstorage-lvs/src/test/resources/log4j.xml similarity index 100% rename from providers/hpcloud-object-storage/src/test/resources/log4j.xml rename to providers/hpcloud-objectstorage-lvs/src/test/resources/log4j.xml diff --git a/providers/hpcloud-object-storage/src/test/resources/test_list_cdn.json b/providers/hpcloud-objectstorage-lvs/src/test/resources/test_list_cdn.json similarity index 100% rename from providers/hpcloud-object-storage/src/test/resources/test_list_cdn.json rename to providers/hpcloud-objectstorage-lvs/src/test/resources/test_list_cdn.json diff --git a/providers/pom.xml b/providers/pom.xml index b5c47b1635..8dbcc79e72 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -68,6 +68,6 @@ go2cloud-jhb1 softlayer ninefold-compute - hpcloud-object-storage + hpcloud-objectstorage-lvs