Updated Branches: refs/heads/update-cdn-dir-upload 70f204344 -> ef3ff8e19
Addressing review comments. Thanks, @everett-toews! Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/commit/ef3ff8e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/tree/ef3ff8e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/diff/ef3ff8e1 Branch: refs/heads/update-cdn-dir-upload Commit: ef3ff8e1963f7dd889d47d6d7a45b0dcb944aaf0 Parents: 70f2043 Author: Andrew Phillips <[email protected]> Authored: Sun Jul 28 14:30:15 2013 -0400 Committer: Andrew Phillips <[email protected]> Committed: Sun Jul 28 14:30:15 2013 -0400 ---------------------------------------------------------------------- rackspace/pom.xml | 28 +++++++++++++++++--- .../cloudfiles/UploadDirectoryToCDN.java | 8 +++--- 2 files changed, 28 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/ef3ff8e1/rackspace/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace/pom.xml b/rackspace/pom.xml index 286f203..8e6787d 100644 --- a/rackspace/pom.xml +++ b/rackspace/pom.xml @@ -43,6 +43,7 @@ <artifactId>logback-classic</artifactId> <version>1.0.13</version> </dependency> + <!-- US --> <dependency> <groupId>org.apache.jclouds.provider</groupId> <artifactId>rackspace-cloudservers-us</artifactId> @@ -55,22 +56,43 @@ </dependency> <dependency> <groupId>org.apache.jclouds.provider</groupId> + <artifactId>rackspace-cloudblockstorage-us</artifactId> + <version>${jclouds.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jclouds.provider</groupId> + <artifactId>rackspace-clouddns-us</artifactId> + <version>${jclouds.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jclouds.provider</groupId> + <artifactId>rackspace-cloudloadbalancers-us</artifactId> + <version>${jclouds.version}</version> + </dependency> + <!-- UK --> + <dependency> + <groupId>org.apache.jclouds.provider</groupId> + <artifactId>rackspace-cloudservers-uk</artifactId> + <version>${jclouds.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jclouds.provider</groupId> <artifactId>cloudfiles-uk</artifactId> <version>${jclouds.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds.provider</groupId> - <artifactId>rackspace-cloudblockstorage-us</artifactId> + <artifactId>rackspace-cloudblockstorage-uk</artifactId> <version>${jclouds.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds.provider</groupId> - <artifactId>rackspace-clouddns-us</artifactId> + <artifactId>rackspace-clouddns-uk</artifactId> <version>${jclouds.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds.provider</groupId> - <artifactId>rackspace-cloudloadbalancers-us</artifactId> + <artifactId>rackspace-cloudloadbalancers-uk</artifactId> <version>${jclouds.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/ef3ff8e1/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 063b14d..6c1d77c 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 @@ -19,8 +19,6 @@ package org.jclouds.examples.rackspace.cloudfiles; import static java.util.concurrent.Executors.newFixedThreadPool; -import static org.jclouds.Constants.PROPERTY_PROVIDER; -import static org.jclouds.Constants.PROPERTY_IO_WORKER_THREADS; import static com.google.common.base.Preconditions.checkArgument; import java.io.Closeable; @@ -54,8 +52,8 @@ import com.google.common.util.concurrent.MoreExecutors; public class UploadDirectoryToCDN implements Closeable { // The provider configures jclouds To use the Rackspace Cloud (US) // To use the Rackspace Cloud (UK) set the system property or default value to "cloudfiles-uk" - public static final String PROVIDER = System.getProperty(PROPERTY_PROVIDER, "cloudfiles-us"); - public static final int THREADS = Integer.getInteger(PROPERTY_IO_WORKER_THREADS, 10); + private static final String PROVIDER = System.getProperty("cloudfiles.provider", "cloudfiles-us"); + private static final int THREADS = Integer.getInteger("upload.threadpool.size", 10); private final BlobStore storage; private final CloudFilesClient rackspace; @@ -213,7 +211,7 @@ public class UploadDirectoryToCDN implements Closeable { } /** - * Example of a FutureCallback triggered with an upload has finished. Just prints out a character to inform + * Example of a FutureCallback triggered when an upload has finished. Just prints out a character to inform * the user of upload progress. */ private class BlobUploaderCallback implements FutureCallback<BlobDetail> {
