Repository: jclouds-karaf Updated Branches: refs/heads/master 6da1cd34d -> 181ba80f9
JCLOUDS-943: JCLOUDS-1056: Add support for GCS Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/181ba80f Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/181ba80f Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/181ba80f Branch: refs/heads/master Commit: 181ba80f9d1fda9e6ecd9b8f7c4ef183d89797d8 Parents: 6da1cd3 Author: Andrew Gaul <[email protected]> Authored: Fri Jan 22 16:13:40 2016 -0800 Committer: Andrew Gaul <[email protected]> Committed: Tue Jan 26 12:47:12 2016 -0800 ---------------------------------------------------------------------- .../karaf/commands/blobstore/BlobStoreCommandWithOptions.java | 3 +++ feature/pom.xml | 1 + feature/src/main/resources/feature.xml | 7 +++++++ .../jclouds/karaf/itests/MiscFeaturesInstallationTest.java | 5 +++++ 4 files changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/181ba80f/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java index be01427..fda550f 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreCommandWithOptions.java @@ -89,6 +89,9 @@ public abstract class BlobStoreCommandWithOptions extends BlobStoreCommandBase { String apiValue = EnvHelper.getBlobStoreApi(api); String identityValue = EnvHelper.getBlobStoreIdentity(identity); String credentialValue = EnvHelper.getBlobStoreCredential(credential); + if (providerValue.equals("google-cloud-storage")) { + credentialValue = EnvHelper.getGoogleCredentialFromJsonFile(credentialValue); + } String endpointValue = EnvHelper.getBlobStoreEndpoint(endpoint); boolean contextNameProvided = !Strings.isNullOrEmpty(name); boolean canCreateService = (!Strings.isNullOrEmpty(providerValue) || !Strings.isNullOrEmpty(apiValue)) http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/181ba80f/feature/pom.xml ---------------------------------------------------------------------- diff --git a/feature/pom.xml b/feature/pom.xml index 950317b..e4de9ff 100644 --- a/feature/pom.xml +++ b/feature/pom.xml @@ -140,6 +140,7 @@ limitations under the License. <feature>jclouds-gogrid</feature> <feature>jclouds-go2cloud-jhb1</feature> <feature>jclouds-google-compute-engine</feature> + <feature>jclouds-google-cloud-storage</feature> <feature>jclouds-glesys</feature> <feature>jclouds-openhosting-east1</feature> <feature>jclouds-profitbricks</feature> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/181ba80f/feature/src/main/resources/feature.xml ---------------------------------------------------------------------- diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml index f5c26ab..a700be6 100644 --- a/feature/src/main/resources/feature.xml +++ b/feature/src/main/resources/feature.xml @@ -310,6 +310,13 @@ limitations under the License. <bundle>mvn:org.apache.jclouds.provider/go2cloud-jhb1/${jclouds.version}</bundle> </feature> + <feature name='jclouds-google-cloud-storage' description='Google Cloud Storage' version='${project.version}' resolver='(obr)'> + <feature version='${project.version}'>jclouds-blobstore</feature> + <bundle dependency='true'>mvn:org.apache.jclouds.api/oauth/${jclouds.version}</bundle> + <bundle dependency='true'>mvn:org.apache.jclouds.common/googlecloud/${jclouds.version}</bundle> + <bundle>mvn:org.apache.jclouds.labs/google-cloud-storage/${jclouds.version}</bundle> + </feature> + <feature name='jclouds-glesys' description='GleSYS' version='${project.version}' resolver='(obr)'> <feature version='${project.version}'>jclouds-compute</feature> <bundle>mvn:org.apache.jclouds.provider/glesys/${jclouds.version}</bundle> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/181ba80f/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java index 2c78e68..b40a56a 100644 --- a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java +++ b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java @@ -100,6 +100,11 @@ public class MiscFeaturesInstallationTest extends JcloudsFeaturesTestSupport { } @Test + public void testGoogleCloudStorageFeature() throws Exception { + installAndCheckFeature("jclouds-google-cloud-storage"); + } + + @Test public void testProfitBricksFeature() throws Exception { installAndCheckFeature("jclouds-profitbricks"); }
