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

missing build property commit

This commit is contained in:
Adrian Cole 2012-01-08 00:03:37 -08:00
parent 6b1e1af144
commit add431a329
8 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/atmos/src/test/java/org/jclouds/atmos/blobstore/integration/AtmosTestInitializer.java
View File

@ -39,9 +39,9 @@ public class AtmosTestInitializer extends TransientBlobStoreTestInitializer {
@Override @Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, 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, return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, buildVersion, identity, credential));
} }
} }

9
apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java
View File

@ -45,14 +45,15 @@ public class FilesystemTestInitializer extends TransientBlobStoreTestInitializer
@Override @Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, 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, return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, buildVersion, identity, credential));
} }
@Override @Override
protected Properties setupProperties(String endpoint, String apiVersion, String identity, String credential) { protected Properties setupProperties(String endpoint, String apiVersion, String buildVersion, String identity,
Properties props = super.setupProperties(endpoint, apiVersion, identity, credential); String credential) {
Properties props = super.setupProperties(endpoint, apiVersion, buildVersion, identity, credential);
props.setProperty(FilesystemConstants.PROPERTY_BASEDIR, TestUtils.TARGET_BASE_DIR); props.setProperty(FilesystemConstants.PROPERTY_BASEDIR, TestUtils.TARGET_BASE_DIR);
return props; return props;
} }

4
apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3TestInitializer.java
View File

@ -42,9 +42,9 @@ public class S3TestInitializer extends TransientBlobStoreTestInitializer {
@Override @Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, 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, return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, buildVersion, identity, credential));
} }
} }

4
apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftTestInitializer.java
View File

@ -40,9 +40,9 @@ public class SwiftTestInitializer extends TransientBlobStoreTestInitializer {
@Override @Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, 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, return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, buildVersion, identity, credential));
} }
} }

2
blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobStoreTestInitializer.java
View File

@ -32,7 +32,7 @@ import com.google.inject.Module;
public class TransientBlobStoreTestInitializer extends BaseTestInitializer { public class TransientBlobStoreTestInitializer extends BaseTestInitializer {
@Override @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 { String identity, String key) throws IOException {
return createStubContext(); return createStubContext();
} }

4
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java
View File

@ -52,7 +52,7 @@ public abstract class BaseTestInitializer {
if (buildVersion != null) if (buildVersion != null)
testContext.setAttribute("test." + provider + ".build-version", buildVersion); testContext.setAttribute("test." + provider + ".build-version", buildVersion);
if (identity != null) { if (identity != null) {
return createLiveContext(configurationModule, endpoint, apiVersion, app, identity, credential); return createLiveContext(configurationModule, endpoint, apiVersion, buildVersion, app, identity, credential);
} else { } else {
return createStubContext(); return createStubContext();
} }
@ -89,5 +89,5 @@ public abstract class BaseTestInitializer {
} }
protected abstract BlobStoreContext createLiveContext(Module configurationModule, String url, String apiVersion, 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;
} }

4
providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3TestInitializer.java
View File

@ -43,10 +43,10 @@ public class AWSS3TestInitializer extends TransientBlobStoreTestInitializer {
@Override @Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, 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, return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule(), new EnterpriseConfigurationModule()), setupProperties(endpoint, apiVersion, new Log4JLoggingModule(), new EnterpriseConfigurationModule()), setupProperties(endpoint, apiVersion,
identity, credential)); buildVersion, identity, credential));
} }
} }

4
providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobTestInitializer.java
View File

@ -40,9 +40,9 @@ public class AzureBlobTestInitializer extends TransientBlobStoreTestInitializer
@Override @Override
protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiVersion, 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, return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule,
new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, identity, credential)); new Log4JLoggingModule()), setupProperties(endpoint, apiVersion, buildVersion, identity, credential));
} }
} }