You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/10/18 23:28:00 UTC
git commit: Bumping to 1.8.1
Repository: jclouds-examples
Updated Branches:
refs/heads/up-to-1.8.1 [created] a8191c42f
Bumping to 1.8.1
Fixing broken calls and removing deprecations where possible
Project: http://git-wip-us.apache.org/repos/asf/jclouds-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-examples/commit/a8191c42
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-examples/tree/a8191c42
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-examples/diff/a8191c42
Branch: refs/heads/up-to-1.8.1
Commit: a8191c42f084a34dc4abcf2d2fcfd89adedfc8c8
Parents: ac12a07
Author: Andrew Phillips <an...@apache.org>
Authored: Sat Oct 18 16:19:05 2014 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Sat Oct 18 17:27:05 2014 -0400
----------------------------------------------------------------------
blobstore-basics/pom.xml | 4 ++--
.../org/jclouds/examples/blobstore/basics/MainApp.java | 13 ++++++-------
blobstore-largeblob/pom.xml | 4 ++--
chef-basics/pom.xml | 4 ++--
compute-basics/pom.xml | 4 ++--
glacier/pom.xml | 2 +-
google/pom.xml | 4 ++--
openstack/pom.xml | 6 +++---
pom.xml | 4 ++--
rackspace/pom.xml | 4 ++--
.../rackspace/cloudfiles/CloudFilesPublish.java | 6 +++---
.../examples/rackspace/cloudfiles/CreateContainer.java | 2 +-
.../CrossOriginResourceSharingContainer.java | 2 +-
.../cloudfiles/DeleteObjectsAndContainer.java | 6 +++---
.../examples/rackspace/cloudfiles/GetContainer.java | 2 +-
.../examples/rackspace/cloudfiles/GetObject.java | 2 +-
.../examples/rackspace/cloudfiles/ListContainers.java | 2 +-
.../examples/rackspace/cloudfiles/ListObjects.java | 4 ++--
.../rackspace/cloudfiles/UploadDirectoryToCDN.java | 4 ++--
.../examples/rackspace/cloudfiles/UploadObjects.java | 4 ++--
20 files changed, 41 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/blobstore-basics/pom.xml
----------------------------------------------------------------------
diff --git a/blobstore-basics/pom.xml b/blobstore-basics/pom.xml
index 043b6b5..da92906 100644
--- a/blobstore-basics/pom.xml
+++ b/blobstore-basics/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jclouds.examples</groupId>
<artifactId>blobstore-basics</artifactId>
- <version>1.8.0</version>
+ <version>1.8.1</version>
<name>blobstore-basics</name>
<description>jclouds blobstore example that creates a container, then displays the size of each container</description>
<properties>
- <jclouds.version>1.8.0</jclouds.version>
+ <jclouds.version>1.8.1</jclouds.version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/blobstore-basics/src/main/java/org/jclouds/examples/blobstore/basics/MainApp.java
----------------------------------------------------------------------
diff --git a/blobstore-basics/src/main/java/org/jclouds/examples/blobstore/basics/MainApp.java b/blobstore-basics/src/main/java/org/jclouds/examples/blobstore/basics/MainApp.java
index 186051c..8b4dff7 100755
--- a/blobstore-basics/src/main/java/org/jclouds/examples/blobstore/basics/MainApp.java
+++ b/blobstore-basics/src/main/java/org/jclouds/examples/blobstore/basics/MainApp.java
@@ -34,11 +34,10 @@ import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.domain.StorageMetadata;
-import org.jclouds.openstack.swift.SwiftApiMetadata;
-import org.jclouds.openstack.swift.SwiftClient;
+import org.jclouds.openstack.swift.v1.SwiftApi;
+import org.jclouds.openstack.swift.v1.SwiftApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.Providers;
-import org.jclouds.rest.RestContext;
import org.jclouds.s3.S3ApiMetadata;
import org.jclouds.s3.S3Client;
@@ -116,11 +115,11 @@ public class MainApp {
S3Client api = context.unwrapApi(S3Client.class);
object = api.headObject(containerName, blobName);
} else if (apiMetadata instanceof SwiftApiMetadata) {
- SwiftClient api = context.unwrapApi(SwiftClient.class);
- object = api.getObjectInfo(containerName, blobName);
+ SwiftApi api = context.unwrapApi(SwiftApi.class);
+ object = api.getObjectApi(null, containerName).getWithoutBody(blobName);
} else if (apiMetadata instanceof AzureBlobApiMetadata) {
- RestContext<AzureBlobClient, ?> providerContext = context.unwrap();
- object = providerContext.getApi().getBlobProperties(containerName, blobName);
+ AzureBlobClient api = context.unwrapApi(AzureBlobClient.class);
+ object = api.getBlobProperties(containerName, blobName);
} else if (apiMetadata instanceof AtmosApiMetadata) {
AtmosClient api = context.unwrapApi(AtmosClient.class);
object = api.headFile(containerName + "/" + blobName);
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/blobstore-largeblob/pom.xml
----------------------------------------------------------------------
diff --git a/blobstore-largeblob/pom.xml b/blobstore-largeblob/pom.xml
index 377a6dd..79ecfe1 100644
--- a/blobstore-largeblob/pom.xml
+++ b/blobstore-largeblob/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jclouds.examples</groupId>
<artifactId>blobstore-largeblob</artifactId>
- <version>1.8.0</version>
+ <version>1.8.1</version>
<name>blobstore-largeblob</name>
<description>jclouds blobstore example that creates a container, then uploads a large file using parallel multipart upload</description>
<properties>
- <jclouds.version>1.8.0</jclouds.version>
+ <jclouds.version>1.8.1</jclouds.version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/chef-basics/pom.xml
----------------------------------------------------------------------
diff --git a/chef-basics/pom.xml b/chef-basics/pom.xml
index 2d44dfd..c109de9 100644
--- a/chef-basics/pom.xml
+++ b/chef-basics/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jclouds.examples</groupId>
<artifactId>chef-basics</artifactId>
- <version>1.8.0</version>
+ <version>1.8.1</version>
<name>chef-basics</name>
<description>jclouds chef example that adds a node to a group, then installs an Apache web server on all nodes</description>
<properties>
- <jclouds.version>1.8.0</jclouds.version>
+ <jclouds.version>1.8.1</jclouds.version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/compute-basics/pom.xml
----------------------------------------------------------------------
diff --git a/compute-basics/pom.xml b/compute-basics/pom.xml
index 7268c8c..1495e81 100644
--- a/compute-basics/pom.xml
+++ b/compute-basics/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jclouds.examples</groupId>
<artifactId>compute-basics</artifactId>
- <version>1.8.0</version>
+ <version>1.8.1</version>
<name>compute-basics</name>
<description>jclouds compute example that adds a node to a group, then executes "echo hello" on all nodes</description>
<properties>
- <jclouds.version>1.8.0</jclouds.version>
+ <jclouds.version>1.8.1</jclouds.version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/glacier/pom.xml
----------------------------------------------------------------------
diff --git a/glacier/pom.xml b/glacier/pom.xml
index bb05486..a0e48c2 100644
--- a/glacier/pom.xml
+++ b/glacier/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jclouds.examples</groupId>
<artifactId>glacier-examples</artifactId>
- <version>1.8.0</version>
+ <version>1.8.1</version>
<name>glacier-examples</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/google/pom.xml
----------------------------------------------------------------------
diff --git a/google/pom.xml b/google/pom.xml
index af32cb6..12ebfa1 100644
--- a/google/pom.xml
+++ b/google/pom.xml
@@ -22,11 +22,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jclouds.examples</groupId>
<artifactId>google-examples</artifactId>
- <version>1.8.0</version>
+ <version>1.8.1</version>
<name>google-examples</name>
<properties>
- <jclouds.version>1.8.0</jclouds.version>
+ <jclouds.version>1.8.1</jclouds.version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/openstack/pom.xml
----------------------------------------------------------------------
diff --git a/openstack/pom.xml b/openstack/pom.xml
index 4ccb2bc..47062e0 100644
--- a/openstack/pom.xml
+++ b/openstack/pom.xml
@@ -22,11 +22,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jclouds.examples</groupId>
<artifactId>openstack-examples</artifactId>
- <version>1.8.0</version>
+ <version>1.8.1</version>
<name>openstack-examples</name>
<properties>
- <jclouds.version>1.8.0</jclouds.version>
+ <jclouds.version>1.8.1</jclouds.version>
</properties>
<dependencies>
@@ -53,7 +53,7 @@
<version>${jclouds.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.jclouds.labs</groupId>
+ <groupId>org.apache.jclouds.api</groupId>
<artifactId>openstack-swift</artifactId>
<version>${jclouds.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5b2941f..fd392ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jclouds.examples</groupId>
<artifactId>jclouds-examples</artifactId>
- <version>1.8.0</version>
+ <version>1.8.1</version>
<packaging>pom</packaging>
<name>jclouds examples</name>
@@ -33,7 +33,7 @@
</scm>
<properties>
- <jclouds.version>1.8.0</jclouds.version>
+ <jclouds.version>1.8.1</jclouds.version>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/rackspace/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace/pom.xml b/rackspace/pom.xml
index 5491397..b1c2fd8 100644
--- a/rackspace/pom.xml
+++ b/rackspace/pom.xml
@@ -22,11 +22,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jclouds.examples</groupId>
<artifactId>rackspace-examples</artifactId>
- <version>1.8.0</version>
+ <version>1.8.1</version>
<name>rackspace-examples</name>
<properties>
- <jclouds.version>1.8.0</jclouds.version>
+ <jclouds.version>1.8.1</jclouds.version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java
----------------------------------------------------------------------
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java
index 41c4466..d67223d 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java
@@ -92,7 +92,7 @@ public class CloudFilesPublish implements Closeable {
STATIC_WEB_ERROR, "error.html");
CreateContainerOptions opts = new CreateContainerOptions().headers(enableStaticWebHeaders);
- cloudFiles.getContainerApiForRegion(REGION).create(CONTAINER_PUBLISH, opts);
+ cloudFiles.getContainerApi(REGION).create(CONTAINER_PUBLISH, opts);
System.out.format(" %s%n", CONTAINER_PUBLISH);
}
@@ -108,7 +108,7 @@ public class CloudFilesPublish implements Closeable {
try {
Files.write("Hello Cloud Files", tempFile, Charsets.UTF_8);
- ObjectApi objectApi = cloudFiles.getObjectApiForRegionAndContainer(REGION, CONTAINER_PUBLISH);
+ ObjectApi objectApi = cloudFiles.getObjectApi(REGION, CONTAINER_PUBLISH);
ByteSource byteSource = Files.asByteSource(tempFile);
Payload payload = Payloads.newByteSourcePayload(byteSource);
@@ -126,7 +126,7 @@ public class CloudFilesPublish implements Closeable {
private void enableCdnContainer() {
System.out.format("Enable CDN Container%n");
- CDNApi cdnApi = cloudFiles.getCDNApiForRegion(REGION);
+ CDNApi cdnApi = cloudFiles.getCDNApi(REGION);
URI cdnURI = cdnApi.enable(CONTAINER_PUBLISH);
System.out.format(" Go to %s/%s%s%n", cdnURI, FILENAME, SUFFIX);
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CreateContainer.java
----------------------------------------------------------------------
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CreateContainer.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CreateContainer.java
index a5648fb..274debd 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CreateContainer.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CreateContainer.java
@@ -71,7 +71,7 @@ public class CreateContainer implements Closeable {
CreateContainerOptions options = CreateContainerOptions.Builder
.metadata(ImmutableMap.of("key1", "value1", "key2", "value2"));
- cloudFiles.getContainerApiForRegion(REGION).create(CONTAINER, options);
+ cloudFiles.getContainerApi(REGION).create(CONTAINER, options);
System.out.format(" %s%n", CONTAINER);
}
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CrossOriginResourceSharingContainer.java
----------------------------------------------------------------------
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CrossOriginResourceSharingContainer.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CrossOriginResourceSharingContainer.java
index 2fa3e68..5014cd8 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CrossOriginResourceSharingContainer.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CrossOriginResourceSharingContainer.java
@@ -73,7 +73,7 @@ public class CrossOriginResourceSharingContainer implements Closeable {
cloudFiles = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CloudFilesApi.class);
- containerApi = cloudFiles.getContainerApiForRegion(REGION);
+ containerApi = cloudFiles.getContainerApi(REGION);
}
/**
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/DeleteObjectsAndContainer.java
----------------------------------------------------------------------
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/DeleteObjectsAndContainer.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/DeleteObjectsAndContainer.java
index 400761d..cf3910f 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/DeleteObjectsAndContainer.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/DeleteObjectsAndContainer.java
@@ -76,13 +76,13 @@ public class DeleteObjectsAndContainer implements Closeable {
private void deleteObjectsAndContainer() {
System.out.format("Delete Container%n");
- List<Container> containers = cloudFiles.getContainerApiForRegion(REGION)
+ List<Container> containers = cloudFiles.getContainerApi(REGION)
.list(ListContainerOptions.Builder.prefix(CONTAINER)).toList();
for (Container container: containers) {
System.out.format(" %s%n", container.getName());
- ObjectApi objectApi = cloudFiles.getObjectApiForRegionAndContainer(REGION, container.getName());
+ ObjectApi objectApi = cloudFiles.getObjectApi(REGION, container.getName());
ObjectList objects = objectApi.list(ListContainerOptions.NONE);
for (SwiftObject object: objects) {
@@ -90,7 +90,7 @@ public class DeleteObjectsAndContainer implements Closeable {
objectApi.delete(object.getName());
}
- cloudFiles.getContainerApiForRegion(REGION).deleteIfEmpty(container.getName());
+ cloudFiles.getContainerApi(REGION).deleteIfEmpty(container.getName());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GetContainer.java
----------------------------------------------------------------------
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GetContainer.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GetContainer.java
index c8bc871..4f7791b 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GetContainer.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GetContainer.java
@@ -66,7 +66,7 @@ public class GetContainer implements Closeable {
private void getContainer() {
System.out.format("Get Container%n");
- Container container = cloudFiles.getContainerApiForRegion(REGION).get(CONTAINER);
+ Container container = cloudFiles.getContainerApi(REGION).get(CONTAINER);
System.out.format(" %s%n", container);
}
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GetObject.java
----------------------------------------------------------------------
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GetObject.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GetObject.java
index 319a4aa..bad3a4a 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GetObject.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GetObject.java
@@ -72,7 +72,7 @@ public class GetObject implements Closeable {
private void getObject() {
System.out.format("Get Object%n");
- ObjectApi objectApi = cloudFiles.getObjectApiForRegionAndContainer(REGION, CONTAINER);
+ ObjectApi objectApi = cloudFiles.getObjectApi(REGION, CONTAINER);
SwiftObject object = objectApi.get("uploadObjectFromFile.txt", GetOptions.NONE);
System.out.format(" %s%n", object);
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/ListContainers.java
----------------------------------------------------------------------
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/ListContainers.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/ListContainers.java
index dd8f1a4..53bd1db 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/ListContainers.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/ListContainers.java
@@ -67,7 +67,7 @@ public class ListContainers implements Closeable {
private void listContainers() {
System.out.format("List Containers%n");
- List<Container> containers = cloudFiles.getContainerApiForRegion(REGION).list().toList();
+ List<Container> containers = cloudFiles.getContainerApi(REGION).list().toList();
for (Container container: containers) {
System.out.format(" %s%n", container);
}
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/ListObjects.java
----------------------------------------------------------------------
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/ListObjects.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/ListObjects.java
index 8c0d852..5644da0 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/ListObjects.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/ListObjects.java
@@ -71,7 +71,7 @@ public class ListObjects implements Closeable {
private void listObjects() {
System.out.format("List Objects%n");
- ObjectApi objectApi = cloudFiles.getObjectApiForRegionAndContainer(REGION, CONTAINER);
+ ObjectApi objectApi = cloudFiles.getObjectApi(REGION, CONTAINER);
ObjectList objects = objectApi.list(ListContainerOptions.NONE);
for (SwiftObject object: objects) {
@@ -82,7 +82,7 @@ public class ListObjects implements Closeable {
private void listObjectsWithFiltering() {
System.out.format("List Objects With Filtering%n");
- ObjectApi objectApi = cloudFiles.getObjectApiForRegionAndContainer(REGION, CONTAINER);
+ ObjectApi objectApi = cloudFiles.getObjectApi(REGION, CONTAINER);
ListContainerOptions filter = ListContainerOptions.Builder.prefix("createObjectFromString");
ObjectList objects = objectApi.list(filter);
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java
----------------------------------------------------------------------
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java
index c6535f6..77066d4 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java
@@ -180,10 +180,10 @@ public class UploadDirectoryToCDN implements Closeable {
STATIC_WEB_ERROR, "error.html");
UpdateContainerOptions opts = new UpdateContainerOptions().headers(enableStaticWebHeaders);
- cloudFiles.getContainerApiForRegion(REGION).update(container, opts);
+ cloudFiles.getContainerApi(REGION).update(container, opts);
// enable the CDN container
- URI cdnURI = cloudFiles.getCDNApiForRegion(REGION).enable(container);
+ URI cdnURI = cloudFiles.getCDNApi(REGION).enable(container);
System.out.format(" Go to %s/%n", cdnURI);
}
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a8191c42/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java
----------------------------------------------------------------------
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java
index 433fcb5..09ee336 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java
@@ -95,7 +95,7 @@ public class UploadObjects implements Closeable {
ByteSource byteSource = Files.asByteSource(tempFile);
Payload payload = Payloads.newByteSourcePayload(byteSource);
- cloudFiles.getObjectApiForRegionAndContainer(REGION, CONTAINER)
+ cloudFiles.getObjectApi(REGION, CONTAINER)
.put(filename + suffix, payload);
System.out.format(" %s%s%n", filename, suffix);
@@ -115,7 +115,7 @@ public class UploadObjects implements Closeable {
ByteSource source = ByteSource.wrap("uploadObjectFromString".getBytes());
Payload payload = Payloads.newByteSourcePayload(source);
- cloudFiles.getObjectApiForRegionAndContainer(REGION, CONTAINER).put(filename, payload);
+ cloudFiles.getObjectApi(REGION, CONTAINER).put(filename, payload);
System.out.format(" %s%n", filename);
}