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

Issue 440: moved jclouds-aws to aws-common

This commit is contained in:
Adrian Cole 2011-01-06 16:48:51 -08:00
parent c73b424a0f
commit 71fc2792f3
44 changed files with 87 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/cloudwatch/pom.xml
View File

@ -43,8 +43,8 @@
<dependencies>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-aws</artifactId>
<groupId>org.jclouds.common</groupId>
<artifactId>aws-common</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>

4
apis/ec2/pom.xml
View File

@ -45,8 +45,8 @@
<dependencies>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-aws</artifactId>
<groupId>org.jclouds.common</groupId>
<artifactId>aws-common</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>

15
apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RegionAndIdToImageTest.java
View File

@ -45,7 +45,7 @@ import com.google.common.collect.ImmutableSet;
@Test(groups = "unit")
public class RegionAndIdToImageTest {
@SuppressWarnings({ "unchecked", "rawtypes" })
@SuppressWarnings("unchecked")
@Test
public void testApply() {
@ -54,8 +54,7 @@ public class RegionAndIdToImageTest {
AMIClient client = createMock(AMIClient.class);
org.jclouds.ec2.domain.Image ec2Image = createMock(org.jclouds.ec2.domain.Image.class);
Image image = createNiceMock(Image.class);
Set<? extends org.jclouds.ec2.domain.Image> images = ImmutableSet
.<org.jclouds.ec2.domain.Image> of(ec2Image);
Set<? extends org.jclouds.ec2.domain.Image> images = ImmutableSet.<org.jclouds.ec2.domain.Image> of(ec2Image);
expect(caller.getAMIServices()).andReturn(client).atLeastOnce();
expect(client.describeImagesInRegion("region", imageIds("ami"))).andReturn((Set) images);
@ -77,7 +76,7 @@ public class RegionAndIdToImageTest {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@SuppressWarnings("unchecked")
@Test
public void testApplyNotFound() {
@ -86,8 +85,7 @@ public class RegionAndIdToImageTest {
AMIClient client = createMock(AMIClient.class);
org.jclouds.ec2.domain.Image ec2Image = createMock(org.jclouds.ec2.domain.Image.class);
Image image = createNiceMock(Image.class);
Set<? extends org.jclouds.ec2.domain.Image> images = ImmutableSet
.<org.jclouds.ec2.domain.Image> of(ec2Image);
Set<? extends org.jclouds.ec2.domain.Image> images = ImmutableSet.<org.jclouds.ec2.domain.Image> of(ec2Image);
expect(caller.getAMIServices()).andReturn(client).atLeastOnce();
expect(client.describeImagesInRegion("region", imageIds("ami"))).andReturn((Set) images);
@ -109,7 +107,7 @@ public class RegionAndIdToImageTest {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@SuppressWarnings("unchecked")
@Test
public void testApplyNoSuchElementException() {
@ -118,8 +116,7 @@ public class RegionAndIdToImageTest {
AMIClient client = createMock(AMIClient.class);
org.jclouds.ec2.domain.Image ec2Image = createMock(org.jclouds.ec2.domain.Image.class);
Image image = createNiceMock(Image.class);
Set<? extends org.jclouds.ec2.domain.Image> images = ImmutableSet
.<org.jclouds.ec2.domain.Image> of(ec2Image);
Set<? extends org.jclouds.ec2.domain.Image> images = ImmutableSet.<org.jclouds.ec2.domain.Image> of(ec2Image);
expect(caller.getAMIServices()).andReturn(client).atLeastOnce();
expect(client.describeImagesInRegion("region", imageIds("ami"))).andReturn((Set) images);

2
apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/EC2RunNodesAndAddToSetStrategyTest.java
View File

@ -92,7 +92,7 @@ public class EC2RunNodesAndAddToSetStrategyTest {
return null;
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@SuppressWarnings("unchecked")
private void assertRegionAndZoneForLocation(Location location, String region, String zone) {
String imageId = "ami1";
String instanceCreatedId = "instance1";

5
apis/elb/pom.xml
View File

@ -49,10 +49,9 @@
<dependencies>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-aws</artifactId>
<groupId>org.jclouds.common</groupId>
<artifactId>aws-common</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>

4
apis/s3/pom.xml
View File

@ -49,8 +49,8 @@
<version>0.3</version>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-aws</artifactId>
<groupId>org.jclouds.common</groupId>
<artifactId>aws-common</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>

5
apis/simpledb/pom.xml
View File

@ -43,10 +43,9 @@
<dependencies>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-aws</artifactId>
<groupId>org.jclouds.common</groupId>
<artifactId>aws-common</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>

5
apis/sqs/pom.xml
View File

@ -43,10 +43,9 @@
<dependencies>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-aws</artifactId>
<groupId>org.jclouds.common</groupId>
<artifactId>aws-common</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>

0
aws/README.txt → common/aws/README.txt
View File

9
aws/pom.xml → common/aws/pom.xml
View File

@ -26,19 +26,20 @@
<groupId>org.jclouds</groupId>
<artifactId>jclouds-project</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../project/pom.xml</relativePath>
<relativePath>../../project/pom.xml</relativePath>
</parent>
<artifactId>jclouds-aws</artifactId>
<groupId>org.jclouds.common</groupId>
<artifactId>aws-common</artifactId>
<name>jclouds Amazon AWS Components Core</name>
<description>jclouds Core components to access Amazon AWS</description>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>

0
aws/src/main/java/org/jclouds/aws/AWSResponseException.java → common/aws/src/main/java/org/jclouds/aws/AWSResponseException.java
View File

0
aws/src/main/java/org/jclouds/aws/config/AWSRestClientModule.java → common/aws/src/main/java/org/jclouds/aws/config/AWSRestClientModule.java
View File

0
aws/src/main/java/org/jclouds/aws/config/FormSigningRestClientModule.java → common/aws/src/main/java/org/jclouds/aws/config/FormSigningRestClientModule.java
View File

0
aws/src/main/java/org/jclouds/aws/config/WithZonesFormSigningRestClientModule.java → common/aws/src/main/java/org/jclouds/aws/config/WithZonesFormSigningRestClientModule.java
View File

0
aws/src/main/java/org/jclouds/aws/domain/AWSError.java → common/aws/src/main/java/org/jclouds/aws/domain/AWSError.java
View File

0
aws/src/main/java/org/jclouds/aws/domain/Region.java → common/aws/src/main/java/org/jclouds/aws/domain/Region.java
View File

0
aws/src/main/java/org/jclouds/aws/filters/FormSigner.java → common/aws/src/main/java/org/jclouds/aws/filters/FormSigner.java
View File

0
aws/src/main/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandler.java → common/aws/src/main/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandler.java
View File

0
aws/src/main/java/org/jclouds/aws/handlers/AWSRedirectionRetryHandler.java → common/aws/src/main/java/org/jclouds/aws/handlers/AWSRedirectionRetryHandler.java
View File

0
aws/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java → common/aws/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java
View File

0
aws/src/main/java/org/jclouds/aws/handlers/package-info.java → common/aws/src/main/java/org/jclouds/aws/handlers/package-info.java
View File

0
aws/src/main/java/org/jclouds/aws/reference/AWSConstants.java → common/aws/src/main/java/org/jclouds/aws/reference/AWSConstants.java
View File

0
aws/src/main/java/org/jclouds/aws/reference/FormParameters.java → common/aws/src/main/java/org/jclouds/aws/reference/FormParameters.java
View File

0
aws/src/main/java/org/jclouds/aws/util/AWSUtils.java → common/aws/src/main/java/org/jclouds/aws/util/AWSUtils.java
View File

0
aws/src/main/java/org/jclouds/aws/xml/ErrorHandler.java → common/aws/src/main/java/org/jclouds/aws/xml/ErrorHandler.java
View File

0
aws/src/test/java/org/jclouds/aws/config/AWSWithZonesFormSigningRestClientModuleTest.java → common/aws/src/test/java/org/jclouds/aws/config/AWSWithZonesFormSigningRestClientModuleTest.java
View File

38
aws/src/test/java/org/jclouds/aws/filters/FormSignerTest.java → common/aws/src/test/java/org/jclouds/aws/filters/FormSignerTest.java
View File

@ -28,11 +28,11 @@ import java.util.Map;
import org.jclouds.PropertiesBuilder;
import org.jclouds.date.TimeStamp;
import org.jclouds.logging.config.NullLoggingModule;
import org.jclouds.rest.BaseRestClientTest.MockModule;
import org.jclouds.rest.RequestSigner;
import org.jclouds.rest.RestContextBuilder;
import org.jclouds.rest.RestContextFactory;
import org.jclouds.rest.RestContextSpec;
import org.jclouds.rest.BaseRestClientTest.MockModule;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
@ -49,31 +49,31 @@ import com.google.inject.name.Names;
// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire
@Test(groups = "unit", testName = "FormSignerTest")
public class FormSignerTest {
@SuppressWarnings({ "unchecked", "rawtypes" })
@SuppressWarnings("unchecked")
public static final RestContextSpec<Map, List> DUMMY_SPEC = new RestContextSpec<Map, List>("provider", "endpoint",
"apiVersion", "identity", "credential", Map.class, List.class, PropertiesBuilder.class,
(Class) RestContextBuilder.class, ImmutableList.<Module> of(new MockModule(), new NullLoggingModule(),
new AbstractModule() {
@Override
protected void configure() {
bind(RequestSigner.class).to(FormSigner.class);
bind(String.class).annotatedWith(Names.named(PROPERTY_HEADER_TAG)).toInstance("amz");
bind(String.class).annotatedWith(TimeStamp.class).toInstance("2009-11-08T15:54:08.897Z");
}
"apiVersion", "identity", "credential", Map.class, List.class, PropertiesBuilder.class,
(Class) RestContextBuilder.class, ImmutableList.<Module> of(new MockModule(), new NullLoggingModule(),
new AbstractModule() {
@Override
protected void configure() {
bind(RequestSigner.class).to(FormSigner.class);
bind(String.class).annotatedWith(Names.named(PROPERTY_HEADER_TAG)).toInstance("amz");
bind(String.class).annotatedWith(TimeStamp.class).toInstance("2009-11-08T15:54:08.897Z");
}
}));
}));
@Test
void testBuildCanonicalizedString() {
FormSigner filter = RestContextFactory.createContextBuilder(DUMMY_SPEC).buildInjector()
.getInstance(FormSigner.class);
FormSigner filter = RestContextFactory.createContextBuilder(DUMMY_SPEC).buildInjector().getInstance(
FormSigner.class);
assertEquals(
filter.buildCanonicalizedString(new ImmutableMultimap.Builder<String, String>()
.put("AWSAccessKeyId", "foo").put("Action", "DescribeImages").put("Expires", "2008-02-10T12:00:00Z")
.put("ImageId.1", "ami-2bb65342").put("SignatureMethod", "HmacSHA256").put("SignatureVersion", "2")
.put("Version", "2010-06-15").build()),
"AWSAccessKeyId=foo&Action=DescribeImages&Expires=2008-02-10T12%3A00%3A00Z&ImageId.1=ami-2bb65342&SignatureMethod=HmacSHA256&SignatureVersion=2&Version=2010-06-15");
filter.buildCanonicalizedString(new ImmutableMultimap.Builder<String, String>().put("AWSAccessKeyId",
"foo").put("Action", "DescribeImages").put("Expires", "2008-02-10T12:00:00Z").put("ImageId.1",
"ami-2bb65342").put("SignatureMethod", "HmacSHA256").put("SignatureVersion", "2").put(
"Version", "2010-06-15").build()),
"AWSAccessKeyId=foo&Action=DescribeImages&Expires=2008-02-10T12%3A00%3A00Z&ImageId.1=ami-2bb65342&SignatureMethod=HmacSHA256&SignatureVersion=2&Version=2010-06-15");
}
}

0
aws/src/test/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java → common/aws/src/test/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java
View File

0
aws/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java → common/aws/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java
View File

0
aws/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java → common/aws/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java
View File

0
aws/src/test/java/org/jclouds/aws/xml/ErrorHandlerTest.java → common/aws/src/test/java/org/jclouds/aws/xml/ErrorHandlerTest.java
View File

0
aws/src/test/resources/error.xml → common/aws/src/test/resources/error.xml
View File

0
aws/src/test/resources/log4j.xml → common/aws/src/test/resources/log4j.xml
View File

4
demos/createandlistbuckets/pom.xml
View File

@ -24,10 +24,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-aws-demos-project</artifactId>
<artifactId>demos-project</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>jclouds-aws-demo-createandlistbuckets</artifactId>
<artifactId>createandlistbuckets</artifactId>
<name>jclouds S3 sample that creates a bucket then lists all owned buckets</name>
<description>jclouds S3 sample that creates a bucket then lists all owned buckets</description>
<dependencies>

4
demos/createlamp/pom.xml
View File

@ -25,10 +25,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-aws-demos-project</artifactId>
<artifactId>demos-project</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>jclouds-aws-demo-createlamp</artifactId>
<artifactId>createlamp</artifactId>
<name>jclouds ec2 sample that creates an instance and all you need to access it</name>
<description>jclouds ec2 sample that creates an instance and all you need to access it</description>
<dependencies>

4
demos/gae-tweetstore-spring/pom.xml
View File

@ -83,8 +83,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jclouds-aws</artifactId>
<groupId>org.jclouds.provider</groupId>
<artifactId>aws-s3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

4
demos/gae-tweetstore/pom.xml
View File

@ -81,8 +81,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jclouds-aws</artifactId>
<groupId>org.jclouds.provider</groupId>
<artifactId>aws-s3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

6
demos/googleappengine/pom.xml
View File

@ -24,10 +24,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-aws-demos-project</artifactId>
<artifactId>demos-project</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>jclouds-aws-demo-googleappengine</artifactId>
<artifactId>googleappengine</artifactId>
<packaging>war</packaging>
<name>JClouds Sample for Google App Engine</name>
<description>JClouds Sample for Google App Engine</description>
@ -38,7 +38,7 @@
extraction of appengine-java-sdk
-->
<appengine.home>YOUR_APPENGINE_HOME</appengine.home>
<appengine.applicationid>jclouds-aws-demo</appengine.applicationid>
<appengine.applicationid>aws-common-demo</appengine.applicationid>
<devappserver.address>localhost</devappserver.address>
<devappserver.port>8088</devappserver.port>
</properties>

8
demos/perftest/pom.xml
View File

@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-aws-project</artifactId>
<artifactId>aws-common-project</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>jclouds-aws-perftest</artifactId>
<artifactId>aws-common-perftest</artifactId>
<name>jclouds Performance test verses Amazon SDK implementation</name>
<description>Performance test verses Amazon SDK implementation</description>
<properties>
@ -77,8 +77,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jclouds-aws</artifactId>
<groupId>org.jclouds.api</groupId>
<artifactId>s3</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>

2
demos/speedtest-sqs/pom.xml
View File

@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-aws-demos-project</artifactId>
<artifactId>demos-project</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>jclouds-speedtest-sqs</artifactId>

2
pom.xml
View File

@ -35,6 +35,7 @@
<module>assemblies</module>
<module>archetypes</module>
<module>core</module>
<module>common</module>
<module>compute</module>
<module>loadbalancer</module>
<module>apis</module>
@ -44,7 +45,6 @@
<module>extensions</module>
<module>tools</module>
<module>scriptbuilder</module>
<module>aws</module>
<module>azure</module>
<module>atmos</module>
<module>rackspace</module>

4
providers/aws-ec2/pom.xml
View File

@ -43,8 +43,8 @@
<dependencies>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-aws</artifactId>
<groupId>org.jclouds.common</groupId>
<artifactId>aws-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

61
rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesAsyncClient.java
View File

@ -80,9 +80,9 @@ import com.google.common.util.concurrent.ListenableFuture;
/**
* Provides asynchronous access to Cloud Files via their REST API.
* <p/>
* All commands return a ListenableFuture of the result from Cloud Files. Any
* exceptions incurred during processing will be wrapped in an
* {@link ExecutionException} as documented in {@link ListenableFuture#get()}.
* All commands return a ListenableFuture of the result from Cloud Files. Any exceptions incurred
* during processing will be wrapped in an {@link ExecutionException} as documented in
* {@link ListenableFuture#get()}.
*
* @see CloudFilesClient
* @see <a href="http://www.rackspacecloud.com/cf-devguide-20090812.pdf" />
@ -110,18 +110,15 @@ public interface CloudFilesAsyncClient {
@Consumes(MediaType.APPLICATION_JSON)
@QueryParams(keys = "format", values = "json")
@Path("/")
ListenableFuture<? extends Set<ContainerMetadata>> listContainers(
ListContainerOptions... options);
ListenableFuture<? extends Set<ContainerMetadata>> listContainers(ListContainerOptions... options);
/**
* @see CloudFilesClient#setObjectInfo
*/
@POST
@Path("/{container}/{name}")
ListenableFuture<Boolean> setObjectInfo(
@PathParam("container") String container,
@PathParam("name") String name,
@BinderParam(BindMapToHeadersWithPrefix.class) Map<String, String> userMetadata);
ListenableFuture<Boolean> setObjectInfo(@PathParam("container") String container, @PathParam("name") String name,
@BinderParam(BindMapToHeadersWithPrefix.class) Map<String, String> userMetadata);
/**
* @see CloudFilesClient#listCDNContainers
@ -131,8 +128,7 @@ public interface CloudFilesAsyncClient {
@QueryParams(keys = "format", values = "json")
@Path("/")
@Endpoint(CloudFilesCDN.class)
ListenableFuture<? extends Set<ContainerCDNMetadata>> listCDNContainers(
ListCdnContainerOptions... options);
ListenableFuture<? extends Set<ContainerCDNMetadata>> listCDNContainers(ListCdnContainerOptions... options);
// TODO: Container name is not included in CDN HEAD response headers, so we
// cannot populate it
@ -145,8 +141,7 @@ public interface CloudFilesAsyncClient {
@ExceptionParser(ThrowContainerNotFoundOn404.class)
@Path("/{container}")
@Endpoint(CloudFilesCDN.class)
ListenableFuture<ContainerCDNMetadata> getCDNMetadata(
@PathParam("container") String container);
ListenableFuture<ContainerCDNMetadata> getCDNMetadata(@PathParam("container") String container);
/**
* @see CloudFilesClient#enableCDN(String, long);
@ -157,7 +152,7 @@ public interface CloudFilesAsyncClient {
@ResponseParser(ParseCdnUriFromHeaders.class)
@Endpoint(CloudFilesCDN.class)
ListenableFuture<URI> enableCDN(@PathParam("container") String container,
@HeaderParam(CloudFilesHeaders.CDN_TTL) long ttl);
@HeaderParam(CloudFilesHeaders.CDN_TTL) long ttl);
/**
* @see CloudFilesClient#enableCDN(String)
@ -177,7 +172,7 @@ public interface CloudFilesAsyncClient {
@ResponseParser(ParseCdnUriFromHeaders.class)
@Endpoint(CloudFilesCDN.class)
ListenableFuture<URI> updateCDN(@PathParam("container") String container,
@HeaderParam(CloudFilesHeaders.CDN_TTL) long ttl);
@HeaderParam(CloudFilesHeaders.CDN_TTL) long ttl);
/**
* @see CloudFilesClient#disableCDN
@ -193,8 +188,7 @@ public interface CloudFilesAsyncClient {
*/
@PUT
@Path("/{container}")
ListenableFuture<Boolean> createContainer(
@PathParam("container") String container);
ListenableFuture<Boolean> createContainer(@PathParam("container") String container);
/**
* @see CloudFilesClient#deleteContainerIfEmpty
@ -202,8 +196,7 @@ public interface CloudFilesAsyncClient {
@DELETE
@ExceptionParser(ReturnTrueOn404FalseOn409.class)
@Path("/{container}")
ListenableFuture<Boolean> deleteContainerIfEmpty(
@PathParam("container") String container);
ListenableFuture<Boolean> deleteContainerIfEmpty(@PathParam("container") String container);
/**
* @see CloudFilesClient#listObjects
@ -212,9 +205,8 @@ public interface CloudFilesAsyncClient {
@QueryParams(keys = "format", values = "json")
@ResponseParser(ParseObjectInfoListFromJsonResponse.class)
@Path("/{container}")
ListenableFuture<PageSet<ObjectInfo>> listObjects(
@PathParam("container") String container,
ListContainerOptions... options);
ListenableFuture<PageSet<ObjectInfo>> listObjects(@PathParam("container") String container,
ListContainerOptions... options);
/**
* @see CloudFilesClient#containerExists
@ -222,8 +214,7 @@ public interface CloudFilesAsyncClient {
@HEAD
@Path("/{container}")
@ExceptionParser(ReturnFalseOnContainerNotFound.class)
ListenableFuture<Boolean> containerExists(
@PathParam("container") String container);
ListenableFuture<Boolean> containerExists(@PathParam("container") String container);
/**
* @see CloudFilesClient#putObject
@ -232,8 +223,8 @@ public interface CloudFilesAsyncClient {
@Path("/{container}/{name}")
@ResponseParser(ParseETagHeader.class)
ListenableFuture<String> putObject(
@PathParam("container") String container,
@PathParam("name") @ParamParser(ObjectName.class) @BinderParam(BindCFObjectMetadataToRequest.class) CFObject object);
@PathParam("container") String container,
@PathParam("name") @ParamParser(ObjectName.class) @BinderParam(BindCFObjectMetadataToRequest.class) CFObject object);
/**
* @see CloudFilesClient#getObject
@ -242,9 +233,8 @@ public interface CloudFilesAsyncClient {
@ResponseParser(ParseObjectFromHeadersAndHttpContent.class)
@ExceptionParser(ReturnNullOnKeyNotFound.class)
@Path("/{container}/{name}")
ListenableFuture<CFObject> getObject(
@PathParam("container") String container,
@PathParam("name") String name, GetOptions... options);
ListenableFuture<CFObject> getObject(@PathParam("container") String container, @PathParam("name") String name,
GetOptions... options);
/**
* @see CloudFilesClient#getObjectInfo
@ -253,9 +243,8 @@ public interface CloudFilesAsyncClient {
@ResponseParser(ParseObjectInfoFromHeaders.class)
@ExceptionParser(ReturnNullOnKeyNotFound.class)
@Path("/{container}/{name}")
ListenableFuture<MutableObjectInfoWithMetadata> getObjectInfo(
@PathParam("container") String container,
@PathParam("name") String name);
ListenableFuture<MutableObjectInfoWithMetadata> getObjectInfo(@PathParam("container") String container,
@PathParam("name") String name);
/**
* @see CloudFilesClient#objectExists
@ -263,9 +252,7 @@ public interface CloudFilesAsyncClient {
@HEAD
@ExceptionParser(ReturnFalseOnKeyNotFound.class)
@Path("/{container}/{name}")
ListenableFuture<Boolean> objectExists(
@PathParam("container") String container,
@PathParam("name") String name);
ListenableFuture<Boolean> objectExists(@PathParam("container") String container, @PathParam("name") String name);
/**
* @see CloudFilesClient#removeObject
@ -273,8 +260,6 @@ public interface CloudFilesAsyncClient {
@DELETE
@ExceptionParser(ReturnVoidOnNotFoundOr404.class)
@Path("/{container}/{name}")
ListenableFuture<Void> removeObject(
@PathParam("container") String container,
@PathParam("name") String name);
ListenableFuture<Void> removeObject(@PathParam("container") String container, @PathParam("name") String name);
}

4
sandbox/vfs/pom.xml
View File

@ -75,8 +75,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jclouds-aws</artifactId>
<groupId>org.jclouds.provider</groupId>
<artifactId>aws-s3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>