Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 791:add hpcloud-objectstorage-lvs provider

This commit is contained in:
Adrian Cole 2011-12-20 12:39:15 -08:00
parent 766b0ab5ba
commit 827e0d1f06
41 changed files with 141 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.txt
View File

@ -28,7 +28,7 @@ our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory), de
to all of these providers to all of these providers
our blobstore api supports: aws-s3, cloudfiles-us, cloudfiles-uk, filesystem, 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, cloudonestorage, walrus(generic), ninefold-storage,
eucalyptus-partnercloud-s3, swift (generic), transient (in-mem) eucalyptus-partnercloud-s3, swift (generic), transient (in-mem)

2
allblobstore/pom.xml
View File

@ -102,7 +102,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jclouds.provider</groupId> <groupId>org.jclouds.provider</groupId>
<artifactId>hpcloud-object-storage</artifactId> <artifactId>hpcloud-objectstorage-lvs</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

7
core/src/main/resources/rest.properties
View File

@ -232,8 +232,5 @@ virtualbox.propertiesbuilder=org.jclouds.virtualbox.VirtualBoxPropertiesBuilder
filesystem.contextbuilder=org.jclouds.filesystem.FilesystemBlobStoreContextBuilder filesystem.contextbuilder=org.jclouds.filesystem.FilesystemBlobStoreContextBuilder
filesystem.propertiesbuilder=org.jclouds.filesystem.FilesystemBlobStorePropertiesBuilder filesystem.propertiesbuilder=org.jclouds.filesystem.FilesystemBlobStorePropertiesBuilder
hpcloud-compute.contextbuilder=org.jclouds.hpcloud.compute.HPCloudComputeContextBuilder hpcloud-objectstorage-lvs.contextbuilder=org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasContextBuilder
hpcloud-compute.propertiesbuilder=org.jclouds.hpcloud.compute.HPCloudComputePropertiesBuilder hpcloud-objectstorage-lvs.propertiesbuilder=org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasPropertiesBuilder
hpcloud-object-storage.contextbuilder=org.jclouds.hpcloud.object.storage.HPCloudObjectStorageContextBuilder
hpcloud-object-storage.propertiesbuilder=org.jclouds.hpcloud.object.storage.HPCloudObjectStoragePropertiesBuilder

1
providers/hpcloud-object-storage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
View File

@ -1 +0,0 @@
org.jclouds.hpcloud.object.storage.HPCloudObjectStorageProviderMetadata

0
providers/hpcloud-object-storage/README.txt → providers/hpcloud-objectstorage-lvs/README.txt
View File

34
providers/hpcloud-object-storage/pom.xml → providers/hpcloud-objectstorage-lvs/pom.xml
View File

@ -28,17 +28,17 @@
<relativePath>../../project/pom.xml</relativePath> <relativePath>../../project/pom.xml</relativePath>
</parent> </parent>
<groupId>org.jclouds.provider</groupId> <groupId>org.jclouds.provider</groupId>
<artifactId>hpcloud-object-storage</artifactId> <artifactId>hpcloud-objectstorage-lvs</artifactId>
<name>jclouds HP Cloud Object Storage</name> <name>jclouds HP Cloud Object Storage in Las Vegas (SuperNAP)</name>
<description>jclouds components to access HP Cloud Services Object Storage</description> <description>jclouds components to access HP Cloud Services Object Storage in Las Vegas (SuperNAP)</description>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<properties> <properties>
<test.initializer>org.jclouds.hpcloud.object.storage.blobstore.integration.HPCloudObjectStorageTestInitializer</test.initializer> <test.initializer>org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration.HPCloudObjectStorageLasVegasTestInitializer</test.initializer>
<test.hpcloud-object-storage.endpoint>https://region-a.geo-1.objects.hpcloudsvc.com/auth</test.hpcloud-object-storage.endpoint> <test.hpcloud-objectstorage-lvs.endpoint>https://region-a.geo-1.objects.hpcloudsvc.com/auth</test.hpcloud-objectstorage-lvs.endpoint>
<test.hpcloud-object-storage.apiversion>1.0</test.hpcloud-object-storage.apiversion> <test.hpcloud-objectstorage-lvs.apiversion>1.0</test.hpcloud-objectstorage-lvs.apiversion>
<test.hpcloud-object-storage.identity>FIXME_IDENTITY</test.hpcloud-object-storage.identity> <test.hpcloud-objectstorage-lvs.identity>FIXME_IDENTITY</test.hpcloud-objectstorage-lvs.identity>
<test.hpcloud-object-storage.credential>FIXME_CREDENTIAL</test.hpcloud-object-storage.credential> <test.hpcloud-objectstorage-lvs.credential>FIXME_CREDENTIAL</test.hpcloud-objectstorage-lvs.credential>
</properties> </properties>
<dependencies> <dependencies>
@ -107,20 +107,20 @@
<configuration> <configuration>
<systemProperties> <systemProperties>
<property> <property>
<name>test.hpcloud-object-storage.endpoint</name> <name>test.hpcloud-objectstorage-lvs.endpoint</name>
<value>${test.hpcloud-object-storage.endpoint}</value> <value>${test.hpcloud-objectstorage-lvs.endpoint}</value>
</property> </property>
<property> <property>
<name>test.hpcloud-object-storage.apiversion</name> <name>test.hpcloud-objectstorage-lvs.apiversion</name>
<value>${test.hpcloud-object-storage.apiversion}</value> <value>${test.hpcloud-objectstorage-lvs.apiversion}</value>
</property> </property>
<property> <property>
<name>test.hpcloud-object-storage.identity</name> <name>test.hpcloud-objectstorage-lvs.identity</name>
<value>${test.hpcloud-object-storage.identity}</value> <value>${test.hpcloud-objectstorage-lvs.identity}</value>
</property> </property>
<property> <property>
<name>test.hpcloud-object-storage.credential</name> <name>test.hpcloud-objectstorage-lvs.credential</name>
<value>${test.hpcloud-object-storage.credential}</value> <value>${test.hpcloud-objectstorage-lvs.credential}</value>
</property> </property>
<property> <property>
<name>test.initializer</name> <name>test.initializer</name>
@ -152,7 +152,7 @@
<configuration> <configuration>
<instructions> <instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.jclouds.hpcloud.object.storage.*;version="${project.version}"</Export-Package> <Export-Package>org.jclouds.hpcloud.objectstorage.lvs.*;version="${project.version}"</Export-Package>
<Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package> <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>

