Created
April 24, 2012 21:00
-
-
Save jclouds/2483698 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adrian-Coles-iMac:jclouds-plugin adriancole$ git diff | |
diff --git a/src/main/java/jenkins/plugins/jclouds/blobstore/BlobStoreProfile.java b/src/main/java/jenkins/plugins/jclouds/blobstore/BlobStoreProfile.java | |
index 80f60a3..0d66111 100644 | |
--- a/src/main/java/jenkins/plugins/jclouds/blobstore/BlobStoreProfile.java | |
+++ b/src/main/java/jenkins/plugins/jclouds/blobstore/BlobStoreProfile.java | |
@@ -88,7 +88,7 @@ public class BlobStoreProfile { | |
.credentials(identity, credential) | |
.overrides(overrides) | |
.modules(MODULES) | |
- .build(BlobStoreContext.class); | |
+ .buildView(BlobStoreContext.class); | |
} | |
/** | |
* Upload the specified file from the {@param filePath} to container | |
diff --git a/src/main/java/jenkins/plugins/jclouds/compute/JCloudsCloud.java b/src/main/java/jenkins/plugins/jclouds/compute/JCloudsCloud.java | |
index 52ed6ac..739d108 100644 | |
--- a/src/main/java/jenkins/plugins/jclouds/compute/JCloudsCloud.java | |
+++ b/src/main/java/jenkins/plugins/jclouds/compute/JCloudsCloud.java | |
@@ -137,7 +137,7 @@ public class JCloudsCloud extends Cloud { | |
.credentials(identity, credential) | |
.overrides(overrides) | |
.modules(MODULES) | |
- .build(ComputeServiceContext.class); | |
+ .buildView(ComputeServiceContext.class); | |
} | |
public ComputeService getCompute() { | |
@@ -354,8 +354,8 @@ public class JCloudsCloud extends Cloud { | |
Thread.currentThread().setContextClassLoader(Apis.class.getClassLoader()); | |
// TODO: apis need endpoints, providers don't; do something smarter with this stuff :) | |
Builder<String> builder = ImmutableSet.<String> builder(); | |
- builder.addAll(Iterables.transform(Apis.contextWrappableAs(ComputeServiceContext.class), Apis.idFunction())); | |
- builder.addAll(Iterables.transform(Providers.contextWrappableAs(ComputeServiceContext.class), Providers | |
+ builder.addAll(Iterables.transform(Apis.viewableAs(ComputeServiceContext.class), Apis.idFunction())); | |
+ builder.addAll(Iterables.transform(Providers.viewableAs(ComputeServiceContext.class), Providers | |
.idFunction())); | |
Iterable<String> supportedProviders = builder.build(); | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment