You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2016/01/25 12:38:19 UTC
[1/3] jclouds-karaf git commit: JCLOUDS-1056: Added Google Compute
Engine
Repository: jclouds-karaf
Updated Branches:
refs/heads/master 6bb5c5cb3 -> 086e1a0ca
JCLOUDS-1056: Added Google Compute Engine
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/086e1a0c
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/086e1a0c
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/086e1a0c
Branch: refs/heads/master
Commit: 086e1a0caf938ec6d97d0ff0d0071f154a8dabc6
Parents: d0d62fc
Author: Ignasi Barrera <na...@apache.org>
Authored: Mon Jan 25 09:44:17 2016 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Mon Jan 25 11:50:51 2016 +0100
----------------------------------------------------------------------
.../compute/ComputeCommandWithOptions.java | 3 +++
feature/pom.xml | 1 +
feature/src/main/resources/feature.xml | 8 +++++++
.../itests/MiscFeaturesInstallationTest.java | 5 +++++
pom.xml | 5 +++++
utils/pom.xml | 4 ++++
.../java/org/jclouds/karaf/utils/EnvHelper.java | 22 ++++++++++++++++++++
7 files changed, 48 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/086e1a0c/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java
index e1d6cfe..acf6dd0 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java
@@ -87,6 +87,9 @@ public abstract class ComputeCommandWithOptions extends ComputeCommandBase {
String apiValue = EnvHelper.getComputeApi(api);
String identityValue = EnvHelper.getComputeIdentity(identity);
String credentialValue = EnvHelper.getComputeCredential(credential);
+ if (providerValue.equals("google-compute-engine")) {
+ credentialValue = EnvHelper.getGoogleCredentialFromJsonFile(credentialValue);
+ }
String endpointValue = EnvHelper.getComputeEndpoint(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/086e1a0c/feature/pom.xml
----------------------------------------------------------------------
diff --git a/feature/pom.xml b/feature/pom.xml
index e99b367..f23fa93 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -139,6 +139,7 @@ limitations under the License.
<feature>jclouds-elastichosts-tor-p</feature>
<feature>jclouds-gogrid</feature>
<feature>jclouds-go2cloud-jhb1</feature>
+ <feature>jclouds-google-compute-engine</feature>
<feature>jclouds-glesys</feature>
<feature>jclouds-openhosting-east1</feature>
<feature>jclouds-rackspace-cloudfiles-us</feature>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/086e1a0c/feature/src/main/resources/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml
index fa6debc..a2f858a 100644
--- a/feature/src/main/resources/feature.xml
+++ b/feature/src/main/resources/feature.xml
@@ -327,6 +327,13 @@ limitations under the License.
<bundle>mvn:org.apache.jclouds.provider/digitalocean2/${jclouds.version}</bundle>
</feature>
+ <feature name='jclouds-google-compute-engine' description='Components to access Google Compute Engine' version='${project.version}' resolver='(obr)'>
+ <feature version='${project.version}'>jclouds-compute</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.provider/google-compute-engine/${jclouds.version}</bundle>
+ </feature>
+
<feature name='jclouds-serverlove-z1-man' description='Serverlove implementation targeted to Manchester' version='${project.version}' resolver='(obr)'>
<feature version='${project.version}'>jclouds-compute</feature>
<bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
@@ -387,6 +394,7 @@ limitations under the License.
<bundle dependency='true'>mvn:org.bouncycastle/bcprov-ext-jdk15on/${bcprov.version}</bundle>
<bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-bouncycastle/${jclouds.version}</bundle>
<bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-slf4j/${jclouds.version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.jclouds.common/googlecloud/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds.driver/jclouds-jsch/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds.driver/jclouds-log4j/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds.karaf/core/${project.version}</bundle>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/086e1a0c/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 8017718..c4860bc 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
@@ -93,4 +93,9 @@ public class MiscFeaturesInstallationTest extends JcloudsFeaturesTestSupport {
public void testDigitalOcean2Feature() throws Exception {
installAndCheckFeature("jclouds-digitalocean2");
}
+
+ @Test
+ public void testGoogleComputeEngineFeature() throws Exception {
+ installAndCheckFeature("jclouds-google-compute-engine");
+ }
}
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/086e1a0c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dae412b..6bdf654 100644
--- a/pom.xml
+++ b/pom.xml
@@ -543,6 +543,11 @@ limitations under the License.
<artifactId>chef</artifactId>
<version>${jclouds.chef.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.common</groupId>
+ <artifactId>googlecloud</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
<!-- Karaf Dependencies -->
<dependency>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/086e1a0c/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 746e29f..bc66aeb 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -33,6 +33,10 @@ limitations under the License.
<groupId>org.apache.jclouds.karaf</groupId>
<artifactId>core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.common</groupId>
+ <artifactId>googlecloud</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/086e1a0c/utils/src/main/java/org/jclouds/karaf/utils/EnvHelper.java
----------------------------------------------------------------------
diff --git a/utils/src/main/java/org/jclouds/karaf/utils/EnvHelper.java b/utils/src/main/java/org/jclouds/karaf/utils/EnvHelper.java
index 54ecb39..f8cdd17 100644
--- a/utils/src/main/java/org/jclouds/karaf/utils/EnvHelper.java
+++ b/utils/src/main/java/org/jclouds/karaf/utils/EnvHelper.java
@@ -25,6 +25,12 @@ import java.util.Map;
import java.util.Properties;
import org.jclouds.Constants;
+import org.jclouds.domain.Credentials;
+import org.jclouds.googlecloud.GoogleCredentialsFromJson;
+
+import com.google.common.base.Charsets;
+import com.google.common.base.Supplier;
+import com.google.common.io.Files;
public class EnvHelper {
@@ -92,6 +98,22 @@ public class EnvHelper {
}
/**
+ * Extracts the credential value from the Google Cloud credentials json file.
+ * @param jsonFile
+ * @return
+ */
+ public static String getGoogleCredentialFromJsonFile(String jsonFile) {
+ try {
+ String fileContents = Files.toString(new File(jsonFile), Charsets.UTF_8);
+ Supplier<Credentials> credentialSupplier = new GoogleCredentialsFromJson(fileContents);
+ String credential = credentialSupplier.get().credential;
+ return credential;
+ } catch (IOException e) {
+ return null;
+ }
+ }
+
+ /**
* Returns the endpoint value and falls back to env if the specified value is null.
*
* @param endpoint
[2/3] jclouds-karaf git commit: JCLOUDS-1056: Added DigitalOcean v2
Posted by na...@apache.org.
JCLOUDS-1056: Added DigitalOcean v2
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/d0d62fcd
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/d0d62fcd
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/d0d62fcd
Branch: refs/heads/master
Commit: d0d62fcd466565a5be301daece9b0e8da2f6e3bc
Parents: 73b61fc
Author: Ignasi Barrera <na...@apache.org>
Authored: Mon Jan 25 09:36:09 2016 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Mon Jan 25 11:50:51 2016 +0100
----------------------------------------------------------------------
feature/pom.xml | 1 +
feature/src/main/resources/feature.xml | 6 ++++++
.../org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java | 5 +++++
3 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/d0d62fcd/feature/pom.xml
----------------------------------------------------------------------
diff --git a/feature/pom.xml b/feature/pom.xml
index c2d5941..e99b367 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -130,6 +130,7 @@ limitations under the License.
<feature>jclouds-cloudsigma2-sjc</feature>
<feature>jclouds-cloudsigma2-wdc</feature>
<feature>jclouds-cloudsigma2-zrh</feature>
+ <feature>jclouds-digitalocean2</feature>
<feature>jclouds-dynect</feature>
<feature>jclouds-elastichosts-lon-b</feature>
<feature>jclouds-elastichosts-lon-p</feature>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/d0d62fcd/feature/src/main/resources/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml
index 53c963e..fa6debc 100644
--- a/feature/src/main/resources/feature.xml
+++ b/feature/src/main/resources/feature.xml
@@ -321,6 +321,12 @@ limitations under the License.
<bundle>mvn:org.apache.jclouds.provider/openhosting-east1/${jclouds.version}</bundle>
</feature>
+ <feature name='jclouds-digitalocean2' description='Components to access DigitalOcean v2' version='${project.version}' resolver='(obr)'>
+ <feature version='${project.version}'>jclouds-compute</feature>
+ <bundle dependency='true'>mvn:org.apache.jclouds.api/oauth/${jclouds.version}</bundle>
+ <bundle>mvn:org.apache.jclouds.provider/digitalocean2/${jclouds.version}</bundle>
+ </feature>
+
<feature name='jclouds-serverlove-z1-man' description='Serverlove implementation targeted to Manchester' version='${project.version}' resolver='(obr)'>
<feature version='${project.version}'>jclouds-compute</feature>
<bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/d0d62fcd/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 c563a1e..8017718 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
@@ -88,4 +88,9 @@ public class MiscFeaturesInstallationTest extends JcloudsFeaturesTestSupport {
public void testGlesysFeature() throws Exception {
installAndCheckFeature("jclouds-glesys");
}
+
+ @Test
+ public void testDigitalOcean2Feature() throws Exception {
+ installAndCheckFeature("jclouds-digitalocean2");
+ }
}
[3/3] jclouds-karaf git commit: JCLOUDS-1051: Fix SSH dependencies
and remove obsolete providers
Posted by na...@apache.org.
JCLOUDS-1051: Fix SSH dependencies and remove obsolete providers
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/73b61fc2
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/73b61fc2
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/73b61fc2
Branch: refs/heads/master
Commit: 73b61fc28cb613851b261670bd0599b66aae66f0
Parents: 6bb5c5c
Author: Ignasi Barrera <na...@apache.org>
Authored: Mon Jan 25 09:32:37 2016 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Mon Jan 25 11:50:51 2016 +0100
----------------------------------------------------------------------
commands/pom.xml | 2 +-
.../compute/ComputeCommandWithOptions.java | 5 ++-
feature/pom.xml | 2 -
feature/src/main/resources/feature.xml | 26 +++--------
.../itests/HPCloudFeaturesInstallationTest.java | 46 --------------------
.../itests/MiscFeaturesInstallationTest.java | 5 ---
pom.xml | 25 +++++------
services/pom.xml | 2 +-
.../internal/ComputeServiceFactory.java | 19 ++++----
9 files changed, 30 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/73b61fc2/commands/pom.xml
----------------------------------------------------------------------
diff --git a/commands/pom.xml b/commands/pom.xml
index 74f58ef..d554a47 100644
--- a/commands/pom.xml
+++ b/commands/pom.xml
@@ -124,7 +124,7 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
+ <artifactId>jclouds-jsch</artifactId>
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/73b61fc2/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java
index 3ab31e1..e1d6cfe 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java
@@ -20,6 +20,7 @@ package org.jclouds.karaf.commands.compute;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
+
import org.apache.felix.gogo.commands.Option;
import org.jclouds.Constants;
import org.jclouds.ContextBuilder;
@@ -29,7 +30,7 @@ import org.jclouds.karaf.services.modules.PropertiesCredentialStore;
import org.jclouds.karaf.utils.EnvHelper;
import org.jclouds.karaf.utils.ServiceHelper;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
-import org.jclouds.sshj.config.SshjSshClientModule;
+import org.jclouds.ssh.jsch.config.JschSshClientModule;
import java.io.IOException;
import java.io.File;
@@ -136,7 +137,7 @@ public abstract class ComputeCommandWithOptions extends ComputeCommandBase {
ContextBuilder builder = ContextBuilder
.newBuilder(providerOrApiValue)
.credentials(identityValue, credentialValue)
- .modules(ImmutableSet.<Module> of(new SshjSshClientModule(), new Log4JLoggingModule(),
+ .modules(ImmutableSet.<Module> of(new JschSshClientModule(), new Log4JLoggingModule(),
new PropertiesCredentialStore()));
if (!Strings.isNullOrEmpty(endpointValue)) {
builder = builder.endpoint(endpointValue);
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/73b61fc2/feature/pom.xml
----------------------------------------------------------------------
diff --git a/feature/pom.xml b/feature/pom.xml
index 492f285..c2d5941 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -130,7 +130,6 @@ limitations under the License.
<feature>jclouds-cloudsigma2-sjc</feature>
<feature>jclouds-cloudsigma2-wdc</feature>
<feature>jclouds-cloudsigma2-zrh</feature>
- <feature>jclouds-digitalocean</feature>
<feature>jclouds-dynect</feature>
<feature>jclouds-elastichosts-lon-b</feature>
<feature>jclouds-elastichosts-lon-p</feature>
@@ -140,7 +139,6 @@ limitations under the License.
<feature>jclouds-gogrid</feature>
<feature>jclouds-go2cloud-jhb1</feature>
<feature>jclouds-glesys</feature>
- <feature>jclouds-hpcloud-compute</feature>
<feature>jclouds-openhosting-east1</feature>
<feature>jclouds-rackspace-cloudfiles-us</feature>
<feature>jclouds-rackspace-cloudfiles-uk</feature>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/73b61fc2/feature/src/main/resources/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml
index cf97677..53c963e 100644
--- a/feature/src/main/resources/feature.xml
+++ b/feature/src/main/resources/feature.xml
@@ -165,7 +165,7 @@ limitations under the License.
<feature name='jclouds-aws-s3' description='Amazon Web Service - S3' version='${project.version}' resolver='(obr)'>
<feature version='${project.version}'>jclouds-api-s3</feature>
- <bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bcprov.version}</bundle>
+ <bundle dependency='true'>mvn:org.bouncycastle/bcprov-ext-jdk15on/${bcprov.version}</bundle>
<bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-bouncycastle/${jclouds.version}</bundle>
<bundle dependency='true'>mvn:io.netty/netty/${netty.bundle.version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore.version}</bundle>
@@ -273,35 +273,30 @@ limitations under the License.
<feature name='jclouds-elastichosts-lon-b' description='Elastichosts Bluesquare London' version='${project.version}' resolver='(obr)'>
<feature version='${project.version}'>jclouds-compute</feature>
<bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds.provider/elastichosts-lon-b/${jclouds.version}</bundle>
</feature>
<feature name='jclouds-elastichosts-lon-p' description='Elastichosts Peer1 London' version='${project.version}' resolver='(obr)'>
<feature version='${project.version}'>jclouds-compute</feature>
<bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds.provider/elastichosts-lon-p/${jclouds.version}</bundle>
</feature>
<feature name='jclouds-elastichosts-sat-p' description='Elastichosts Peer1 San Antonio' version='${project.version}' resolver='(obr)'>
<feature version='${project.version}'>jclouds-compute</feature>
<bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds.provider/elastichosts-sat-p/${jclouds.version}</bundle>
</feature>
<feature name='jclouds-elastichosts-lax-p' description='Elastichosts Peer1 Los Angeles' version='${project.version}' resolver='(obr)'>
<feature version='${project.version}'>jclouds-compute</feature>
<bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds.provider/elastichosts-lax-p/${jclouds.version}</bundle>
</feature>
<feature name='jclouds-elastichosts-tor-p' description='Elastichosts Peer1 Toronto' version='${project.version}' resolver='(obr)'>
<feature version='${project.version}'>jclouds-compute</feature>
<bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds.provider/elastichosts-tor-p/${jclouds.version}</bundle>
</feature>
@@ -320,11 +315,6 @@ limitations under the License.
<bundle>mvn:org.apache.jclouds.provider/glesys/${jclouds.version}</bundle>
</feature>
- <feature name='jclouds-hpcloud-compute' description='HP Cloud Compute' version='${project.version}' resolver='(obr)'>
- <feature version='${project.version}'>jclouds-api-openstack-nova</feature>
- <bundle>mvn:org.apache.jclouds.provider/hpcloud-compute/${jclouds.version}</bundle>
- </feature>
-
<feature name='jclouds-openhosting-east1' description='Open Hosting for East1' version='${project.version}' resolver='(obr)'>
<feature version='${project.version}'>jclouds-compute</feature>
<bundle dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>
@@ -348,11 +338,6 @@ limitations under the License.
<bundle>mvn:org.apache.jclouds.provider/softlayer/${jclouds.version}</bundle>
</feature>
- <feature name='jclouds-digitalocean' description='Components to access DigitalOcean' version='${project.version}' resolver='(obr)'>
- <feature version='${project.version}'>jclouds-compute</feature>
- <bundle>mvn:org.apache.jclouds.labs/digitalocean/${jclouds.version}</bundle>
- </feature>
-
<feature name='jclouds-cloudsigma2-hnl' description='CloudSigma v2 Honolulu' version='${project.version}' resolver='(obr)'>
<feature version='${project.version}'>jclouds-compute</feature>
<bundle dependency='true'>mvn:org.apache.jclouds.labs/cloudsigma2/${jclouds.version}</bundle>
@@ -387,17 +372,16 @@ limitations under the License.
<configfile finalname="/etc/org.apache.jclouds.credentials.cfg">mvn:org.apache.jclouds.karaf/jclouds-karaf/${project.version}/cfg/credentials</configfile>
<feature version='${project.version}'>jclouds-compute</feature>
<feature version='${project.version}'>jclouds-blobstore</feature>
- <bundle dependency='true'>mvn:net.schmizz/sshj/${sshj.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch-agentproxy-sshj/${jsch.agentproxy.bundle.version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch.bundle.version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch-agentproxy-jsch/${jsch.agentproxy.bundle.version}</bundle>
<bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.connector-factory/${jsch.agentproxy.version}</bundle>
<bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.usocket-nc/${jsch.agentproxy.version}</bundle>
<bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.sshagent/${jsch.agentproxy.version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib.bundle.version}</bundle>
- <bundle dependency='true'>mvn:org.bouncycastle/bcpkix-jdk15on/${bcprov.version}</bundle>
- <bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bcprov.version}</bundle>
+ <bundle dependency='true'>mvn:org.bouncycastle/bcprov-ext-jdk15on/${bcprov.version}</bundle>
<bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-bouncycastle/${jclouds.version}</bundle>
<bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-slf4j/${jclouds.version}</bundle>
- <bundle>mvn:org.apache.jclouds.driver/jclouds-sshj/${jclouds.version}</bundle>
+ <bundle>mvn:org.apache.jclouds.driver/jclouds-jsch/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds.driver/jclouds-log4j/${jclouds.version}</bundle>
<bundle>mvn:org.apache.jclouds.karaf/core/${project.version}</bundle>
<bundle>mvn:org.apache.jclouds.karaf/cache/${project.version}</bundle>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/73b61fc2/itests/src/test/java/org/jclouds/karaf/itests/HPCloudFeaturesInstallationTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/HPCloudFeaturesInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/HPCloudFeaturesInstallationTest.java
deleted file mode 100644
index 5f3d95e..0000000
--- a/itests/src/test/java/org/jclouds/karaf/itests/HPCloudFeaturesInstallationTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jclouds.karaf.itests;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.ExamReactorStrategy;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
-
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
-public class HPCloudFeaturesInstallationTest extends JcloudsFeaturesTestSupport {
-
- @Before
- public void setUp() {
- System.err.println(executeCommand("features:addurl " + getJcloudsKarafFeatureURL()));
- }
-
- @After
- public void tearDown() {
-
- }
-
- @Test
- public void testHPCloudCompute() throws Exception {
- installAndCheckFeature("jclouds-hpcloud-compute");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/73b61fc2/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 50599d4..c563a1e 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
@@ -88,9 +88,4 @@ public class MiscFeaturesInstallationTest extends JcloudsFeaturesTestSupport {
public void testGlesysFeature() throws Exception {
installAndCheckFeature("jclouds-glesys");
}
-
- @Test
- public void testDigitalOceanFeature() throws Exception {
- installAndCheckFeature("jclouds-digitalocean");
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/73b61fc2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bb95861..dae412b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,7 +182,7 @@ limitations under the License.
<properties>
<aopalliance.bundle.version>1.0_5</aopalliance.bundle.version>
- <bcprov.version>1.49</bcprov.version>
+ <bcprov.version>1.51</bcprov.version>
<configadmin.version>1.2.8</configadmin.version>
<easymock.version>3.0</easymock.version>
<felix.configadmin.version>1.2.8</felix.configadmin.version>
@@ -200,8 +200,9 @@ limitations under the License.
<jersey.version>1.11</jersey.version>
<jersey.bundle.version>1.11_1</jersey.bundle.version>
<joda.version>2.1</joda.version>
- <jsch.bundle.version>0.1.44_2</jsch.bundle.version>
- <jsch.agentproxy.version>0.0.8</jsch.agentproxy.version>
+ <jsch.version>0.1.49</jsch.version>
+ <jsch.bundle.version>${jsch.version}_1</jsch.bundle.version>
+ <jsch.agentproxy.version>0.0.9</jsch.agentproxy.version>
<jsch.agentproxy.bundle.version>${jsch.agentproxy.version}_1</jsch.agentproxy.bundle.version>
<jsr305.bundle.version>1.3.9_1</jsr305.bundle.version>
<sericemix.specs.jsr250.version>1.9.0</sericemix.specs.jsr250.version>
@@ -218,7 +219,6 @@ limitations under the License.
<scripting.api.bundle.version>2.0.0</scripting.api.bundle.version>
<slf4j.version>1.5.8</slf4j.version>
<snakeyaml.version>1.11</snakeyaml.version>
- <sshj.version>0.8.1</sshj.version>
<!-- Plugin Versions -->
<depends-maven-plugin.version>1.2</depends-maven-plugin.version>
@@ -357,7 +357,7 @@ limitations under the License.
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-ext-jdk15on</artifactId>
<version>${bcprov.version}</version>
</dependency>
@@ -448,11 +448,11 @@ limitations under the License.
<version>${guava.version}</version>
</dependency>
- <!-- SSHJ -->
+ <!-- JSCH -->
<dependency>
- <groupId>net.schmizz</groupId>
- <artifactId>sshj</artifactId>
- <version>${sshj.version}</version>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>${jsch.version}</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
@@ -463,7 +463,7 @@ limitations under the License.
<!-- JSch agentproxy -->
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jsch-agentproxy-sshj</artifactId>
+ <artifactId>org.apache.servicemix.bundles.jsch-agentproxy-jsch</artifactId>
<version>${jsch.agentproxy.bundle.version}</version>
</dependency>
<dependency>
@@ -539,11 +539,6 @@ limitations under the License.
<version>${jclouds.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>chef</artifactId>
<version>${jclouds.chef.version}</version>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/73b61fc2/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index fba8761..1a4e972 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -70,7 +70,7 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
+ <artifactId>jclouds-jsch</artifactId>
</dependency>
<!-- Testing -->
<dependency>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/73b61fc2/services/src/main/java/org/jclouds/karaf/services/internal/ComputeServiceFactory.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/jclouds/karaf/services/internal/ComputeServiceFactory.java b/services/src/main/java/org/jclouds/karaf/services/internal/ComputeServiceFactory.java
index ef5f0af..2b72ac4 100644
--- a/services/src/main/java/org/jclouds/karaf/services/internal/ComputeServiceFactory.java
+++ b/services/src/main/java/org/jclouds/karaf/services/internal/ComputeServiceFactory.java
@@ -17,10 +17,10 @@
package org.jclouds.karaf.services.internal;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.reflect.TypeToken;
-import com.google.inject.Module;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.Properties;
+
import org.jclouds.ContextBuilder;
import org.jclouds.apis.ApiMetadata;
import org.jclouds.apis.ApiPredicates;
@@ -34,7 +34,7 @@ import org.jclouds.karaf.services.ServiceFactorySupport;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.ProviderPredicates;
-import org.jclouds.sshj.config.SshjSshClientModule;
+import org.jclouds.ssh.jsch.config.JschSshClientModule;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceRegistration;
@@ -43,9 +43,10 @@ import org.osgi.util.tracker.ServiceTracker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.Properties;
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.reflect.TypeToken;
+import com.google.inject.Module;
public class ComputeServiceFactory extends ServiceFactorySupport {
@@ -159,7 +160,7 @@ public class ComputeServiceFactory extends ServiceFactorySupport {
builder = builder.endpoint(endpoint);
}
- builder = builder.name(id).modules(ImmutableSet.<Module>of(new Log4JLoggingModule(), new SshjSshClientModule()));
+ builder = builder.name(id).modules(ImmutableSet.<Module>of(new Log4JLoggingModule(), new JschSshClientModule()));
if (credentialStore != null) {
builder = builder.modules(ImmutableSet.<Module>of(credentialStore));