18
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageAsyncClient.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasAsyncClient.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.hpcloud.object.storage; package org.jclouds.hpcloud.objectstorage.lvs;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@ -26,8 +26,8 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam; import javax.ws.rs.PathParam;
import org.jclouds.blobstore.functions.ReturnNullOnContainerNotFound; import org.jclouds.blobstore.functions.ReturnNullOnContainerNotFound;
import org.jclouds.hpcloud.object.storage.functions.ParseContainerMetadataFromHeaders; import org.jclouds.hpcloud.objectstorage.lvs.functions.ParseContainerMetadataFromHeaders;
import org.jclouds.hpcloud.object.storage.options.CreateContainerOptions; import org.jclouds.hpcloud.objectstorage.lvs.options.CreateContainerOptions;
import org.jclouds.openstack.filters.AuthenticateRequest; import org.jclouds.openstack.filters.AuthenticateRequest;
import org.jclouds.openstack.swift.CommonSwiftAsyncClient; import org.jclouds.openstack.swift.CommonSwiftAsyncClient;
import org.jclouds.openstack.swift.Storage; import org.jclouds.openstack.swift.Storage;
@ -42,23 +42,23 @@ import com.google.common.annotations.Beta;
import com.google.common.util.concurrent.ListenableFuture; 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.
* *
* <p/>All commands return a ListenableFuture of the result. Any exceptions incurred * <p/>All commands return a ListenableFuture of the result. Any exceptions incurred
* during processing will be wrapped in an {@link ExecutionException} as documented in * during processing will be wrapped in an {@link ExecutionException} as documented in
* {@link ListenableFuture#get()}. * {@link ListenableFuture#get()}.
* *
* @see HPCloudObjectStorageClient * @see HPCloudObjectStorageLasVegasClient
* @see <a href="https://manage.hpcloud.com/pages/build/docs/object-storage/api">HP Cloud Object Storage API</a> * @see <a href="https://manage.hpcloud.com/pages/build/docs/objectstorage-lvs/api">HP Cloud Object StorageLasVegas API</a>
* @author Jeremy Daggett * @author Jeremy Daggett
*/ */
@SkipEncoding('/') @SkipEncoding('/')
@RequestFilters(AuthenticateRequest.class) @RequestFilters(AuthenticateRequest.class)
@Endpoint(Storage.class) @Endpoint(Storage.class)
public interface HPCloudObjectStorageAsyncClient extends CommonSwiftAsyncClient { public interface HPCloudObjectStorageLasVegasAsyncClient extends CommonSwiftAsyncClient {
/** /**
* @see HPCloudObjectStorageClient#getCDNMetadata(String) * @see HPCloudObjectStorageLasVegasClient#getCDNMetadata(String)
*/ */
@Beta @Beta
@HEAD @HEAD
@ -68,7 +68,7 @@ public interface HPCloudObjectStorageAsyncClient extends CommonSwiftAsyncClient
ListenableFuture<ContainerMetadata> getContainerMetadata(@PathParam("container") String container); ListenableFuture<ContainerMetadata> getContainerMetadata(@PathParam("container") String container);
/** /**
* @see HPCloudObjectStorageClient#createContainer * @see HPCloudObjectStorageLasVegasClient#createContainer
*/ */
@PUT @PUT
@Path("/{container}") @Path("/{container}")

14
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageClient.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasClient.java
View File

@ -16,32 +16,32 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.hpcloud.object.storage; package org.jclouds.hpcloud.objectstorage.lvs;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout; 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.CommonSwiftClient;
import org.jclouds.openstack.swift.domain.ContainerMetadata; import org.jclouds.openstack.swift.domain.ContainerMetadata;
import com.google.common.util.concurrent.ListenableFuture; 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.
* *
* <p/> * <p/>
* All commands return a ListenableFuture of the result. Any exceptions incurred during processing * 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()}. * will be wrapped in an {@link ExecutionException} as documented in {@link ListenableFuture#get()}.
* *
* @see HPCloudObjectStorageClient * @see HPCloudObjectStorageLasVegasClient
* @see <a href="https://manage.hpcloud.com/pages/build/docs/object-storage/api">HP Cloud Object * @see <a href="https://manage.hpcloud.com/pages/build/docs/objectstorage-lvs/api">HP Cloud Object
* Storage API</a> * StorageLasVegas API</a>
* @author Jeremy Daggett * @author Jeremy Daggett
*/ */
@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS) @Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
public interface HPCloudObjectStorageClient extends CommonSwiftClient { public interface HPCloudObjectStorageLasVegasClient extends CommonSwiftClient {
boolean createContainer(String container, CreateContainerOptions... options); boolean createContainer(String container, CreateContainerOptions... options);

20
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageContextBuilder.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasContextBuilder.java
View File

@ -16,14 +16,14 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.hpcloud.object.storage; package org.jclouds.hpcloud.objectstorage.lvs;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
import org.jclouds.blobstore.BlobStoreContextBuilder; import org.jclouds.blobstore.BlobStoreContextBuilder;
import org.jclouds.hpcloud.object.storage.blobstore.config.HPCloudObjectStorageBlobStoreContextModule; import org.jclouds.hpcloud.objectstorage.lvs.blobstore.config.HPCloudObjectStorageLasVegasBlobStoreContextModule;
import org.jclouds.hpcloud.object.storage.config.HPCloudObjectStorageRestClientModule; import org.jclouds.hpcloud.objectstorage.lvs.config.HPCloudObjectStorageLasVegasRestClientModule;
import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
import org.jclouds.logging.jdk.config.JDKLoggingModule; import org.jclouds.logging.jdk.config.JDKLoggingModule;
@ -31,7 +31,7 @@ import com.google.inject.Injector;
import com.google.inject.Module; 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. * commonly requested arguments.
* <p/> * <p/>
* Note that Threadsafe objects will be bound as singletons to the Injector or Context provided. * 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. * {@link JavaUrlHttpCommandExecutorServiceModule http transports} will be installed.
* *
* @author Adrian Cole, Andrew Newdigate * @author Adrian Cole, Andrew Newdigate
* @see HPCloudObjectStorageBlobStore * @see HPCloudObjectStorageLasVegasBlobStore
*/ */
public class HPCloudObjectStorageContextBuilder extends BlobStoreContextBuilder<HPCloudObjectStorageClient, HPCloudObjectStorageAsyncClient> { public class HPCloudObjectStorageLasVegasContextBuilder extends BlobStoreContextBuilder<HPCloudObjectStorageLasVegasClient, HPCloudObjectStorageLasVegasAsyncClient> {
public HPCloudObjectStorageContextBuilder(Properties props) { public HPCloudObjectStorageLasVegasContextBuilder(Properties props) {
super(HPCloudObjectStorageClient.class, HPCloudObjectStorageAsyncClient.class, props); super(HPCloudObjectStorageLasVegasClient.class, HPCloudObjectStorageLasVegasAsyncClient.class, props);
} }
@Override @Override
protected void addContextModule(List<Module> modules) { protected void addContextModule(List<Module> modules) {
modules.add(new HPCloudObjectStorageBlobStoreContextModule()); modules.add(new HPCloudObjectStorageLasVegasBlobStoreContextModule());
} }
@Override @Override
protected void addClientModule(List<Module> modules) { protected void addClientModule(List<Module> modules) {
modules.add(new HPCloudObjectStorageRestClientModule()); modules.add(new HPCloudObjectStorageLasVegasRestClientModule());
} }
} }

6
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStoragePropertiesBuilder.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasPropertiesBuilder.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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_API_VERSION;
import static org.jclouds.Constants.PROPERTY_ENDPOINT; import static org.jclouds.Constants.PROPERTY_ENDPOINT;
@ -30,9 +30,9 @@ import org.jclouds.openstack.swift.SwiftPropertiesBuilder;
/** /**
* @author Jeremy Daggett * @author Jeremy Daggett
*/ */
public class HPCloudObjectStoragePropertiesBuilder extends SwiftPropertiesBuilder { public class HPCloudObjectStorageLasVegasPropertiesBuilder extends SwiftPropertiesBuilder {
public HPCloudObjectStoragePropertiesBuilder(Properties properties) { public HPCloudObjectStorageLasVegasPropertiesBuilder(Properties properties) {
super(properties); super(properties);
} }

14
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageProviderMetadata.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasProviderMetadata.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.hpcloud.object.storage; package org.jclouds.hpcloud.objectstorage.lvs;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
@ -27,18 +27,18 @@ import org.jclouds.providers.BaseProviderMetadata;
import org.jclouds.providers.ProviderMetadata; 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 * @author Jeremy Daggett
*/ */
public class HPCloudObjectStorageProviderMetadata extends BaseProviderMetadata { public class HPCloudObjectStorageLasVegasProviderMetadata extends BaseProviderMetadata {
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
public String getId() { public String getId() {
return "hpcloud-object-storage"; return "hpcloud-objectstorage-lvs";
} }
/** /**
@ -54,7 +54,7 @@ public class HPCloudObjectStorageProviderMetadata extends BaseProviderMetadata {
*/ */
@Override @Override
public String getName() { 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 @Override
public URI getApiDocumentation() { 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 @Override
public Set<String> getLinkedServices() { public Set<String> getLinkedServices() {
return ImmutableSet.of("hpcloud-object-storage"); return ImmutableSet.of("hpcloud-objectstorage-lvs");
} }
/** /**

14
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/HPCloudObjectStorageAsyncBlobStore.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/HPCloudObjectStorageLasVegasAsyncBlobStore.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.hpcloud.object.storage.blobstore; package org.jclouds.hpcloud.objectstorage.lvs.blobstore;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ExecutorService; 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.blobstore.util.BlobUtils;
import org.jclouds.collect.Memoized; import org.jclouds.collect.Memoized;
import org.jclouds.domain.Location; import org.jclouds.domain.Location;
import org.jclouds.hpcloud.object.storage.HPCloudObjectStorageAsyncClient; import org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasAsyncClient;
import org.jclouds.hpcloud.object.storage.HPCloudObjectStorageClient; import org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasClient;
import org.jclouds.openstack.swift.blobstore.SwiftAsyncBlobStore; import org.jclouds.openstack.swift.blobstore.SwiftAsyncBlobStore;
import org.jclouds.openstack.swift.blobstore.functions.BlobStoreListContainerOptionsToListContainerOptions; import org.jclouds.openstack.swift.blobstore.functions.BlobStoreListContainerOptionsToListContainerOptions;
import org.jclouds.openstack.swift.blobstore.functions.BlobToObject; import org.jclouds.openstack.swift.blobstore.functions.BlobToObject;
@ -50,12 +50,12 @@ import com.google.common.base.Supplier;
* @author Adrian Cole * @author Adrian Cole
*/ */
@Singleton @Singleton
public class HPCloudObjectStorageAsyncBlobStore extends SwiftAsyncBlobStore { public class HPCloudObjectStorageLasVegasAsyncBlobStore extends SwiftAsyncBlobStore {
@Inject @Inject
protected HPCloudObjectStorageAsyncBlobStore(BlobStoreContext context, BlobUtils blobUtils, protected HPCloudObjectStorageLasVegasAsyncBlobStore(BlobStoreContext context, BlobUtils blobUtils,
@Named(Constants.PROPERTY_USER_THREADS) ExecutorService service, Supplier<Location> defaultLocation, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService service, Supplier<Location> defaultLocation,
@Memoized Supplier<Set<? extends Location>> locations, HPCloudObjectStorageClient sync, HPCloudObjectStorageAsyncClient async, @Memoized Supplier<Set<? extends Location>> locations, HPCloudObjectStorageLasVegasClient sync, HPCloudObjectStorageLasVegasAsyncClient async,
ContainerToResourceMetadata container2ResourceMd, ContainerToResourceMetadata container2ResourceMd,
BlobStoreListContainerOptionsToListContainerOptions container2ContainerListOptions, BlobStoreListContainerOptionsToListContainerOptions container2ContainerListOptions,
ContainerToResourceList container2ResourceList, ObjectToBlob object2Blob, BlobToObject blob2Object, ContainerToResourceList container2ResourceList, ObjectToBlob object2Blob, BlobToObject blob2Object,
@ -66,4 +66,4 @@ public class HPCloudObjectStorageAsyncBlobStore extends SwiftAsyncBlobStore {
blob2ObjectGetOptions, fetchBlobMetadataProvider); blob2ObjectGetOptions, fetchBlobMetadataProvider);
} }
} }

6
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/HPCloudObjectStorageBlobStore.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/HPCloudObjectStorageLasVegasBlobStore.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.hpcloud.object.storage.blobstore; package org.jclouds.hpcloud.objectstorage.lvs.blobstore;
import java.util.Set; import java.util.Set;
@ -46,10 +46,10 @@ import com.google.common.base.Supplier;
* @author Adrian Cole * @author Adrian Cole
*/ */
@Singleton @Singleton
public class HPCloudObjectStorageBlobStore extends SwiftBlobStore { public class HPCloudObjectStorageLasVegasBlobStore extends SwiftBlobStore {
@Inject @Inject
protected HPCloudObjectStorageBlobStore(BlobStoreContext context, BlobUtils blobUtils, protected HPCloudObjectStorageLasVegasBlobStore(BlobStoreContext context, BlobUtils blobUtils,
Supplier<Location> defaultLocation, @Memoized Supplier<Set<? extends Location>> locations, Supplier<Location> defaultLocation, @Memoized Supplier<Set<? extends Location>> locations,
CommonSwiftClient sync, ContainerToResourceMetadata container2ResourceMd, CommonSwiftClient sync, ContainerToResourceMetadata container2ResourceMd,
BlobStoreListContainerOptionsToListContainerOptions container2ContainerListOptions, BlobStoreListContainerOptionsToListContainerOptions container2ContainerListOptions,

16
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/config/HPCloudObjectStorageBlobStoreContextModule.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/config/HPCloudObjectStorageLasVegasBlobStoreContextModule.java
View File

@ -16,11 +16,11 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.objectstorage.lvs.blobstore.HPCloudObjectStorageLasVegasAsyncBlobStore;
import org.jclouds.hpcloud.object.storage.blobstore.HPCloudObjectStorageBlobStore; import org.jclouds.hpcloud.objectstorage.lvs.blobstore.HPCloudObjectStorageLasVegasBlobStore;
import org.jclouds.hpcloud.object.storage.blobstore.functions.HPCloudObjectStorageObjectToBlobMetadata; import org.jclouds.hpcloud.objectstorage.lvs.blobstore.functions.HPCloudObjectStorageLasVegasObjectToBlobMetadata;
import org.jclouds.openstack.swift.blobstore.SwiftAsyncBlobStore; import org.jclouds.openstack.swift.blobstore.SwiftAsyncBlobStore;
import org.jclouds.openstack.swift.blobstore.SwiftBlobStore; import org.jclouds.openstack.swift.blobstore.SwiftBlobStore;
import org.jclouds.openstack.swift.blobstore.config.SwiftBlobStoreContextModule; import org.jclouds.openstack.swift.blobstore.config.SwiftBlobStoreContextModule;
@ -30,13 +30,13 @@ import org.jclouds.openstack.swift.blobstore.functions.ObjectToBlobMetadata;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
public class HPCloudObjectStorageBlobStoreContextModule extends SwiftBlobStoreContextModule { public class HPCloudObjectStorageLasVegasBlobStoreContextModule extends SwiftBlobStoreContextModule {
@Override @Override
protected void configure() { protected void configure() {
super.configure(); super.configure();
bind(SwiftBlobStore.class).to(HPCloudObjectStorageBlobStore.class); bind(SwiftBlobStore.class).to(HPCloudObjectStorageLasVegasBlobStore.class);
bind(SwiftAsyncBlobStore.class).to(HPCloudObjectStorageAsyncBlobStore.class); bind(SwiftAsyncBlobStore.class).to(HPCloudObjectStorageLasVegasAsyncBlobStore.class);
bind(ObjectToBlobMetadata.class).to(HPCloudObjectStorageObjectToBlobMetadata.class); bind(ObjectToBlobMetadata.class).to(HPCloudObjectStorageLasVegasObjectToBlobMetadata.class);
} }
} }

6
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/functions/HPCloudObjectStorageObjectToBlobMetadata.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/functions/HPCloudObjectStorageLasVegasObjectToBlobMetadata.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
@ -30,10 +30,10 @@ import org.jclouds.openstack.swift.domain.ObjectInfo;
* @author Adrian Cole * @author Adrian Cole
*/ */
@Singleton @Singleton
public class HPCloudObjectStorageObjectToBlobMetadata extends ObjectToBlobMetadata { public class HPCloudObjectStorageLasVegasObjectToBlobMetadata extends ObjectToBlobMetadata {
@Inject @Inject
public HPCloudObjectStorageObjectToBlobMetadata(IfDirectoryReturnNameStrategy ifDirectoryReturnName) { public HPCloudObjectStorageLasVegasObjectToBlobMetadata(IfDirectoryReturnNameStrategy ifDirectoryReturnName) {
super(ifDirectoryReturnName); super(ifDirectoryReturnName);
} }

18
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/config/HPCloudObjectStorageRestClientModule.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/config/HPCloudObjectStorageLasVegasRestClientModule.java
View File

@ -16,12 +16,12 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.hpcloud.object.storage.config; package org.jclouds.hpcloud.objectstorage.lvs.config;
import javax.inject.Singleton; import javax.inject.Singleton;
import org.jclouds.hpcloud.object.storage.HPCloudObjectStorageAsyncClient; import org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasAsyncClient;
import org.jclouds.hpcloud.object.storage.HPCloudObjectStorageClient; import org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasClient;
import org.jclouds.http.RequiresHttp; import org.jclouds.http.RequiresHttp;
import org.jclouds.openstack.swift.CommonSwiftAsyncClient; import org.jclouds.openstack.swift.CommonSwiftAsyncClient;
import org.jclouds.openstack.swift.CommonSwiftClient; import org.jclouds.openstack.swift.CommonSwiftClient;
@ -36,22 +36,22 @@ import com.google.inject.Provides;
*/ */
@ConfiguresRestClient @ConfiguresRestClient
@RequiresHttp @RequiresHttp
public class HPCloudObjectStorageRestClientModule extends public class HPCloudObjectStorageLasVegasRestClientModule extends
BaseSwiftRestClientModule<HPCloudObjectStorageClient, HPCloudObjectStorageAsyncClient> { BaseSwiftRestClientModule<HPCloudObjectStorageLasVegasClient, HPCloudObjectStorageLasVegasAsyncClient> {
public HPCloudObjectStorageRestClientModule() { public HPCloudObjectStorageLasVegasRestClientModule() {
super(HPCloudObjectStorageClient.class, HPCloudObjectStorageAsyncClient.class); super(HPCloudObjectStorageLasVegasClient.class, HPCloudObjectStorageLasVegasAsyncClient.class);
} }
@Provides @Provides
@Singleton @Singleton
CommonSwiftClient provideCommonSwiftClient(HPCloudObjectStorageClient in) { CommonSwiftClient provideCommonSwiftClient(HPCloudObjectStorageLasVegasClient in) {
return in; return in;
} }
@Provides @Provides
@Singleton @Singleton
CommonSwiftAsyncClient provideCommonSwiftClient(HPCloudObjectStorageAsyncClient in) { CommonSwiftAsyncClient provideCommonSwiftClient(HPCloudObjectStorageLasVegasAsyncClient in) {
return in; return in;
} }

2
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/domain/ContainerCDNMetadata.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/domain/ContainerCDNMetadata.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.hpcloud.object.storage.domain; package org.jclouds.hpcloud.objectstorage.lvs.domain;
import java.net.URI; import java.net.URI;

4
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/functions/ParseContainerMetadataFromHeaders.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/functions/ParseContainerMetadataFromHeaders.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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; import static com.google.common.base.Preconditions.checkArgument;
@ -33,7 +33,7 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function; 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. * HTTP headers.
* *
* @author Jeremy Daggett * @author Jeremy Daggett

2
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/options/CreateContainerOptions.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/options/CreateContainerOptions.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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;
import java.util.Map.Entry; import java.util.Map.Entry;

2
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/options/ListCDNContainerOptions.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/options/ListCDNContainerOptions.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.checkNotNull;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;

6
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/package-info.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/package-info.java
View File

@ -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 <a href="https://manage.hpcloud.com/pages/build/docs/object-storage/api" /> * @see <a href="https://manage.hpcloud.com/pages/build/docs/objectstorage-lvs/api" />
* *
* @author Jeremy Daggett * @author Jeremy Daggett
*/ */
package org.jclouds.hpcloud.object.storage; package org.jclouds.hpcloud.objectstorage.lvs;

6
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/reference/HPCloudObjectStorageConstants.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/reference/HPCloudObjectStorageLasVegasConstants.java
View File

@ -16,14 +16,14 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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 * @author Jeremy Daggett
*/ */
public interface HPCloudObjectStorageConstants { public interface HPCloudObjectStorageLasVegasConstants {
} }

8
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/reference/HPCloudObjectStorageHeaders.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/reference/HPCloudObjectStorageLasVegasHeaders.java
View File

@ -16,18 +16,18 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.hpcloud.object.storage.reference; package org.jclouds.hpcloud.objectstorage.lvs.reference;
import org.jclouds.openstack.swift.reference.SwiftHeaders; 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 <a href="https://manage.hpcloud.com/pages/build/docs/object-storage/api" /> * @see <a href="https://manage.hpcloud.com/pages/build/docs/objectstorage-lvs/api" />
* @author Jeremy Daggett * @author Jeremy Daggett
* *
*/ */
public interface HPCloudObjectStorageHeaders extends SwiftHeaders { public interface HPCloudObjectStorageLasVegasHeaders extends SwiftHeaders {
} }

4
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/reference/package-info.java → providers/hpcloud-objectstorage-lvs/src/main/java/org/jclouds/hpcloud/objectstorage/lvs/reference/package-info.java
View File

@ -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 * @author Jeremy Daggett
*/ */
package org.jclouds.hpcloud.object.storage.reference; package org.jclouds.hpcloud.objectstorage.lvs.reference;

1
providers/hpcloud-objectstorage-lvs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata Normal file
View File

@ -0,0 +1 @@
org.jclouds.hpcloud.objectstorage.lvs.HPCloudObjectStorageLasVegasProviderMetadata

10
providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageClientLiveTest.java → providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasClientLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.hpcloud.object.storage; package org.jclouds.hpcloud.objectstorage.lvs;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
@ -28,12 +28,12 @@ import org.testng.annotations.Test;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", testName = "HPCloudObjectStorageClientLiveTest") @Test(groups = "live", testName = "HPCloudObjectStorageLasVegasClientLiveTest")
public class HPCloudObjectStorageClientLiveTest extends CommonSwiftClientLiveTest<HPCloudObjectStorageClient> { public class HPCloudObjectStorageLasVegasClientLiveTest extends CommonSwiftClientLiveTest<HPCloudObjectStorageLasVegasClient> {
@Override @Override
public HPCloudObjectStorageClient getApi() { public HPCloudObjectStorageLasVegasClient getApi() {
return (HPCloudObjectStorageClient) context.getProviderSpecificContext().getApi(); return (HPCloudObjectStorageLasVegasClient) context.getProviderSpecificContext().getApi();
} }
@Override @Override

14
providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageProviderTest.java → providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/HPCloudObjectStorageLasVegasProviderTest.java
View File

@ -16,22 +16,22 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.hpcloud.object.storage; package org.jclouds.hpcloud.objectstorage.lvs;
import org.jclouds.providers.BaseProviderMetadataTest; import org.jclouds.providers.BaseProviderMetadataTest;
import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.ProviderMetadata;
import org.testng.annotations.Test; 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 * @author Jeremy Daggett
*/ */
@Test(groups = "unit", testName = "HPCloudObjectStorageProviderTest") @Test(groups = "unit", testName = "HPCloudObjectStorageLasVegasProviderTest")
public class HPCloudObjectStorageProviderTest extends BaseProviderMetadataTest { public class HPCloudObjectStorageLasVegasProviderTest extends BaseProviderMetadataTest {
public HPCloudObjectStorageProviderTest() { public HPCloudObjectStorageLasVegasProviderTest() {
super(new HPCloudObjectStorageProviderMetadata(), ProviderMetadata.BLOBSTORE_TYPE); super(new HPCloudObjectStorageLasVegasProviderMetadata(), ProviderMetadata.BLOBSTORE_TYPE);
} }
} }

4
providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobIntegrationLiveTest.java → providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobIntegrationLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.blobstore.domain.Blob;
import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobIntegrationLiveTest; import org.jclouds.openstack.swift.blobstore.integration.SwiftBlobIntegrationLiveTest;
@ -26,7 +26,7 @@ import org.testng.annotations.Test;
* @author Jeremy Daggett * @author Jeremy Daggett
*/ */
@Test(groups = "live") @Test(groups = "live")
public class HPCloudObjectStorageBlobIntegrationLiveTest extends SwiftBlobIntegrationLiveTest { public class HPCloudObjectStorageLasVegasBlobIntegrationLiveTest extends SwiftBlobIntegrationLiveTest {
@Override @Override
protected void checkContentDisposition(Blob blob, String contentDisposition) { protected void checkContentDisposition(Blob blob, String contentDisposition) {
assert blob.getPayload().getContentMetadata().getContentDisposition().startsWith(contentDisposition) : blob assert blob.getPayload().getContentMetadata().getContentDisposition().startsWith(contentDisposition) : blob

4
providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobLiveTest.java → providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.jclouds.openstack.swift.blobstore.integration.SwiftBlobLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -25,6 +25,6 @@ import org.testng.annotations.Test;
* @author Jeremy Daggett * @author Jeremy Daggett
*/ */
@Test(groups = { "live" }) @Test(groups = { "live" })
public class HPCloudObjectStorageBlobLiveTest extends SwiftBlobLiveTest { public class HPCloudObjectStorageLasVegasBlobLiveTest extends SwiftBlobLiveTest {
} }

4
providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobMapIntegrationLiveTest.java → providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobMapIntegrationLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.jclouds.openstack.swift.blobstore.integration.SwiftBlobMapIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -25,6 +25,6 @@ import org.testng.annotations.Test;
* @author Jeremy Daggett * @author Jeremy Daggett
*/ */
@Test(groups = "live") @Test(groups = "live")
public class HPCloudObjectStorageBlobMapIntegrationLiveTest extends SwiftBlobMapIntegrationLiveTest { public class HPCloudObjectStorageLasVegasBlobMapIntegrationLiveTest extends SwiftBlobMapIntegrationLiveTest {
} }

4
providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageBlobSignerLiveTest.java → providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasBlobSignerLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.jclouds.openstack.swift.blobstore.integration.SwiftBlobSignerLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -25,6 +25,6 @@ import org.testng.annotations.Test;
* @author Jeremy Daggett * @author Jeremy Daggett
*/ */
@Test(groups = { "live" }) @Test(groups = { "live" })
public class HPCloudObjectStorageBlobSignerLiveTest extends SwiftBlobSignerLiveTest { public class HPCloudObjectStorageLasVegasBlobSignerLiveTest extends SwiftBlobSignerLiveTest {
} }

4
providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageContainerIntegrationLiveTest.java → providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasContainerIntegrationLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.jclouds.openstack.swift.blobstore.integration.SwiftContainerIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -25,6 +25,6 @@ import org.testng.annotations.Test;
* @author Jeremy Daggett * @author Jeremy Daggett
*/ */
@Test(groups = "live") @Test(groups = "live")
public class HPCloudObjectStorageContainerIntegrationLiveTest extends SwiftContainerIntegrationLiveTest { public class HPCloudObjectStorageLasVegasContainerIntegrationLiveTest extends SwiftContainerIntegrationLiveTest {
} }

4
providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageContainerLiveTest.java → providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasContainerLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
@ -28,7 +28,7 @@ import org.testng.annotations.Test;
* @author Jeremy Daggett * @author Jeremy Daggett
*/ */
@Test(groups = { "live" }) @Test(groups = { "live" })
public class HPCloudObjectStorageContainerLiveTest extends BaseContainerLiveTest { public class HPCloudObjectStorageLasVegasContainerLiveTest extends BaseContainerLiveTest {
@Test(expectedExceptions=UnsupportedOperationException.class) @Test(expectedExceptions=UnsupportedOperationException.class)
public void testPublicAccess() throws MalformedURLException, InterruptedException, IOException { public void testPublicAccess() throws MalformedURLException, InterruptedException, IOException {

4
providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageInputStreamMapIntegrationLiveTest.java → providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasInputStreamMapIntegrationLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.jclouds.openstack.swift.blobstore.integration.SwiftInputStreamMapIntegrationLiveTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -25,6 +25,6 @@ import org.testng.annotations.Test;
* @author Jeremy Daggett * @author Jeremy Daggett
*/ */
@Test(groups = "live") @Test(groups = "live")
public class HPCloudObjectStorageInputStreamMapIntegrationLiveTest extends SwiftInputStreamMapIntegrationLiveTest { public class HPCloudObjectStorageLasVegasInputStreamMapIntegrationLiveTest extends SwiftInputStreamMapIntegrationLiveTest {
} }

4
providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageServiceIntegrationLiveTest.java → providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasServiceIntegrationLiveTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.hpcloud.object.storage.blobstore.integration; package org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration;
import java.util.Set; import java.util.Set;
@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableSet;
* @author Jeremy Daggett * @author Jeremy Daggett
*/ */
@Test(groups = "live") @Test(groups = "live")
public class HPCloudObjectStorageServiceIntegrationLiveTest extends SwiftServiceIntegrationLiveTest { public class HPCloudObjectStorageLasVegasServiceIntegrationLiveTest extends SwiftServiceIntegrationLiveTest {
@Override @Override
protected Set<String> getIso3166Codes() { protected Set<String> getIso3166Codes() {
return ImmutableSet.<String> of("US-NV"); return ImmutableSet.<String> of("US-NV");

8
providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/blobstore/integration/HPCloudObjectStorageTestInitializer.java → providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/blobstore/integration/HPCloudObjectStorageLasVegasTestInitializer.java
View File

@ -16,17 +16,17 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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; import org.jclouds.openstack.swift.blobstore.integration.SwiftTestInitializer;
/** /**
* @author Jeremy Daggett * @author Jeremy Daggett
*/ */
public class HPCloudObjectStorageTestInitializer extends SwiftTestInitializer { public class HPCloudObjectStorageLasVegasTestInitializer extends SwiftTestInitializer {
public HPCloudObjectStorageTestInitializer() { public HPCloudObjectStorageLasVegasTestInitializer() {
provider = "hpcloud-object-storage"; provider = "hpcloud-objectstorage-lvs";
} }
} }

4
providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java → providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/functions/ParseContainerCDNMetadataListFromJsonResponseTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.hpcloud.object.storage.functions; package org.jclouds.hpcloud.objectstorage.lvs.functions;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
@ -25,7 +25,7 @@ import java.net.URI;
import java.util.Set; import java.util.Set;
import java.util.SortedSet; 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.HttpResponse;
import org.jclouds.http.functions.ParseJson; import org.jclouds.http.functions.ParseJson;
import org.jclouds.io.Payloads; import org.jclouds.io.Payloads;

2
providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/options/CreateContainerOptionsTest.java → providers/hpcloud-objectstorage-lvs/src/test/java/org/jclouds/hpcloud/objectstorage/lvs/options/CreateContainerOptionsTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package org.jclouds.hpcloud.object.storage.options; package org.jclouds.hpcloud.objectstorage.lvs.options;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;

0
providers/hpcloud-object-storage/src/test/resources/log4j.xml → providers/hpcloud-objectstorage-lvs/src/test/resources/log4j.xml
View File

0
providers/hpcloud-object-storage/src/test/resources/test_list_cdn.json → providers/hpcloud-objectstorage-lvs/src/test/resources/test_list_cdn.json
View File

2
providers/pom.xml
View File

@ -68,6 +68,6 @@
<module>go2cloud-jhb1</module> <module>go2cloud-jhb1</module>
<module>softlayer</module> <module>softlayer</module>
<module>ninefold-compute</module> <module>ninefold-compute</module>
<module>hpcloud-object-storage</module> <module>hpcloud-objectstorage-lvs</module>
</modules> </modules>
</project> </project>