From add431a329c9ab92a947786b91c08d3a770f3bc8 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sun, 8 Jan 2012 00:03:37 -0800 Subject: [PATCH] missing build property commit --- .../blobstore/integration/AtmosTestInitializer.java | 4 ++-- .../integration/FilesystemTestInitializer.java | 9 +++++---- .../s3/blobstore/integration/S3TestInitializer.java | 4 ++-- .../blobstore/integration/SwiftTestInitializer.java | 4 ++-- .../integration/TransientBlobStoreTestInitializer.java | 2 +- .../integration/internal/BaseTestInitializer.java | 4 ++-- .../s3/blobstore/integration/AWSS3TestInitializer.java | 4 ++-- .../blobstore/integration/AzureBlobTestInitializer.java | 4 ++-- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosTestInitializer.java b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosTestInitializer.java index 8714a61fe8..1cc02f150e 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosTestInitializer.java +++ b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosTestInitializer.java @@ -39,9 +39,9 @@ public class AtmosTestInitializer extends TransientBlobStoreTestInitializer { @Override protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, - String app, String identity, String credential) throws IOException { + String buildVersion, String app, String identity, String credential) throws IOException { return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule, - new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); + new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, buildVersion, identity, credential)); } } diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java index 8547f47a78..12fbb61633 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java @@ -45,14 +45,15 @@ public class FilesystemTestInitializer extends TransientBlobStoreTestInitializer @Override protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, - String app, String identity, String credential) throws IOException { + String buildVersion, String app, String identity, String credential) throws IOException { return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule, - new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); + new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, buildVersion, identity, credential)); } @Override - protected Properties setupProperties(String endpoint, String apiVersion, String identity, String credential) { - Properties props = super.setupProperties(endpoint, apiVersion, identity, credential); + protected Properties setupProperties(String endpoint, String apiVersion, String buildVersion, String identity, + String credential) { + Properties props = super.setupProperties(endpoint, apiVersion, buildVersion, identity, credential); props.setProperty(FilesystemConstants.PROPERTY_BASEDIR, TestUtils.TARGET_BASE_DIR); return props; } diff --git a/apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3TestInitializer.java b/apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3TestInitializer.java index d7d3cb706b..4598042a39 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3TestInitializer.java +++ b/apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3TestInitializer.java @@ -42,9 +42,9 @@ public class S3TestInitializer extends TransientBlobStoreTestInitializer { @Override protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, - String app, String identity, String credential) throws IOException { + String buildVersion, String app, String identity, String credential) throws IOException { return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule, - new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); + new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, buildVersion, identity, credential)); } } diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftTestInitializer.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftTestInitializer.java index 59753eae26..6f51336a44 100644 --- a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftTestInitializer.java +++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftTestInitializer.java @@ -40,9 +40,9 @@ public class SwiftTestInitializer extends TransientBlobStoreTestInitializer { @Override protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, - String app, String identity, String credential) throws IOException { + String buildVersion, String app, String identity, String credential) throws IOException { return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule, - new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); + new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, buildVersion, identity, credential)); } } diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobStoreTestInitializer.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobStoreTestInitializer.java index 63cdf5748f..201287fa9b 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobStoreTestInitializer.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobStoreTestInitializer.java @@ -32,7 +32,7 @@ import com.google.inject.Module; public class TransientBlobStoreTestInitializer extends BaseTestInitializer { @Override - protected BlobStoreContext createLiveContext(Module configurationModule, String url, String apiVersion, String app, + protected BlobStoreContext createLiveContext(Module configurationModule, String url, String apiVersion,String buildVersion, String app, String identity, String key) throws IOException { return createStubContext(); } diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java index d542079f0f..ecfb4167c4 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java @@ -52,7 +52,7 @@ public abstract class BaseTestInitializer { if (buildVersion != null) testContext.setAttribute("test." + provider + ".build-version", buildVersion); if (identity != null) { - return createLiveContext(configurationModule, endpoint, apiVersion, app, identity, credential); + return createLiveContext(configurationModule, endpoint, apiVersion, buildVersion, app, identity, credential); } else { return createStubContext(); } @@ -89,5 +89,5 @@ public abstract class BaseTestInitializer { } protected abstract BlobStoreContext createLiveContext(Module configurationModule, String url, String apiVersion, - String app, String identity, String key) throws IOException; + String buildVersion, String app, String identity, String key) throws IOException; } diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3TestInitializer.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3TestInitializer.java index 1ad51029e1..5ba408bd22 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3TestInitializer.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3TestInitializer.java @@ -43,10 +43,10 @@ public class AWSS3TestInitializer extends TransientBlobStoreTestInitializer { @Override protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, - String app, String identity, String credential) throws IOException { + String buildVersion, String app, String identity, String credential) throws IOException { return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule, new Log4JLoggingModule(), new EnterpriseConfigurationModule()), setupProperties(endpoint, apiVersion, - identity, credential)); + buildVersion, identity, credential)); } } diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobTestInitializer.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobTestInitializer.java index 4eb4bfa3c7..5dfcd0a1d0 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobTestInitializer.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobTestInitializer.java @@ -40,9 +40,9 @@ public class AzureBlobTestInitializer extends TransientBlobStoreTestInitializer @Override protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, - String app, String identity, String credential) throws IOException { + String buildVersion, String app, String identity, String credential) throws IOException { return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule, - new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); + new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, buildVersion, identity, credential)); } }