diff --git a/README.txt b/README.txt index 305e4514d0..2c9bc278a8 100644 --- a/README.txt +++ b/README.txt @@ -42,7 +42,7 @@ our compute api supports: aws-ec2, gogrid, cloudservers (generic), cloudservers- to all of these providers our blobstore api supports: aws-s3, cloudfiles (generic), cloudfiles-us, cloudfiles-uk, - azureblob, atmos (generic), synaptic-storage, + azureblob, atmos (generic), synaptic-storage, scaleup-storage, cloudonestorage, s3 (generic), walrus(generic), googlestorage, eucalyptus-partnercloud-s3, swift (generic), transient (in-mem), filesystem (on-disk) diff --git a/allblobstore/pom.xml b/allblobstore/pom.xml index 704d223ee3..3ff8086a9b 100644 --- a/allblobstore/pom.xml +++ b/allblobstore/pom.xml @@ -44,6 +44,11 @@ googlestorage ${project.version} + + org.jclouds.provider + scaleup-storage + ${project.version} + org.jclouds.provider synaptic-storage diff --git a/blobstore/src/main/clojure/org/jclouds/blobstore.clj b/blobstore/src/main/clojure/org/jclouds/blobstore.clj index a69676aea0..03171558b9 100644 --- a/blobstore/src/main/clojure/org/jclouds/blobstore.clj +++ b/blobstore/src/main/clojure/org/jclouds/blobstore.clj @@ -21,7 +21,7 @@ "A clojure binding for the jclouds BlobStore. Current supported services are: - [transient, filesystem, s3, azureblob, atmos, cloudfiles, walrus, + [transient, filesystem, s3, azureblob, atmos, cloudfiles, walrus, scaleup-storage, googlestorage, synaptic, peer1-storage, aws-s3, eucalyptus-partnercloud-s3, cloudfiles-us, cloudfiles-uk, swift] diff --git a/providers/pom.xml b/providers/pom.xml index 9c0e54660b..51b12888f8 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -41,6 +41,7 @@ aws-s3 aws-ec2 googlestorage + scaleup-storage synaptic-storage cloudonestorage eucalyptus-partnercloud-s3 diff --git a/sandbox-providers/scaleup-storage/pom.xml b/providers/scaleup-storage/pom.xml similarity index 100% rename from sandbox-providers/scaleup-storage/pom.xml rename to providers/scaleup-storage/pom.xml diff --git a/sandbox-providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStorageContextBuilder.java b/providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStorageContextBuilder.java similarity index 100% rename from sandbox-providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStorageContextBuilder.java rename to providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStorageContextBuilder.java diff --git a/sandbox-providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStoragePropertiesBuilder.java b/providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStoragePropertiesBuilder.java similarity index 100% rename from sandbox-providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStoragePropertiesBuilder.java rename to providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStoragePropertiesBuilder.java diff --git a/sandbox-providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/blobstore/config/ScaleUpStorageBlobStoreContextModule.java b/providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/blobstore/config/ScaleUpStorageBlobStoreContextModule.java similarity index 100% rename from sandbox-providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/blobstore/config/ScaleUpStorageBlobStoreContextModule.java rename to providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/blobstore/config/ScaleUpStorageBlobStoreContextModule.java diff --git a/sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageAsyncClientTestDisabled.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageAsyncClientTestDisabled.java similarity index 100% rename from sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageAsyncClientTestDisabled.java rename to providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageAsyncClientTestDisabled.java diff --git a/sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageClientLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageClientLiveTest.java similarity index 100% rename from sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageClientLiveTest.java rename to providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageClientLiveTest.java diff --git a/sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobIntegrationLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobIntegrationLiveTest.java similarity index 100% rename from sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobIntegrationLiveTest.java rename to providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobIntegrationLiveTest.java diff --git a/sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobLiveTest.java similarity index 100% rename from sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobLiveTest.java rename to providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobLiveTest.java diff --git a/sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobMapIntegrationLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobMapIntegrationLiveTest.java similarity index 100% rename from sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobMapIntegrationLiveTest.java rename to providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobMapIntegrationLiveTest.java diff --git a/sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobSignerLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobSignerLiveTest.java similarity index 100% rename from sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobSignerLiveTest.java rename to providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobSignerLiveTest.java diff --git a/sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerIntegrationLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerIntegrationLiveTest.java similarity index 100% rename from sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerIntegrationLiveTest.java rename to providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerIntegrationLiveTest.java diff --git a/sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerLiveTest.java similarity index 100% rename from sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerLiveTest.java rename to providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerLiveTest.java diff --git a/sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageInputStreamMapIntegrationLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageInputStreamMapIntegrationLiveTest.java similarity index 100% rename from sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageInputStreamMapIntegrationLiveTest.java rename to providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageInputStreamMapIntegrationLiveTest.java diff --git a/sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageServiceIntegrationLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageServiceIntegrationLiveTest.java similarity index 100% rename from sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageServiceIntegrationLiveTest.java rename to providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageServiceIntegrationLiveTest.java diff --git a/sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageTestInitializer.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageTestInitializer.java similarity index 100% rename from sandbox-providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageTestInitializer.java rename to providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageTestInitializer.java